diff --git a/.eslintrc b/.eslintrc
index 961467d66f484..99f07132798c2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -203,7 +203,7 @@
       }
     },
     {
-      files: ["**/amd/src/*.js"],
+      files: ["**/amd/src/*.js", "Gruntfile.js"],
       // Check AMD with some slightly stricter rules.
       rules: {
         'no-unused-vars': 'error',
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 0000000000000..5e61b7c699d3a
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,2 @@
+**/amd/**
+/*.js
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000000000..7796292bb4a0d
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v8.16.1
diff --git a/.travis.yml b/.travis.yml
index 229c46cf80d0b..b36c40a4156a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,21 +11,18 @@ notifications:
 
 language: php
 
+dist: xenial
+
+services:
+    - mysql
+
 php:
     # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
-    - 7.2
-    - 7.1
+    - 7.3
+    - 7.1.30 # Make this sticky because current default version (7.1.11) has a bug with redis-extension output (MDL-66062)
 
 addons:
   postgresql: "9.6"
-  packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
-
-# Redis tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
-# services:
-#     - redis-server
 
 env:
     # Although we want to run these jobs and see failures as quickly as possible, we also want to get the slowest job to
@@ -35,9 +32,6 @@ env:
     # CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
     # Postgres is significantly is pretty reasonable in its run-time.
 
-    # Run unit tests on MySQL
-    - DB=mysqli   TASK=PHPUNIT
-
     # Run CI Tests without running PHPUnit.
     - DB=none     TASK=CITEST
 
@@ -54,32 +48,32 @@ matrix:
     fast_finish: true
 
     include:
+          # Run mysql only on 7.3 - it's just too slow
+        - php: 7.3
+          env: DB=mysqli   TASK=PHPUNIT
           # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
         - php: 7.2
           env: DB=none     TASK=GRUNT   NVM_VERSION='lts/carbon'
 
-    exclude:
-        # MySQL - it's just too slow.
-        # Exclude it on all versions except for 7.2
-
-        - env: DB=mysqli   TASK=PHPUNIT
-          php: 7.1
-
 cache:
     directories:
       - $HOME/.composer/cache
       - $HOME/.npm
 
+before_install:
+    # Avoid IPv6 default binding as service (causes redis not to start).
+    sudo service redis-server start --bind 127.0.0.1
+
 install:
     - >
         if [ "$DB" = 'mysqli' ];
         then
             sudo mkdir /mnt/ramdisk
             sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            sudo stop mysql
+            sudo service mysql stop
             sudo mv /var/lib/mysql /mnt/ramdisk
             sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo start mysql
+            sudo service mysql restart
         fi
     - >
         if [ "$DB" = 'pgsql' ];
@@ -99,10 +93,8 @@ install:
                 echo 'auth.json' >> .git/info/exclude
             fi
 
-            # Enable Redis.
-            # Redis tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
-            # echo 'extension="redis.so"' > /tmp/redis.ini
-            # phpenv config-add /tmp/redis.ini
+            echo 'extension="redis.so"' > /tmp/redis.ini
+            phpenv config-add /tmp/redis.ini
 
             # Install composer dependencies.
             # We need --no-interaction in case we hit API limits for composer. This causes it to fall back to a standard clone.
@@ -173,12 +165,19 @@ before_script:
         mkdir -p "$HOME"/roots/phpunit
 
         # The phpunit dataroot and prefix..
-        # Redis tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
-        # -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
         sed -i \
           -e "/require_once/i \\\$CFG->phpunit_dataroot = '\/home\/travis\/roots\/phpunit';" \
           -e "/require_once/i \\\$CFG->phpunit_prefix = 'p_';" \
           config.php ;
+        # Redis cache store tests
+        sed -i \
+          -e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
+          config.php ;
+        # Redis session tests, but not for PHP 7.2 and up. See MDL-60978 for more info.
+        redissession="define('TEST_SESSION_REDIS_HOST', '127.0.0.1');"
+        sed -i \
+          -e "/require_once/i \\${redissession}" \
+          config.php ;
 
         # Initialise PHPUnit for Moodle.
         php admin/tool/phpunit/cli/init.php
diff --git a/Gruntfile.js b/Gruntfile.js
index 85e3abe7cf534..441073dc5110e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,6 +24,7 @@
  * Grunt configuration
  */
 
+/* eslint-env node */
 module.exports = function(grunt) {
     var path = require('path'),
         tasks = {},
@@ -150,6 +151,9 @@ module.exports = function(grunt) {
                 tasks: ['yui']
             },
             gherkinlint: {
+                options: {
+                    nospawn: false,
+                },
                 files: ['**/tests/behat/*.feature'],
                 tasks: ['gherkinlint']
             }
@@ -292,19 +296,31 @@ module.exports = function(grunt) {
     };
 
     tasks.gherkinlint = function() {
-        var done = this.async(),
-            options = grunt.config('gherkinlint.options');
-
-        var args = grunt.file.expand(options.files);
-        args.unshift(path.normalize(__dirname + '/node_modules/.bin/gherkin-lint'));
-        grunt.util.spawn({
-            cmd: 'node',
-            args: args,
-            opts: {stdio: 'inherit', env: process.env}
-        }, function(error, result, code) {
-            // Propagate the exit code.
-            done(code === 0);
-        });
+        const done = this.async();
+        const options = grunt.config('gherkinlint.options');
+
+        // Grab the gherkin-lint linter and required scaffolding.
+        const linter = require('gherkin-lint/src/linter.js');
+        const featureFinder = require('gherkin-lint/src/feature-finder.js');
+        const configParser = require('gherkin-lint/src/config-parser.js');
+        const formatter = require('gherkin-lint/src/formatters/stylish.js');
+
+        // Run the linter.
+        const results = linter.lint(
+            featureFinder.getFeatureFiles(grunt.file.expand(options.files)),
+            configParser.getConfiguration(configParser.defaultConfigFileName)
+        );
+
+        // Print the results out uncondtionally.
+        formatter.printResults(results);
+
+        // Report on the results.
+        // We exit 1 if there is at least one error, otherwise we exit cleanly.
+        if (results.some(result => result.errors.length > 0)) {
+            done(1);
+        } else {
+            done(0);
+        }
     };
 
     tasks.startup = function() {
diff --git a/admin/classes/task_log_table.php b/admin/classes/task_log_table.php
index 2bb892db2a474..949e757422eca 100644
--- a/admin/classes/task_log_table.php
+++ b/admin/classes/task_log_table.php
@@ -131,7 +131,8 @@ public function query_db($pagesize, $useinitialsbar = true) {
         }
 
         $sql = "SELECT
-                    tl.*,
+                    tl.id, tl.type, tl.component, tl.classname, tl.userid, tl.timestart, tl.timeend,
+                    tl.dbreads, tl.dbwrites, tl.result,
                     tl.dbreads + tl.dbwrites AS db,
                     tl.timeend - tl.timestart AS duration,
                     {$userfields}
diff --git a/admin/cli/install.php b/admin/cli/install.php
index e9203ec11213e..41503b3ba427f 100644
--- a/admin/cli/install.php
+++ b/admin/cli/install.php
@@ -514,100 +514,105 @@
 $database = $databases[$CFG->dbtype];
 
 
-// ask for db host
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databasehost', 'install'));
-    if ($options['dbhost'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbhost']);
+// We cannot do any validation until all DB connection data is provided.
+$hintdatabase = '';
+do {
+    echo $hintdatabase;
+
+    // Ask for db host.
+    if ($interactive) {
+        cli_separator();
+        cli_heading(get_string('databasehost', 'install'));
+        if ($options['dbhost'] !== '') {
+            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbhost']);
+        } else {
+            $prompt = get_string('clitypevalue', 'admin');
+        }
+        $CFG->dbhost = cli_input($prompt, $options['dbhost']);
+
     } else {
-        $prompt = get_string('clitypevalue', 'admin');
+        $CFG->dbhost = $options['dbhost'];
     }
-    $CFG->dbhost = cli_input($prompt, $options['dbhost']);
 
-} else {
-    $CFG->dbhost = $options['dbhost'];
-}
+    // Ask for db name.
+    if ($interactive) {
+        cli_separator();
+        cli_heading(get_string('databasename', 'install'));
+        if ($options['dbname'] !== '') {
+            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbname']);
+        } else {
+            $prompt = get_string('clitypevalue', 'admin');
+        }
+        $CFG->dbname = cli_input($prompt, $options['dbname']);
 
-// ask for db name
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databasename', 'install'));
-    if ($options['dbname'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbname']);
     } else {
-        $prompt = get_string('clitypevalue', 'admin');
+        $CFG->dbname = $options['dbname'];
     }
-    $CFG->dbname = cli_input($prompt, $options['dbname']);
 
-} else {
-    $CFG->dbname = $options['dbname'];
-}
+    // Ask for db prefix.
+    if ($interactive) {
+        cli_separator();
+        cli_heading(get_string('dbprefix', 'install'));
+        //TODO: solve somehow the prefix trouble for oci.
+        if ($options['prefix'] !== '') {
+            $prompt = get_string('clitypevaluedefault', 'admin', $options['prefix']);
+        } else {
+            $prompt = get_string('clitypevalue', 'admin');
+        }
+        $CFG->prefix = cli_input($prompt, $options['prefix']);
 
-// ask for db prefix
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('dbprefix', 'install'));
-    //TODO: solve somehow the prefix trouble for oci
-    if ($options['prefix'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['prefix']);
     } else {
-        $prompt = get_string('clitypevalue', 'admin');
+        $CFG->prefix = $options['prefix'];
     }
-    $CFG->prefix = cli_input($prompt, $options['prefix']);
 
-} else {
-    $CFG->prefix = $options['prefix'];
-}
+    // Ask for db port.
+    if ($interactive) {
+        cli_separator();
+        cli_heading(get_string('databaseport', 'install'));
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbport']);
+        $CFG->dboptions['dbport'] = (int) cli_input($prompt, $options['dbport']);
 
-// ask for db port
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databaseport', 'install'));
-    $prompt = get_string('clitypevaluedefault', 'admin', $options['dbport']);
-    $CFG->dboptions['dbport'] = (int)cli_input($prompt, $options['dbport']);
+    } else {
+        $CFG->dboptions['dbport'] = (int) $options['dbport'];
+    }
+    if ($CFG->dboptions['dbport'] <= 0) {
+        $CFG->dboptions['dbport'] = '';
+    }
 
-} else {
-    $CFG->dboptions['dbport'] = (int)$options['dbport'];
-}
-if ($CFG->dboptions['dbport'] <= 0) {
-    $CFG->dboptions['dbport'] = '';
-}
+    // Ask for db socket.
+    if ($CFG->ostype === 'WINDOWS') {
+        $CFG->dboptions['dbsocket'] = '';
 
-// ask for db socket
-if ($CFG->ostype === 'WINDOWS') {
-    $CFG->dboptions['dbsocket'] = '';
+    } else if ($interactive and empty($CFG->dboptions['dbport'])) {
+        cli_separator();
+        cli_heading(get_string('databasesocket', 'install'));
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbsocket']);
+        $CFG->dboptions['dbsocket'] = cli_input($prompt, $options['dbsocket']);
 
-} else if ($interactive and empty($CFG->dboptions['dbport'])) {
-    cli_separator();
-    cli_heading(get_string('databasesocket', 'install'));
-    $prompt = get_string('clitypevaluedefault', 'admin', $options['dbsocket']);
-    $CFG->dboptions['dbsocket'] = cli_input($prompt, $options['dbsocket']);
+    } else {
+        $CFG->dboptions['dbsocket'] = $options['dbsocket'];
+    }
 
-} else {
-    $CFG->dboptions['dbsocket'] = $options['dbsocket'];
-}
+    // Ask for db user.
+    if ($interactive) {
+        cli_separator();
+        cli_heading(get_string('databaseuser', 'install'));
+        if ($options['dbuser'] !== '') {
+            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbuser']);
+        } else {
+            $prompt = get_string('clitypevalue', 'admin');
+        }
+        $CFG->dbuser = cli_input($prompt, $options['dbuser']);
 
-// ask for db user
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databaseuser', 'install'));
-    if ($options['dbuser'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbuser']);
     } else {
-        $prompt = get_string('clitypevalue', 'admin');
+        $CFG->dbuser = $options['dbuser'];
     }
-    $CFG->dbuser = cli_input($prompt, $options['dbuser']);
 
-} else {
-    $CFG->dbuser = $options['dbuser'];
-}
+    // Ask for db password.
+    if ($interactive) {
+        cli_separator();
+        cli_heading(get_string('databasepass', 'install'));
 
-// ask for db password
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databasepass', 'install'));
-    do {
         if ($options['dbpass'] !== '') {
             $prompt = get_string('clitypevaluedefault', 'admin', $options['dbpass']);
         } else {
@@ -615,19 +620,23 @@
         }
 
         $CFG->dbpass = cli_input($prompt, $options['dbpass']);
-        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation
-            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']), $distro);
+        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation.
+            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
+                    array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']),
+                    $distro);
         }
-        $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']));
-    } while ($hint_database !== '');
+        $hintdatabase = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
+                array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']));
 
-} else {
-    $CFG->dbpass = $options['dbpass'];
-    $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']));
-    if ($hint_database !== '') {
-        cli_error(get_string('dbconnectionerror', 'install'));
+    } else {
+        $CFG->dbpass = $options['dbpass'];
+        $hintdatabase = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
+                array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']));
+        if ($hintdatabase !== '') {
+            cli_error(get_string('dbconnectionerror', 'install'));
+        }
     }
-}
+} while ($hintdatabase !== '');
 
 // ask for fullname
 if ($interactive) {
diff --git a/admin/environment.xml b/admin/environment.xml
index ca20d0c68156b..6f6fb8141f249 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -2451,6 +2451,7 @@
       <VENDOR name="oracle" version="11.2" />
     </DATABASE>
     <PHP version="7.0.0" level="required">
+      <RESTRICT function="restrict_php_version_74" message="unsupportedphpversion74" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -2632,6 +2633,7 @@
       <VENDOR name="oracle" version="11.2" />
     </DATABASE>
     <PHP version="7.1.0" level="required">
+      <RESTRICT function="restrict_php_version_74" message="unsupportedphpversion74" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -2799,4 +2801,366 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="3.8" requires="3.2">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="5.5.31" />
+      <VENDOR name="mysql" version="5.6" />
+      <VENDOR name="postgres" version="9.4" />
+      <VENDOR name="mssql" version="11.0" />
+      <VENDOR name="oracle" version="11.2" />
+    </DATABASE>
+    <PHP version="7.1.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="sixtyfourbitswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="3.9" requires="3.5">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.2.29" />
+      <VENDOR name="mysql" version="5.6" />
+      <VENDOR name="postgres" version="9.5" />
+      <VENDOR name="mssql" version="11.0" />
+      <VENDOR name="oracle" version="11.2" />
+    </DATABASE>
+    <PHP version="7.2.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="sixtyfourbitswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
diff --git a/admin/message.php b/admin/message.php
index 166acccaed3a3..d004e9eebefc9 100644
--- a/admin/message.php
+++ b/admin/message.php
@@ -33,13 +33,17 @@
 $processors = array_filter($allprocessors, function($processor) {
     return $processor->enabled;
 });
+$disabledprocessors = array_filter($allprocessors, function($processor) {
+    return !$processor->enabled;
+});
+
 // Fetch message providers.
 $providers = get_message_providers();
 // Fetch the manage message outputs interface.
 $preferences = get_message_output_default_preferences();
 
 if (($form = data_submitted()) && confirm_sesskey()) {
-    $preferences = array();
+    $newpreferences = array();
     // Prepare default message outputs settings.
     foreach ($providers as $provider) {
         $componentproviderbase = $provider->component.'_'.$provider->name;
@@ -47,9 +51,9 @@
         $providerdisabled = false;
         if (!isset($form->$disableprovidersetting)) {
             $providerdisabled = true;
-            $preferences[$disableprovidersetting] = 1;
+            $newpreferences[$disableprovidersetting] = 1;
         } else {
-            $preferences[$disableprovidersetting] = 0;
+            $newpreferences[$disableprovidersetting] = 0;
         }
 
         foreach (array('permitted', 'loggedin', 'loggedoff') as $setting) {
@@ -75,20 +79,36 @@
                         $form->{$componentproviderbase.'_loggedoff'}[$processor->name] = 1;
                     }
                     // Record the site preference.
-                    $preferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
+                    $newpreferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
                 }
-            } else if (array_key_exists($componentprovidersetting, $form)) {
-                // We must be processing loggedin or loggedoff checkboxes. Store
-                // defained comma-separated processors as setting value.
-                // Using array_filter eliminates elements set to 0 above.
-                $value = join(',', array_keys(array_filter($form->{$componentprovidersetting})));
+            } else {
+                $newsettings = array();
+                if (array_key_exists($componentprovidersetting, $form)) {
+                    // We must be processing loggedin or loggedoff checkboxes.
+                    // Store defained comma-separated processors as setting value.
+                    // Using array_filter eliminates elements set to 0 above.
+                    $newsettings = array_keys(array_filter($form->{$componentprovidersetting}));
+                }
+
+                // Let's join existing setting values for disabled processors.
+                $property = 'message_provider_'.$componentprovidersetting;
+                if (property_exists($preferences, $property)) {
+                    $existingsetting = $preferences->$property;
+                    foreach ($disabledprocessors as $disable) {
+                        if (strpos($existingsetting, $disable->name) > -1) {
+                            $newsettings[] = $disable->name;
+                        }
+                    }
+                }
+
+                $value = join(',', $newsettings);
                 if (empty($value)) {
                     $value = null;
                 }
             }
             if ($setting != 'permitted') {
                 // We have already recoded site preferences for 'permitted' type.
-                $preferences['message_provider_'.$componentprovidersetting] = $value;
+                $newpreferences['message_provider_'.$componentprovidersetting] = $value;
             }
         }
     }
@@ -102,7 +122,7 @@
         \core_message\api::update_processor_status($processor, $enabled);
     }
 
-    foreach ($preferences as $name => $value) {
+    foreach ($newpreferences as $name => $value) {
         set_config($name, $value, 'message');
     }
     $transaction->allow_commit();
diff --git a/admin/registration/confirmregistration.php b/admin/registration/confirmregistration.php
index 7c9d422184b01..ff99680ac8bf0 100644
--- a/admin/registration/confirmregistration.php
+++ b/admin/registration/confirmregistration.php
@@ -46,7 +46,7 @@
 admin_externalpage_setup('registrationmoodleorg');
 
 if ($url !== HUB_MOODLEORGHUBURL) {
-    // Allow other plugins to confirm registration on hubs other than moodle.net . Plugins implementing this
+    // Allow other plugins to confirm registration on custom hubs. Plugins implementing this
     // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
     $callbacks = get_plugins_with_function('hub_registration');
     foreach ($callbacks as $plugintype => $plugins) {
diff --git a/admin/registration/forms.php b/admin/registration/forms.php
index 6fe95536333af..af05a7a34fec5 100644
--- a/admin/registration/forms.php
+++ b/admin/registration/forms.php
@@ -32,5 +32,4 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-debugging('Support for alternative hubs has been removed from Moodle in 3.4. For communication with moodle.net ' .
-    'see lib/classes/hub/ .', DEBUG_DEVELOPER);
+debugging('Support for alternative hubs has been removed from Moodle in 3.4.', DEBUG_DEVELOPER);
diff --git a/admin/registration/index.php b/admin/registration/index.php
index 62f251a4b4455..2b1a01f8b3699 100644
--- a/admin/registration/index.php
+++ b/admin/registration/index.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
  *
- * This page displays the site registration form for Moodle.net.
+ * This page displays the site registration form.
  * It handles redirection to the hub to continue the registration workflow process.
  * It also handles update operation by web service.
  */
@@ -48,7 +48,7 @@
     }
 
     echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('unregisterfrom', 'hub', 'Moodle.net'), 3, 'main');
+    echo $OUTPUT->heading(get_string('registerwithmoodleorgremove', 'core_hub'), 3, 'main');
     $siteunregistrationform->display();
     echo $OUTPUT->footer();
     exit;
@@ -82,7 +82,7 @@
 
 echo $OUTPUT->header();
 
-// Current status of registration on Moodle.net.
+// Current status of registration.
 
 $notificationtype = \core\output\notification::NOTIFY_ERROR;
 if (\core\hub\registration::is_registered()) {
@@ -104,11 +104,11 @@
 
 // Heading.
 if (\core\hub\registration::is_registered()) {
-    echo $OUTPUT->heading(get_string('updatesite', 'hub', 'Moodle.net'));
+    echo $OUTPUT->heading(get_string('registerwithmoodleorgupdate', 'core_hub'));
 } else if ($isinitialregistration) {
-    echo $OUTPUT->heading(get_string('completeregistration', 'hub'));
+    echo $OUTPUT->heading(get_string('registerwithmoodleorgcomplete', 'core_hub'));
 } else {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
+    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'core_hub'));
 }
 
 $renderer = $PAGE->get_renderer('core', 'admin');
diff --git a/admin/registration/renewregistration.php b/admin/registration/renewregistration.php
index 84e727be32300..bc05da60ffec4 100644
--- a/admin/registration/renewregistration.php
+++ b/admin/registration/renewregistration.php
@@ -40,7 +40,7 @@
 admin_externalpage_setup('registrationmoodleorg');
 
 if ($url !== HUB_MOODLEORGHUBURL) {
-    // Allow other plugins to renew registration on hubs other than moodle.net . Plugins implementing this
+    // Allow other plugins to renew registration on custom hubs. Plugins implementing this
     // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
     $callbacks = get_plugins_with_function('hub_registration');
     foreach ($callbacks as $plugintype => $plugins) {
@@ -56,7 +56,7 @@
 
 echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
-$hublink = html_writer::tag('a', 'Moodle.net', array('href' => HUB_MOODLEORGHUBURL));
+$hublink = html_writer::tag('a', HUB_MOODLEORGHUBURL, array('href' => HUB_MOODLEORGHUBURL));
 
 $deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
 
diff --git a/admin/renderer.php b/admin/renderer.php
index 922617ad27867..5abd08eaebb2f 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -1469,9 +1469,11 @@ protected function required_column(\core\plugininfo\base $plugin, core_plugin_ma
                     $class = 'requires-failed';
                     $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-danger');
                 }
-                $requires[] = html_writer::tag('li',
-                    html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
-                    ' '.$label, array('class' => $class));
+                if ($reqinfo->reqver != ANY_VERSION) {
+                    $requires[] = html_writer::tag('li',
+                        html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
+                        ' '.$label, array('class' => $class));
+                }
 
             } else {
                 $actions = array();
@@ -2110,6 +2112,27 @@ protected function legacy_log_store_writing_error() {
      * @return string
      */
     public function moodleorg_registration_message() {
-        return format_text(get_string('registermoodlenet', 'admin'), FORMAT_HTML, ['noclean' => true]);
+
+        $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub'), FORMAT_MARKDOWN);
+
+        $out .= html_writer::link(
+            new moodle_url('/admin/settings.php', ['section' => 'moodleservices']),
+            $this->output->pix_icon('i/info', '').' '.get_string('registerwithmoodleorginfoapp', 'core_hub'),
+            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
+        );
+
+        $out .= html_writer::link(
+            HUB_MOODLEORGHUBURL,
+            $this->output->pix_icon('i/stats', '').' '.get_string('registerwithmoodleorginfostats', 'core_hub'),
+            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
+        );
+
+        $out .= html_writer::link(
+            HUB_MOODLEORGHUBURL.'/sites',
+            $this->output->pix_icon('i/location', '').' '.get_string('registerwithmoodleorginfosites', 'core_hub'),
+            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
+        );
+
+        return $this->output->box($out);
     }
 }
diff --git a/admin/roles/admins.php b/admin/roles/admins.php
index 4b341b360a3a8..a4b034a8aec5d 100644
--- a/admin/roles/admins.php
+++ b/admin/roles/admins.php
@@ -36,15 +36,12 @@
 }
 
 $admisselector = new core_role_admins_existing_selector();
-$admisselector->set_extra_fields(array('username', 'email'));
-
 $potentialadmisselector = new core_role_admins_potential_selector();
-$potentialadmisselector->set_extra_fields(array('username', 'email'));
 
 if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
     if ($userstoadd = $potentialadmisselector->get_selected_users()) {
         $user = reset($userstoadd);
-        $username = fullname($user) . " ($user->username, $user->email)";
+        $username = $potentialadmisselector->output_user($user);
         echo $OUTPUT->header();
         $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmadd'=>$user->id, 'sesskey'=>sesskey()));
         echo $OUTPUT->confirm(get_string('confirmaddadmin', 'core_role', $username), $yesurl, $PAGE->url);
@@ -58,7 +55,7 @@
         if ($USER->id == $user->id) {
             // Can not remove self.
         } else {
-            $username = fullname($user) . " ($user->username, $user->email)";
+            $username = $admisselector->output_user($user);
             echo $OUTPUT->header();
             $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmdel'=>$user->id, 'sesskey'=>sesskey()));
             echo $OUTPUT->confirm(get_string('confirmdeladmin', 'core_role', $username), $yesurl, $PAGE->url);
diff --git a/admin/roles/classes/define_role_table_advanced.php b/admin/roles/classes/define_role_table_advanced.php
index d5f6c18350898..6ddd5d2e5040b 100644
--- a/admin/roles/classes/define_role_table_advanced.php
+++ b/admin/roles/classes/define_role_table_advanced.php
@@ -157,19 +157,19 @@ public function read_submitted_permissions() {
         // Allowed roles.
         $allow = optional_param_array('allowassign', null, PARAM_INT);
         if (!is_null($allow)) {
-            $this->allowassign = $allow;
+            $this->allowassign = array_filter($allow);
         }
         $allow = optional_param_array('allowoverride', null, PARAM_INT);
         if (!is_null($allow)) {
-            $this->allowoverride = $allow;
+            $this->allowoverride = array_filter($allow);
         }
         $allow = optional_param_array('allowswitch', null, PARAM_INT);
         if (!is_null($allow)) {
-            $this->allowswitch = $allow;
+            $this->allowswitch = array_filter($allow);
         }
         $allow = optional_param_array('allowview', null, PARAM_INT);
         if (!is_null($allow)) {
-            $this->allowview = $allow;
+            $this->allowview = array_filter($allow);
         }
 
         // Now read the permissions for each capability.
@@ -589,7 +589,9 @@ protected function get_allow_role_control($type) {
         if ($this->roleid == 0) {
             $options[-1] = get_string('thisnewrole', 'core_role');
         }
-        return html_writer::select($options, 'allow'.$type.'[]', $selected, false, array('multiple' => 'multiple',
+        return
+            html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'allow'.$type.'[]', 'value' => "")) .
+            html_writer::select($options, 'allow'.$type.'[]', $selected, false, array('multiple' => 'multiple',
             'size' => 10, 'class' => 'form-control'));
     }
 
@@ -623,7 +625,7 @@ protected function print_field($name, $caption, $field, $helpicon = null) {
             echo "</label>\n";
         }
         if ($helpicon) {
-            echo '<span class="pull-xs-right text-nowrap">'.$helpicon.'</span>';
+            echo '<span class="float-sm-right text-nowrap">'.$helpicon.'</span>';
         }
         echo '</div>';
         if (isset($this->errors[$name])) {
diff --git a/admin/roles/classes/permissions_table.php b/admin/roles/classes/permissions_table.php
index 80e4b2067cea7..b877a70c76905 100644
--- a/admin/roles/classes/permissions_table.php
+++ b/admin/roles/classes/permissions_table.php
@@ -96,7 +96,7 @@ protected function add_row_cells($capability) {
                                   "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "icon" => "", "iconalt" => "");
                 if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
                     $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['iconalt'] = get_string('deletexrole', 'core_role', $name);
                 }
                 $neededroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }
@@ -109,7 +109,7 @@ protected function add_row_cells($capability) {
                                 "icon" => "", "iconalt" => "");
                 if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) {
                     $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['iconalt'] = get_string('deletexrole', 'core_role', $name);
                 }
                 $forbiddenroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }
diff --git a/admin/roles/permissions.php b/admin/roles/permissions.php
index 89668dc53c5f9..bc549484400ce 100644
--- a/admin/roles/permissions.php
+++ b/admin/roles/permissions.php
@@ -213,7 +213,7 @@
 $PAGE->requires->strings_for_js(
                                 array('roleprohibitinfo', 'roleprohibitheader', 'roleallowinfo', 'roleallowheader',
                                     'confirmunassigntitle', 'confirmroleunprohibit', 'confirmroleprevent', 'confirmunassignyes',
-                                    'confirmunassignno'), 'core_role');
+                                    'confirmunassignno', 'deletexrole'), 'core_role');
 $PAGE->requires->js_call_amd('core/permissionmanager', 'initialize', array($arguments));
 $table = new core_role_permissions_table($context, $contextname, $allowoverrides, $allowsafeoverrides, $overridableroles);
 echo $OUTPUT->box_start('generalbox capbox');
diff --git a/admin/settings/courses.php b/admin/settings/courses.php
index 99892d68dd990..ace90d3f05745 100644
--- a/admin/settings/courses.php
+++ b/admin/settings/courses.php
@@ -459,27 +459,31 @@
     $ADMIN->add('backups', $temp);
 
     // Create a page for asynchronous backup and restore configuration and defaults.
-    if (!empty($CFG->enableasyncbackup)) {  // Only add settings if async mode is enable at site level.
-        $temp = new admin_settingpage('asyncgeneralsettings', new lang_string('asyncgeneralsettings', 'backup'));
-
-        $temp->add(new admin_setting_configcheckbox(
-                'backup/backup_async_message_users',
-                new lang_string('asyncemailenable', 'backup'),
-                new lang_string('asyncemailenabledetail', 'backup'), 0));
-
-        $temp->add(new admin_setting_configtext(
-                'backup/backup_async_message_subject',
-                new lang_string('asyncmessagesubject', 'backup'),
-                new lang_string('asyncmessagesubjectdetail', 'backup'),
-                new lang_string('asyncmessagesubjectdefault', 'backup')));
-
-        $temp->add(new admin_setting_confightmleditor(
-                'backup/backup_async_message',
-                new lang_string('asyncmessagebody', 'backup'),
-                new lang_string('asyncmessagebodydetail', 'backup'),
-                new lang_string('asyncmessagebodydefault', 'backup')));
-
-        $ADMIN->add('backups', $temp);
-    }
+    $temp = new admin_settingpage('asyncgeneralsettings', new lang_string('asyncgeneralsettings', 'backup'));
+
+    $temp->add(new admin_setting_configcheckbox('enableasyncbackup', new lang_string('enableasyncbackup', 'backup'),
+            new lang_string('enableasyncbackup_help', 'backup'), 0, 1, 0));
+
+    $temp->add(new admin_setting_configcheckbox(
+            'backup/backup_async_message_users',
+            new lang_string('asyncemailenable', 'backup'),
+            new lang_string('asyncemailenabledetail', 'backup'), 0));
+    $temp->hide_if('backup/backup_async_message_users', 'enableasyncbackup');
+
+    $temp->add(new admin_setting_configtext(
+            'backup/backup_async_message_subject',
+            new lang_string('asyncmessagesubject', 'backup'),
+            new lang_string('asyncmessagesubjectdetail', 'backup'),
+            new lang_string('asyncmessagesubjectdefault', 'backup')));
+    $temp->hide_if('backup/backup_async_message_subject', 'backup/backup_async_message_users');
+
+    $temp->add(new admin_setting_confightmleditor(
+            'backup/backup_async_message',
+            new lang_string('asyncmessagebody', 'backup'),
+            new lang_string('asyncmessagebodydetail', 'backup'),
+            new lang_string('asyncmessagebodydefault', 'backup')));
+    $temp->hide_if('backup/backup_async_message', 'backup/backup_async_message_users');
+
+    $ADMIN->add('backups', $temp);
 
 }
diff --git a/admin/settings/subsystems.php b/admin/settings/subsystems.php
index 0b627494d65b9..de5f75be9939a 100644
--- a/admin/settings/subsystems.php
+++ b/admin/settings/subsystems.php
@@ -48,10 +48,4 @@
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('allowstealth', new lang_string('allowstealthmodules'),
         new lang_string('allowstealthmodules_help'), 0, 1, 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enablecoursepublishing',
-        new lang_string('enablecoursepublishing', 'hub'), new lang_string('enablecoursepublishing_help', 'hub'), 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enableasyncbackup', new lang_string('enableasyncbackup', 'backup'),
-        new lang_string('enableasyncbackup_help', 'backup'), 0, 1, 0));
 }
diff --git a/admin/tasklogs.php b/admin/tasklogs.php
index 6684a7ebc4bf1..7e5d244f1bd7d 100644
--- a/admin/tasklogs.php
+++ b/admin/tasklogs.php
@@ -49,6 +49,8 @@
 $download = optional_param('download', false, PARAM_BOOL);
 
 if (null !== $logid) {
+    // Raise memory limit in case the log is large.
+    raise_memory_limit(MEMORY_HUGE);
     $log = $DB->get_record('task_log', ['id' => $logid], '*', MUST_EXIST);
 
     if ($download) {
diff --git a/admin/testoutgoingmailconf.php b/admin/testoutgoingmailconf.php
index ce5857f4ee493..7d0db03b07ac3 100644
--- a/admin/testoutgoingmailconf.php
+++ b/admin/testoutgoingmailconf.php
@@ -52,7 +52,7 @@
     // Manage Moodle debugging options.
     $debuglevel = $CFG->debug;
     $debugdisplay = $CFG->debugdisplay;
-    $debugsmtp = $CFG->debugsmtp;
+    $debugsmtp = $CFG->debugsmtp ?? null; // This might not be set as it's optional.
     $CFG->debugdisplay = true;
     $CFG->debugsmtp = true;
     $CFG->debug = 15;
@@ -66,7 +66,12 @@
     // Restore Moodle debugging options.
     $CFG->debug = $debuglevel;
     $CFG->debugdisplay = $debugdisplay;
-    $CFG->debugsmtp = $debugsmtp;
+
+    // Restore the debugsmtp config, if it was set originally.
+    unset($CFG->debugsmtp);
+    if (!is_null($debugsmtp)) {
+        $CFG->debugsmtp = $debugsmtp;
+    }
 
     if ($success) {
         $msgparams = new stdClass();
diff --git a/admin/tests/behat/behat_admin.php b/admin/tests/behat/behat_admin.php
index 87a00b6cdad33..af027dec4c895 100644
--- a/admin/tests/behat/behat_admin.php
+++ b/admin/tests/behat/behat_admin.php
@@ -48,13 +48,11 @@ class behat_admin extends behat_base {
      * @param TableNode $table
      */
     public function i_set_the_following_administration_settings_values(TableNode $table) {
-
         if (!$data = $table->getRowsHash()) {
             return;
         }
 
         foreach ($data as $label => $value) {
-
             $this->execute('behat_navigation::i_select_from_flat_navigation_drawer', [get_string('administrationsite')]);
 
             // Search by label.
@@ -76,38 +74,17 @@ public function i_set_the_following_administration_settings_values(TableNode $ta
                         "@id=//span[contains(normalize-space(.), $label)]/preceding-sibling::label[1]/@for]";
                 $fieldnode = $this->find('xpath', $fieldxpath, $exception);
 
-                $formfieldtypenode = $this->find('xpath', $fieldxpath .
-                        "/ancestor::div[contains(concat(' ', @class, ' '), ' form-setting ')]" .
-                        "/child::div[contains(concat(' ', @class, ' '),  ' form-')]/child::*/parent::div");
-
             } catch (ElementNotFoundException $e) {
-
                 // Multi element settings, interacting only the first one.
                 $fieldxpath = "//*[label[contains(., $label)]|span[contains(., $label)]]" .
                         "/ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-item ')]" .
                         "/descendant::div[contains(concat(' ', @class, ' '), ' form-group ')]" .
                         "/descendant::*[self::input | self::textarea | self::select]" .
                         "[not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]";
-                $fieldnode = $this->find('xpath', $fieldxpath);
-
-                // It is the same one that contains the type.
-                $formfieldtypenode = $fieldnode;
-            }
-
-            // Getting the class which contains the field type.
-            $classes = explode(' ', $formfieldtypenode->getAttribute('class'));
-            $type = false;
-            foreach ($classes as $class) {
-                if (substr($class, 0, 5) == 'form-') {
-                    $type = substr($class, 5);
-                }
             }
 
-            // Instantiating the appropiate field type.
-            $field = behat_field_manager::get_field_instance($type, $fieldnode, $this->getSession());
-            $field->set_value($value);
-
-            $this->find_button(get_string('savechanges'))->press();
+            $this->execute('behat_forms::i_set_the_field_with_xpath_to', [$fieldxpath, $value]);
+            $this->execute("behat_general::i_click_on", [get_string('savechanges'), 'button']);
         }
     }
 
diff --git a/admin/tests/behat/manage_tokens.feature b/admin/tests/behat/manage_tokens.feature
index d30e2300bd15e..dc1cd948a600e 100644
--- a/admin/tests/behat/manage_tokens.feature
+++ b/admin/tests/behat/manage_tokens.feature
@@ -9,6 +9,7 @@ Feature: Manage tokens
     | username  | password  | firstname | lastname |
     | testuser  | testuser  | Joe | Bloggs |
     | testuser2 | testuser2 | TestFirstname | TestLastname |
+    And I change window size to "small"
     And I log in as "admin"
     And I am on site homepage
 
diff --git a/admin/tool/analytics/classes/output/models_list.php b/admin/tool/analytics/classes/output/models_list.php
index c6831d0e20aa2..9c918ce1ef42a 100644
--- a/admin/tool/analytics/classes/output/models_list.php
+++ b/admin/tool/analytics/classes/output/models_list.php
@@ -181,7 +181,7 @@ public function export_for_template(\renderer_base $output) {
                         if ($contextid == SYSCONTEXTID) {
                             $contextname = get_string('allpredictions', 'tool_analytics');
                         } else {
-                            $contextname = shorten_text($context->get_context_name(true, true), 90);
+                            $contextname = shorten_text($context->get_context_name(false, true), 40);
                         }
                         $predictioncontexts[$contextid] = $contextname;
                     }
diff --git a/admin/tool/analytics/classes/task/predict_models.php b/admin/tool/analytics/classes/task/predict_models.php
index 6ea0d0d635618..4551e79a8a904 100644
--- a/admin/tool/analytics/classes/task/predict_models.php
+++ b/admin/tool/analytics/classes/task/predict_models.php
@@ -59,6 +59,9 @@ public function execute() {
         }
 
         foreach ($models as $model) {
+
+            $renderer = $PAGE->get_renderer('tool_analytics');
+
             $result = $model->predict();
 
             // Reset the page as some indicators may call external functions that overwrite the page context.
@@ -66,7 +69,6 @@ public function execute() {
 
             if ($result) {
                 echo $OUTPUT->heading(get_string('modelresults', 'tool_analytics', $model->get_name()));
-                $renderer = $PAGE->get_renderer('tool_analytics');
                 echo $renderer->render_get_predictions_results(false, array(), $result, $model->get_analyser()->get_logs());
             }
         }
diff --git a/admin/tool/analytics/classes/task/train_models.php b/admin/tool/analytics/classes/task/train_models.php
index 67c0a3a5f81f4..c9387d3906be4 100644
--- a/admin/tool/analytics/classes/task/train_models.php
+++ b/admin/tool/analytics/classes/task/train_models.php
@@ -70,6 +70,8 @@ public function execute() {
                 continue;
             }
 
+            $renderer = $PAGE->get_renderer('tool_analytics');
+
             $result = $model->train();
 
             // Reset the page as some indicators may call external functions that overwrite the page context.
@@ -77,8 +79,6 @@ public function execute() {
 
             if ($result) {
                 echo $OUTPUT->heading(get_string('modelresults', 'tool_analytics', $model->get_name()));
-
-                $renderer = $PAGE->get_renderer('tool_analytics');
                 echo $renderer->render_get_predictions_results($result, $model->get_analyser()->get_logs());
             }
         }
diff --git a/admin/tool/analytics/cli/evaluate_model.php b/admin/tool/analytics/cli/evaluate_model.php
index 8473aba6ab041..3e647ef0b0c36 100644
--- a/admin/tool/analytics/cli/evaluate_model.php
+++ b/admin/tool/analytics/cli/evaluate_model.php
@@ -102,6 +102,8 @@
     mtrace(get_string('evaluationinbatches', 'tool_analytics'));
 }
 
+$renderer = $PAGE->get_renderer('tool_analytics');
+
 $analyseroptions = array(
     'filter' => $options['filter'],
     'timesplitting' => $options['timesplitting'],
@@ -114,7 +116,6 @@
 // Reset the page as some indicators may call external functions that overwrite the page context.
 \tool_analytics\output\helper::reset_page();
 
-$renderer = $PAGE->get_renderer('tool_analytics');
 echo $renderer->render_evaluate_results($results, $model->get_analyser()->get_logs());
 
 // Check that we have, at leasa,t 1 valid dataset (not necessarily good) to use.
diff --git a/admin/tool/analytics/cli/guess_course_start_and_end.php b/admin/tool/analytics/cli/guess_course_start_and_end.php
index f8a8aa5d6b5cc..f6e653ba77e93 100644
--- a/admin/tool/analytics/cli/guess_course_start_and_end.php
+++ b/admin/tool/analytics/cli/guess_course_start_and_end.php
@@ -173,7 +173,8 @@ function tool_analytics_calculate_course_dates($course, $options) {
         $formatoptions = $format->get_format_options();
 
         // Change this for a course formats API level call in MDL-60702.
-        if (method_exists($format, 'update_end_date') && $formatoptions['automaticenddate']) {
+        if ((get_class($format) == 'format_weeks' || is_subclass_of($format, 'format_weeks')) &&
+                method_exists($format, 'update_end_date') && $formatoptions['automaticenddate']) {
             // Special treatment for weeks-based formats with automatic end date.
 
             if ($options['update']) {
diff --git a/admin/tool/behat/index.php b/admin/tool/behat/index.php
index f3b1ac001258a..46d57066f6f41 100644
--- a/admin/tool/behat/index.php
+++ b/admin/tool/behat/index.php
@@ -32,7 +32,7 @@
 // systems, but let's allow room for expansion.
 core_php_time_limit::raise(300);
 
-$filter = optional_param('filter', '', PARAM_ALPHANUMEXT);
+$filter = optional_param('filter', '', PARAM_NOTAGS);
 $type = optional_param('type', false, PARAM_ALPHAEXT);
 $component = optional_param('component', '', PARAM_ALPHAEXT);
 
diff --git a/admin/tool/behat/lang/en/tool_behat.php b/admin/tool/behat/lang/en/tool_behat.php
index 88e336516a8ba..f0664c507c7fe 100644
--- a/admin/tool/behat/lang/en/tool_behat.php
+++ b/admin/tool/behat/lang/en/tool_behat.php
@@ -31,7 +31,7 @@
 $string['errorsetconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot need to be set in config.php.';
 $string['erroruniqueconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot values need to be different than $CFG->dataroot, $CFG->prefix, $CFG->wwwroot, $CFG->phpunit_dataroot and $CFG->phpunit_prefix values.';
 $string['fieldvalueargument'] = 'Field value arguments';
-$string['fieldvalueargument_help'] = 'This argument should be completed by a field value. There are many field types, including  simple ones like checkboxes, selects or textareas, or complex ones like date selectors. See the dev documentation <a href="http://docs.moodle.org/dev/Acceptance_testing" target="_blank">Acceptance_testing</a> for details of expected field values.';
+$string['fieldvalueargument_help'] = 'This argument should be completed by a field value. There are many field types, including simple ones like checkboxes, selects or textareas, or complex ones like date selectors. See the dev documentation <a href="https://docs.moodle.org/dev/Acceptance_testing" target="_blank">Acceptance_testing</a> for details of expected field values.';
 $string['giveninfo'] = 'Given. Processes to set up the environment';
 $string['infoheading'] = 'Info';
 $string['installinfo'] = 'Read {$a} for installation and tests execution info';
diff --git a/admin/tool/behat/locallib.php b/admin/tool/behat/locallib.php
index 83c3a8d49f20e..f4e6537af6c06 100644
--- a/admin/tool/behat/locallib.php
+++ b/admin/tool/behat/locallib.php
@@ -55,13 +55,13 @@ public static function stepsdefinitions($type, $component, $filter) {
         // The loaded steps depends on the component specified.
         behat_config_manager::update_config_file($component, false);
 
-        // The Moodle\BehatExtension\HelpPrinter\MoodleDefinitionsPrinter will parse this search format.
+        // The Moodle\BehatExtension\Definition\Printer\ConsoleDefinitionInformationPrinter will parse this search format.
         if ($type) {
             $filter .= '&&' . $type;
         }
 
         if ($filter) {
-            $filteroption = ' -d "' . $filter . '"';
+            $filteroption = ' -d ' . escapeshellarg($filter);
         } else {
             $filteroption = ' -di';
         }
diff --git a/admin/tool/behat/renderer.php b/admin/tool/behat/renderer.php
index 7de834a6b07de..864dc53fc3d9d 100644
--- a/admin/tool/behat/renderer.php
+++ b/admin/tool/behat/renderer.php
@@ -44,13 +44,9 @@ public function render_stepsdefinitions($stepsdefinitions, $form) {
         global $CFG;
         require_once($CFG->libdir . '/behat/classes/behat_selectors.php');
 
-        $html = $this->generic_info();
-
-        // Form.
-        ob_start();
-        $form->display();
-        $html .= ob_get_contents();
-        ob_end_clean();
+        $html = $this->output->header();
+        $html .= $this->output->heading(get_string('pluginname', 'tool_behat'));
+        $html .= $form->render();
 
         if (empty($stepsdefinitions)) {
             $stepsdefinitions = get_string('nostepsdefinitions', 'tool_behat');
@@ -128,7 +124,9 @@ function ($matches) {
      */
     public function render_error($msg) {
 
-        $html = $this->generic_info();
+        $html = $this->output->header();
+        $html .= $this->output->heading(get_string('pluginname', 'tool_behat'));
+        $html .= $this->generic_info();
 
         $a = new stdClass();
         $a->errormsg = $msg;
@@ -153,13 +151,7 @@ public function render_error($msg) {
      *
      * @return string
      */
-    protected function generic_info() {
-
-        $title = get_string('pluginname', 'tool_behat');
-
-        // Header.
-        $html = $this->output->header();
-        $html .= $this->output->heading($title);
+    public function generic_info() {
 
         // Info.
         $installurl = behat_command::DOCS_URL;
@@ -175,8 +167,7 @@ protected function generic_info() {
         );
 
         // List of steps.
-        $html .= $this->output->box_start();
-        $html .= html_writer::tag('h3', get_string('infoheading', 'tool_behat'));
+        $html = $this->output->box_start();
         $html .= html_writer::tag('div', get_string('aim', 'tool_behat'));
         $html .= html_writer::start_tag('div');
         $html .= html_writer::start_tag('ul');
diff --git a/admin/tool/behat/steps_definitions_form.php b/admin/tool/behat/steps_definitions_form.php
index 12bbee6bb27d7..f9bef39c9a9b9 100644
--- a/admin/tool/behat/steps_definitions_form.php
+++ b/admin/tool/behat/steps_definitions_form.php
@@ -40,8 +40,14 @@ class steps_definitions_form extends moodleform {
      * @return void
      */
     public function definition() {
+        global $PAGE;
 
         $mform = $this->_form;
+        $output = $PAGE->get_renderer('tool_behat');
+
+        $mform->addElement('header', 'info', get_string('infoheading', 'tool_behat'));
+        $mform->setExpanded('info', false);
+        $mform->addElement('html', $output->generic_info());
 
         $mform->addElement('header', 'filters', get_string('stepsdefinitionsfilters', 'tool_behat'));
 
diff --git a/admin/tool/behat/styles.css b/admin/tool/behat/styles.css
index 8c5634ad757c0..c4fdb63ded9e5 100644
--- a/admin/tool/behat/styles.css
+++ b/admin/tool/behat/styles.css
@@ -1,25 +1,31 @@
-.steps-definitions {
-    border-style: solid;
-    border-width: 1px;
-    border-color: #bbb;
-    padding: 5px;
-    margin: auto;
-    width: 50%;
+#page-admin-tool-behat-index .steps-definitions {
+    margin: 1rem auto;
 }
 
-.steps-definitions .step {
-    margin: 10px 0 10px 0;
+#page-admin-tool-behat-index .steps-definitions .step {
+    margin: 1rem 0 0 0;
+    border: 1px solid #eee;
+    padding: 1rem;
 }
 
-.steps-definitions .stepdescription {
-    color: #bf8c12;
+#page-admin-tool-behat-index .steps-definitions .stepdescription {
+    font-style: italic;
 }
 
-.steps-definitions .steptype {
+#page-admin-tool-behat-index .steps-definitions .stepcontent {
+    margin: 1rem 0;
+}
+
+#page-admin-tool-behat-index .steps-definitions .steptype {
     color: #1467a6;
-    margin-right: 5px;
+    margin-right: 1ex;
+}
+
+#page-admin-tool-behat-index .steps-definitions .stepapipath {
+    font-family: monospace;
+    font-size: smaller;
 }
 
-.steps-definitions .stepregex {
+#page-admin-tool-behat-index .steps-definitions .stepregex {
     color: #060;
 }
diff --git a/admin/tool/behat/tests/behat/edit_permissions.feature b/admin/tool/behat/tests/behat/edit_permissions.feature
index 5de8e0a0c866b..e3ffc92aef164 100644
--- a/admin/tool/behat/tests/behat/edit_permissions.feature
+++ b/admin/tool/behat/tests/behat/edit_permissions.feature
@@ -20,12 +20,12 @@ Feature: Edit capabilities
     And I set the following system permissions of "Teacher" role:
       | capability | permission |
       | block/mnet_hosts:myaddinstance | Allow |
-      | moodle/community:add | Inherit |
+      | moodle/site:messageanyuser | Inherit |
       | moodle/grade:managesharedforms | Prevent |
       | moodle/course:request | Prohibit |
     When I follow "Edit Teacher role"
     Then "block/mnet_hosts:myaddinstance" capability has "Allow" permission
-    And "moodle/community:add" capability has "Not set" permission
+    And "moodle/site:messageanyuser" capability has "Not set" permission
     And "moodle/grade:managesharedforms" capability has "Prevent" permission
     And "moodle/course:request" capability has "Prohibit" permission
 
diff --git a/admin/tool/behat/tests/behat/get_and_set_fields_in_containers.feature b/admin/tool/behat/tests/behat/get_and_set_fields_in_containers.feature
new file mode 100644
index 0000000000000..cbc84c36a6b57
--- /dev/null
+++ b/admin/tool/behat/tests/behat/get_and_set_fields_in_containers.feature
@@ -0,0 +1,27 @@
+@tool_behat
+Feature: Behat steps for interacting with form work
+  In order to test my Moodle code
+  As a developer
+  I need the Behat steps for form elements to work reliably
+
+  @javascript
+  Scenario: Test fields in containers
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    When I log in as "admin"
+    And I am on "Course 1" course homepage
+    # Just get to any form.
+    And I navigate to "Edit settings" in current page administration
+    And I set the field "Course full name" in the "General" "fieldset" to "Frog"
+    And I set the following fields in the "Appearance" "fieldset" to these values:
+      | Show activity reports   | Yes |
+      | Number of announcements | 1   |
+    Then the field "Show activity reports" in the "Appearance" "fieldset" matches value "Yes"
+    And the field "Show activity reports" in the "Appearance" "fieldset" does not match value "No"
+    And the following fields in the "region-main" "region" match these values:
+      | Course full name        | Frog |
+      | Number of announcements | 1    |
+    And the following fields in the "region-main" "region" do not match these values:
+      | Course full name        | Course 1 |
+      | Number of announcements | 5        |
diff --git a/admin/tool/behat/tests/behat/list_steps.feature b/admin/tool/behat/tests/behat/list_steps.feature
index 9ad81f9c2eee0..8e59cb8f50dec 100644
--- a/admin/tool/behat/tests/behat/list_steps.feature
+++ b/admin/tool/behat/tests/behat/list_steps.feature
@@ -26,3 +26,11 @@ Feature: List the system steps definitions
     Given I set the field "Contains" to "homepage"
     When I press "Filter"
     Then I should see "Opens Moodle homepage."
+
+  @javascript
+  Scenario: Filtering by the multiple words pattern
+    Given I set the field "Contains" to "should exist"
+    When I press "Filter"
+    Then I should not see "There aren't steps definitions matching this filter"
+    And I should see "Checks the provided element and selector type exists in the current page."
+    And I should see "Checks that an element and selector type exists in another element and selector type on the current page."
diff --git a/admin/tool/capability/renderer.php b/admin/tool/capability/renderer.php
index dde7c3e6bdb50..427613ef1596b 100644
--- a/admin/tool/capability/renderer.php
+++ b/admin/tool/capability/renderer.php
@@ -75,6 +75,7 @@ protected function get_permission_classes() {
      * @return string
      */
     public function capability_comparison_table(array $capabilities, $contextid, array $roles) {
+        static $capabilitycontexts = array();
 
         $strpermissions = $this->get_permission_strings();
         $permissionclasses = $this->get_permission_classes();
@@ -93,7 +94,11 @@ public function capability_comparison_table(array $capabilities, $contextid, arr
         $table->data = array();
 
         foreach ($capabilities as $capability) {
-            $contexts = tool_capability_calculate_role_data($capability, $roles);
+            if (empty($capabilitycontexts[$capability])) {
+                $capabilitycontexts[$capability] = tool_capability_calculate_role_data($capability, $roles);
+            }
+            $contexts = $capabilitycontexts[$capability];
+
             $captitle = new html_table_cell(get_capability_string($capability) . html_writer::span($capability));
             $captitle->header = true;
 
@@ -114,15 +119,17 @@ public function capability_comparison_table(array $capabilities, $contextid, arr
         }
 
         // Start the list item, and print the context name as a link to the place to make changes.
-        if ($contextid == context_system::instance()->id) {
+        $context = context::instance_by_id($contextid);
+
+        if ($context instanceof context_system) {
             $url = new moodle_url('/admin/roles/manage.php');
-            $title = get_string('changeroles', 'tool_capability');
         } else {
-            $url = new moodle_url('/admin/roles/override.php', array('contextid' => $contextid));
-            $title = get_string('changeoverrides', 'tool_capability');
+            $url = new moodle_url('/admin/roles/permissions.php', ['contextid' => $contextid]);
         }
-        $context = context::instance_by_id($contextid);
-        $html = $this->output->heading(html_writer::link($url, $context->get_context_name(), array('title' => $title)), 3);
+
+        $title = get_string('permissionsincontext', 'core_role', $context->get_context_name());
+
+        $html = $this->output->heading(html_writer::link($url, $context->get_context_name(), ['title' => $title]), 3);
         $html .= html_writer::table($table);
         // If there are any child contexts, print them recursively.
         if (!empty($contexts[$contextid]->children)) {
@@ -133,4 +140,4 @@ public function capability_comparison_table(array $capabilities, $contextid, arr
         return $html;
     }
 
-}
\ No newline at end of file
+}
diff --git a/admin/tool/cohortroles/classes/api.php b/admin/tool/cohortroles/classes/api.php
index b3f0e541e0538..89f54aea73da5 100644
--- a/admin/tool/cohortroles/classes/api.php
+++ b/admin/tool/cohortroles/classes/api.php
@@ -144,6 +144,10 @@ public static function sync_all_cohort_roles() {
         $rolesadded = array();
         $rolesremoved = array();
 
+        // Remove any cohort role mappings for roles which have been deleted.
+        // The role assignments are not a consideration because these will have been removed when the role was.
+        $DB->delete_records_select('tool_cohortroles', "roleid NOT IN (SELECT id FROM {role})");
+
         // Get all cohort role assignments and group them by user and role.
         $all = cohort_role_assignment::get_records(array(), 'userid, roleid');
         // We build an better structure to loop on.
@@ -222,6 +226,48 @@ public static function sync_all_cohort_roles() {
             }
         }
 
+        // Clean the legacy role assignments which are stale.
+        $paramsclean['usercontext'] = CONTEXT_USER;
+        $paramsclean['component'] = 'tool_cohortroles';
+        $sql = 'SELECT DISTINCT(ra.id), ra.roleid, ra.userid, ra.contextid, ctx.instanceid
+                  FROM {role_assignments} ra
+                  JOIN {context} ctx ON ctx.id = ra.contextid AND ctx.contextlevel = :usercontext
+                  JOIN {cohort_members} cm ON cm.userid = ctx.instanceid
+                  LEFT JOIN {tool_cohortroles} tc ON tc.cohortid = cm.cohortid
+                    AND tc.userid = ra.userid
+                    AND tc.roleid = ra.roleid
+                 WHERE ra.component = :component
+                   AND tc.id is null';
+        if ($candidatelegacyassignments = $DB->get_records_sql($sql, $paramsclean)) {
+            $sql = 'SELECT DISTINCT(ra.id)
+                  FROM {role_assignments} ra
+                  JOIN {context} ctx ON ctx.id = ra.contextid AND ctx.contextlevel = :usercontext
+                  JOIN {cohort_members} cm ON cm.userid = ctx.instanceid
+                  JOIN {tool_cohortroles} tc ON tc.cohortid = cm.cohortid AND tc.userid = ra.userid
+                 WHERE ra.component = :component';
+            if ($currentvalidroleassignments = $DB->get_records_sql($sql, $paramsclean)) {
+                foreach ($candidatelegacyassignments as $candidate) {
+                    if (!array_key_exists($candidate->id, $currentvalidroleassignments)) {
+                        role_unassign($candidate->roleid, $candidate->userid, $candidate->contextid, 'tool_cohortroles');
+                        $rolesremoved[] = array(
+                            'useridassignedto' => $candidate->userid,
+                            'useridassignedover' => $candidate->instanceid,
+                            'roleid' => $candidate->roleid
+                        );
+                    }
+                }
+            } else {
+                foreach ($candidatelegacyassignments as $candidate) {
+                    role_unassign($candidate->roleid, $candidate->userid, $candidate->contextid, 'tool_cohortroles');
+                    $rolesremoved[] = array(
+                        'useridassignedto' => $candidate->userid,
+                        'useridassignedover' => $candidate->instanceid,
+                        'roleid' => $candidate->roleid
+                    );
+                }
+            }
+        }
+
         return array('rolesadded' => $rolesadded, 'rolesremoved' => $rolesremoved);
     }
 
diff --git a/admin/tool/cohortroles/classes/cohort_role_assignment.php b/admin/tool/cohortroles/classes/cohort_role_assignment.php
index 08ac464107621..08255cfb119a3 100644
--- a/admin/tool/cohortroles/classes/cohort_role_assignment.php
+++ b/admin/tool/cohortroles/classes/cohort_role_assignment.php
@@ -103,5 +103,4 @@ protected function validate_cohortid($value) {
 
         return true;
     }
-
 }
diff --git a/admin/tool/cohortroles/tests/api_test.php b/admin/tool/cohortroles/tests/api_test.php
index d276a2f13ed07..2d99e5c37acb2 100644
--- a/admin/tool/cohortroles/tests/api_test.php
+++ b/admin/tool/cohortroles/tests/api_test.php
@@ -50,8 +50,6 @@ class tool_cohortroles_api_testcase extends advanced_testcase {
      * Setup function- we will create a course and add an assign instance to it.
      */
     protected function setUp() {
-        global $DB;
-
         $this->resetAfterTest(true);
 
         // Create some users.
@@ -133,14 +131,91 @@ public function test_delete_cohort_role_assignment_with_invalid_data() {
 
     public function test_delete_cohort_role_assignment() {
         $this->setAdminUser();
-        $params = (object) array(
+        // Create a cohort role assigment.
+        $params = (object) [
             'userid' => $this->userassignto->id,
             'roleid' => $this->roleid,
             'cohortid' => $this->cohort->id
-        );
-        $result = api::create_cohort_role_assignment($params);
-        $worked = api::delete_cohort_role_assignment($result->get('id'));
-        $this->assertTrue($worked);
+        ];
+        $cohortroleassignment = api::create_cohort_role_assignment($params);
+        $sync = api::sync_all_cohort_roles();
+        $rolesadded = [
+            [
+                'useridassignedto' => $this->userassignto->id,
+                'useridassignedover' => $this->userassignover->id,
+                'roleid' => $this->roleid
+            ]
+        ];
+        $expected = [
+            'rolesadded' => $rolesadded,
+            'rolesremoved' => []
+        ];
+        $this->assertEquals($sync, $expected);
+
+        // Delete the cohort role assigment and confirm the roles are removed.
+        $result = api::delete_cohort_role_assignment($cohortroleassignment->get('id'));
+        $this->assertTrue($result);
+        $sync = api::sync_all_cohort_roles();
+        $expected = [
+            'rolesadded' => [],
+            'rolesremoved' => $rolesadded
+        ];
+        $this->assertEquals($expected, $sync);
+    }
+
+    /**
+     * Test case verifying that syncing won't remove role assignments if they are valid for another cohort role assignment.
+     */
+    public function test_delete_cohort_role_assignment_cohorts_having_same_members() {
+        $this->setAdminUser();
+
+        // Create 2 cohorts, with a 1 user (user1) present in both,
+        // and user2 and user3 members of 1 cohort each.
+        $cohort1 = $this->getDataGenerator()->create_cohort();
+        $cohort2 = $this->getDataGenerator()->create_cohort();
+        $user1 = $this->getDataGenerator()->create_user();
+        $user2 = $this->getDataGenerator()->create_user();
+        $user3 = $this->getDataGenerator()->create_user();
+        cohort_add_member($cohort1->id, $user1->id);
+        cohort_add_member($cohort1->id, $user2->id);
+        cohort_add_member($cohort2->id, $user1->id);
+        cohort_add_member($cohort2->id, $user3->id);
+
+        // And a role and a user to assign that role to.
+        $user4 = $this->getDataGenerator()->create_user(); // A cohort manager, for example.
+        $roleid = create_role('Role 1', 'myrole', 'test');
+
+        // Assign the role for user4 in both cohorts.
+        $params = (object) [
+            'userid' => $user4->id,
+            'roleid' => $roleid,
+            'cohortid' => $cohort1->id
+        ];
+        $cohort1roleassignment = api::create_cohort_role_assignment($params);
+        $params->cohortid = $cohort2->id;
+        $cohort2roleassignment = api::create_cohort_role_assignment($params);
+
+        $sync = api::sync_all_cohort_roles();
+
+        // There is no guarantee about the order of roles assigned.
+        // so confirm we have 3 role assignments, and they are for the users 1, 2 and 3.
+        $this->assertCount(3, $sync['rolesadded']);
+        $addedusers = array_column($sync['rolesadded'], 'useridassignedover');
+        $this->assertContains($user1->id, $addedusers);
+        $this->assertContains($user2->id, $addedusers);
+        $this->assertContains($user3->id, $addedusers);
+
+        // Remove the role assignment for user4/cohort1.
+        // Verify only 1 role is unassigned as the others are still valid for the other cohort role assignment.
+        $result = api::delete_cohort_role_assignment($cohort1roleassignment->get('id'));
+        $this->assertTrue($result);
+
+        $sync = api::sync_all_cohort_roles();
+
+        $this->assertCount(0, $sync['rolesadded']);
+        $this->assertCount(1, $sync['rolesremoved']);
+        $removedusers = array_column($sync['rolesremoved'], 'useridassignedover');
+        $this->assertContains($user2->id, $removedusers);
     }
 
     public function test_list_cohort_role_assignments() {
diff --git a/admin/tool/customlang/db/upgrade.php b/admin/tool/customlang/db/upgrade.php
index 53fa80a2039d9..823c1e72a6a77 100644
--- a/admin/tool/customlang/db/upgrade.php
+++ b/admin/tool/customlang/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/customlang/templates/translator.mustache b/admin/tool/customlang/templates/translator.mustache
index 5092f68bab968..62cbdac7c3107 100644
--- a/admin/tool/customlang/templates/translator.mustache
+++ b/admin/tool/customlang/templates/translator.mustache
@@ -113,14 +113,14 @@
                     <div class="d-md-none">
                         <strong>{{#str}}headingstandard, tool_customlang{{/str}}</strong>
                     </div>
-                    {{{ master }}}
+                    {{ master }}
                     <div class="info">
                         {{{ placeholderhelp }}}
                         {{{ outdatedhelp}}}
                     </div>
                     {{#showoriginalvsmaster}}
                     <div class="alert-secondary mt-3 mt-1">
-                        {{{ original }}}
+                        {{ original }}
                     </div>
                     {{/showoriginalvsmaster}}
                 </div>
@@ -146,5 +146,14 @@
         </div>
     {{/strings}}
     </div>
+
+    <fieldset class="m-a-1 m-3">
+        <button type="submit" name="savecontinue" class="btn btn-secondary">
+            {{#str}}savecontinue, tool_customlang{{/str}}
+        </button>
+        <button type="submit" name="savecheckin" class="btn btn-secondary">
+            {{#str}}savecheckin, tool_customlang{{/str}}
+        </button>
+    </fieldset>
 </form>
 {{/hasstrings}}
diff --git a/admin/tool/dataprivacy/amd/build/expand_contract.min.js b/admin/tool/dataprivacy/amd/build/expand_contract.min.js
index 3419d58da10fa..4bd453b6870c2 100644
--- a/admin/tool/dataprivacy/amd/build/expand_contract.min.js
+++ b/admin/tool/dataprivacy/amd/build/expand_contract.min.js
@@ -1 +1 @@
-define(["jquery","core/url","core/str"],function(a,b,c){var d=a('<img alt="" src="'+b.imageUrl("t/expanded")+'"/>'),e=a('<img alt="" src="'+b.imageUrl("t/collapsed")+'"/>');return{expandCollapse:function(a,b){a.hasClass("hide")?(a.removeClass("hide"),a.addClass("visible"),a.attr("aria-expanded",!0),b.find(":header i.fa").removeClass("fa-plus-square"),b.find(":header i.fa").addClass("fa-minus-square"),b.find(":header img.icon").attr("src",d.attr("src"))):(a.removeClass("visible"),a.addClass("hide"),a.attr("aria-expanded",!1),b.find(":header i.fa").removeClass("fa-minus-square"),b.find(":header i.fa").addClass("fa-plus-square"),b.find(":header img.icon").attr("src",e.attr("src")))},expandCollapseAll:function(b){var f="visible"==b?"hide":"visible",g="visible"==b,h="visible"==b?"fa-plus-square":"fa-minus-square",i="visible"==b?"fa-minus-square":"fa-plus-square",j="visible"==b?d.attr("src"):e.attr("src");a("."+f).each(function(){a(this).removeClass(f),a(this).addClass(b),a(this).attr("aria-expanded",g)}),a(".tool_dataprivacy-expand-all").data("visibilityState",f),c.get_string(f,"tool_dataprivacy").then(function(b){a(".tool_dataprivacy-expand-all").html(b)})["catch"](Notification.exception),a(":header i.fa").each(function(){a(this).removeClass(h),a(this).addClass(i)}),a(":header img.icon").each(function(){a(this).attr("src",j)})}}});
\ No newline at end of file
+define(["jquery","core/url","core/str"],function(a,b,c){var d=a('<img alt="" src="'+b.imageUrl("t/expanded")+'"/>'),e=a('<img alt="" src="'+b.imageUrl("t/collapsed")+'"/>'),f={EXPAND:"fa-caret-right",COLLAPSE:"fa-caret-down"};return{expandCollapse:function(a,b){a.hasClass("hide")?(a.removeClass("hide"),a.addClass("visible"),a.attr("aria-expanded",!0),b.find(":header i.fa").removeClass(f.EXPAND),b.find(":header i.fa").addClass(f.COLLAPSE),b.find(":header img.icon").attr("src",d.attr("src"))):(a.removeClass("visible"),a.addClass("hide"),a.attr("aria-expanded",!1),b.find(":header i.fa").removeClass(f.COLLAPSE),b.find(":header i.fa").addClass(f.EXPAND),b.find(":header img.icon").attr("src",e.attr("src")))},expandCollapseAll:function(b){var g="visible"==b?"hide":"visible",h="visible"==b,i="visible"==b?f.EXPAND:f.COLLAPSE,j="visible"==b?f.COLLAPSE:f.EXPAND,k="visible"==b?d.attr("src"):e.attr("src");a("."+g).each(function(){a(this).removeClass(g),a(this).addClass(b),a(this).attr("aria-expanded",h)}),a(".tool_dataprivacy-expand-all").data("visibilityState",g),c.get_string(g,"tool_dataprivacy").then(function(b){a(".tool_dataprivacy-expand-all").html(b)})["catch"](Notification.exception),a(":header i.fa").each(function(){a(this).removeClass(i),a(this).addClass(j)}),a(":header img.icon").each(function(){a(this).attr("src",k)})}}});
\ No newline at end of file
diff --git a/admin/tool/dataprivacy/amd/src/expand_contract.js b/admin/tool/dataprivacy/amd/src/expand_contract.js
index cf509b5574a1c..a369f7c87213e 100644
--- a/admin/tool/dataprivacy/amd/src/expand_contract.js
+++ b/admin/tool/dataprivacy/amd/src/expand_contract.js
@@ -28,6 +28,14 @@ define(['jquery', 'core/url', 'core/str'], function($, url, str) {
     var expandedImage = $('<img alt="" src="' + url.imageUrl('t/expanded') + '"/>');
     var collapsedImage = $('<img alt="" src="' + url.imageUrl('t/collapsed') + '"/>');
 
+    /*
+     * Class names to apply when expanding/collapsing nodes.
+     */
+    var CLASSES = {
+        EXPAND: 'fa-caret-right',
+        COLLAPSE: 'fa-caret-down'
+    };
+
     return /** @alias module:tool_dataprivacy/expand-collapse */ {
         /**
          * Expand or collapse a selected node.
@@ -40,15 +48,15 @@ define(['jquery', 'core/url', 'core/str'], function($, url, str) {
                 targetnode.removeClass('hide');
                 targetnode.addClass('visible');
                 targetnode.attr('aria-expanded', true);
-                thisnode.find(':header i.fa').removeClass('fa-plus-square');
-                thisnode.find(':header i.fa').addClass('fa-minus-square');
+                thisnode.find(':header i.fa').removeClass(CLASSES.EXPAND);
+                thisnode.find(':header i.fa').addClass(CLASSES.COLLAPSE);
                 thisnode.find(':header img.icon').attr('src', expandedImage.attr('src'));
             } else {
                 targetnode.removeClass('visible');
                 targetnode.addClass('hide');
                 targetnode.attr('aria-expanded', false);
-                thisnode.find(':header i.fa').removeClass('fa-minus-square');
-                thisnode.find(':header i.fa').addClass('fa-plus-square');
+                thisnode.find(':header i.fa').removeClass(CLASSES.COLLAPSE);
+                thisnode.find(':header i.fa').addClass(CLASSES.EXPAND);
                 thisnode.find(':header img.icon').attr('src', collapsedImage.attr('src'));
             }
         },
@@ -61,8 +69,8 @@ define(['jquery', 'core/url', 'core/str'], function($, url, str) {
         expandCollapseAll: function(nextstate) {
             var currentstate = (nextstate == 'visible') ? 'hide' : 'visible';
             var ariaexpandedstate = (nextstate == 'visible') ? true : false;
-            var iconclassnow = (nextstate == 'visible') ? 'fa-plus-square' : 'fa-minus-square';
-            var iconclassnext = (nextstate == 'visible') ? 'fa-minus-square' : 'fa-plus-square';
+            var iconclassnow = (nextstate == 'visible') ? CLASSES.EXPAND : CLASSES.COLLAPSE;
+            var iconclassnext = (nextstate == 'visible') ? CLASSES.COLLAPSE : CLASSES.EXPAND;
             var imagenow = (nextstate == 'visible') ? expandedImage.attr('src') : collapsedImage.attr('src');
             $('.' + currentstate).each(function() {
                 $(this).removeClass(currentstate);
diff --git a/admin/tool/dataprivacy/classes/api.php b/admin/tool/dataprivacy/classes/api.php
index 80cb7ee172ec0..9ae864722745a 100644
--- a/admin/tool/dataprivacy/classes/api.php
+++ b/admin/tool/dataprivacy/classes/api.php
@@ -712,7 +712,7 @@ public static function notify_dpo($dpo, data_request $request) {
             'requestedby' => $requestedby->fullname,
             'requesttype' => $typetext,
             'requestdate' => userdate($requestdata->timecreated),
-            'requestorigin' => $SITE->fullname,
+            'requestorigin' => format_string($SITE->fullname, true, ['context' => context_system::instance()]),
             'requestoriginurl' => new moodle_url('/'),
             'requestcomments' => $requestdata->messagehtml,
             'datarequestsurl' => $datarequestsurl
@@ -774,7 +774,8 @@ public static function require_can_create_data_request_for_user($user, $requeste
     public static function can_create_data_deletion_request_for_self(int $userid = null): bool {
         global $USER;
         $userid = $userid ?: $USER->id;
-        return has_capability('tool/dataprivacy:requestdelete', \context_user::instance($userid), $userid);
+        return has_capability('tool/dataprivacy:requestdelete', \context_user::instance($userid), $userid)
+            && !is_primary_admin($userid);
     }
 
     /**
@@ -803,7 +804,7 @@ public static function can_create_data_deletion_request_for_children(int $userid
         global $USER;
         $requesterid = $requesterid ?: $USER->id;
         return has_capability('tool/dataprivacy:makedatadeletionrequestsforchildren', \context_user::instance($userid),
-            $requesterid);
+            $requesterid) && !is_primary_admin($userid);
     }
 
     /**
diff --git a/admin/tool/dataprivacy/classes/external.php b/admin/tool/dataprivacy/classes/external.php
index 20c28f9187c2e..4c4e71944ab36 100644
--- a/admin/tool/dataprivacy/classes/external.php
+++ b/admin/tool/dataprivacy/classes/external.php
@@ -713,7 +713,6 @@ public static function get_users($query) {
 
         list($sql, $params) = users_search_sql($query, '', false, $extrafields, $excludedusers);
         $users = $DB->get_records_select('user', $sql, $params, $sort, $fields, 0, 30);
-
         $useroptions = [];
         foreach ($users as $user) {
             $useroption = (object)[
@@ -722,9 +721,10 @@ public static function get_users($query) {
             ];
             $useroption->extrafields = [];
             foreach ($extrafields as $extrafield) {
+                // Sanitize the extra fields to prevent potential XSS exploit.
                 $useroption->extrafields[] = (object)[
                     'name' => $extrafield,
-                    'value' => $user->$extrafield
+                    'value' => s($user->$extrafield)
                 ];
             }
             $useroptions[$user->id] = $useroption;
diff --git a/admin/tool/dataprivacy/classes/form/purpose.php b/admin/tool/dataprivacy/classes/form/purpose.php
index 72472e5c8d84f..1de9317c41f26 100644
--- a/admin/tool/dataprivacy/classes/form/purpose.php
+++ b/admin/tool/dataprivacy/classes/form/purpose.php
@@ -440,6 +440,9 @@ protected static function convert_fields(\stdClass $data) {
         }
         if (!empty($data->sensitivedatareasons) && is_array($data->sensitivedatareasons)) {
             $data->sensitivedatareasons = implode(',', $data->sensitivedatareasons);
+        } else {
+            // Nothing selected. Set default value of null.
+            $data->sensitivedatareasons = null;
         }
 
         // A single value.
diff --git a/admin/tool/dataprivacy/classes/task/process_data_request_task.php b/admin/tool/dataprivacy/classes/task/process_data_request_task.php
index 7b9fad33b0d95..780e25afa8977 100644
--- a/admin/tool/dataprivacy/classes/task/process_data_request_task.php
+++ b/admin/tool/dataprivacy/classes/task/process_data_request_task.php
@@ -26,6 +26,7 @@
 
 use action_link;
 use coding_exception;
+use context_system;
 use core\message\message;
 use core\task\adhoc_task;
 use core_user;
@@ -127,13 +128,17 @@ public function execute() {
             $thing = $fs->create_file_from_pathname($filerecord, $exportedcontent);
             $completestatus = api::DATAREQUEST_STATUS_DOWNLOAD_READY;
         } else if ($request->type == api::DATAREQUEST_TYPE_DELETE) {
-            // Delete the data.
-            $manager = new \core_privacy\manager();
-            $manager->set_observer(new \tool_dataprivacy\manager_observer());
+            // Delete the data for users other than the primary admin, which is rejected.
+            if (is_primary_admin($foruser->id)) {
+                $completestatus = api::DATAREQUEST_STATUS_REJECTED;
+            } else {
+                $manager = new \core_privacy\manager();
+                $manager->set_observer(new \tool_dataprivacy\manager_observer());
 
-            $manager->delete_data_for_user($approvedclcollection);
-            $completestatus = api::DATAREQUEST_STATUS_DELETED;
-            $deleteuser = !$foruser->deleted;
+                $manager->delete_data_for_user($approvedclcollection);
+                $completestatus = api::DATAREQUEST_STATUS_DELETED;
+                $deleteuser = !$foruser->deleted;
+            }
         }
 
         // When the preparation of the metadata finishes, update the request status to awaiting approval.
@@ -148,7 +153,7 @@ public function execute() {
         $message->name = 'datarequestprocessingresults';
         $message->userfrom = $dpo;
         $message->replyto = $dpo->email;
-        $message->replytoname = fullname($dpo->email);
+        $message->replytoname = fullname($dpo);
 
         $typetext = null;
         // Prepare the context data for the email message body.
@@ -176,7 +181,8 @@ public function execute() {
                 $message->contexturl = $datarequestsurl;
                 $message->contexturlname = get_string('datarequests', 'tool_dataprivacy');
                 // Message to the recipient.
-                $messagetextdata['message'] = get_string('resultdownloadready', 'tool_dataprivacy', $SITE->fullname);
+                $messagetextdata['message'] = get_string('resultdownloadready', 'tool_dataprivacy',
+                    format_string($SITE->fullname, true, ['context' => context_system::instance()]));
                 // Prepare download link.
                 $downloadurl = moodle_url::make_pluginfile_url($usercontext->id, 'tool_dataprivacy', 'export', $thing->get_itemid(),
                     $thing->get_filepath(), $thing->get_filename(), true);
@@ -188,7 +194,8 @@ public function execute() {
                 // No point notifying a deleted user in Moodle.
                 $message->notification = 0;
                 // Message to the recipient.
-                $messagetextdata['message'] = get_string('resultdeleted', 'tool_dataprivacy', $SITE->fullname);
+                $messagetextdata['message'] = get_string('resultdeleted', 'tool_dataprivacy',
+                    format_string($SITE->fullname, true, ['context' => context_system::instance()]));
                 // Message will be sent to the deleted user via email only.
                 $emailonly = true;
                 break;
diff --git a/admin/tool/dataprivacy/db/upgrade.php b/admin/tool/dataprivacy/db/upgrade.php
index 47989cb8b106d..49cedd626f4d3 100644
--- a/admin/tool/dataprivacy/db/upgrade.php
+++ b/admin/tool/dataprivacy/db/upgrade.php
@@ -316,5 +316,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/dataprivacy/templates/form-user-selector-suggestion.mustache b/admin/tool/dataprivacy/templates/form-user-selector-suggestion.mustache
index 0f8443d313e10..92896a6e5f9ba 100644
--- a/admin/tool/dataprivacy/templates/form-user-selector-suggestion.mustache
+++ b/admin/tool/dataprivacy/templates/form-user-selector-suggestion.mustache
@@ -47,6 +47,6 @@
 <span>
     <span>{{fullname}}</span>
     {{#extrafields}}
-        <span><small>{{value}}</small></span>
+        <span><small>{{{value}}}</small></span>
     {{/extrafields}}
 </span>
diff --git a/admin/tool/dataprivacy/tests/api_test.php b/admin/tool/dataprivacy/tests/api_test.php
index f95dedda43934..65894ecd94656 100644
--- a/admin/tool/dataprivacy/tests/api_test.php
+++ b/admin/tool/dataprivacy/tests/api_test.php
@@ -301,6 +301,34 @@ public function test_approve_data_request_non_dpo_user() {
         $datarequest = api::create_data_request($student->id, api::DATAREQUEST_TYPE_EXPORT);
 
         $requestid = $datarequest->get('id');
+
+        // Login as a user without DPO role.
+        $this->setUser($teacher);
+        $this->expectException(required_capability_exception::class);
+        api::approve_data_request($requestid);
+    }
+
+    /**
+     * Test that deletion requests for the primary admin are rejected
+     */
+    public function test_reject_data_deletion_request_primary_admin() {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $datarequest = api::create_data_request(get_admin()->id, api::DATAREQUEST_TYPE_DELETE);
+
+        // Approve the request and execute the ad-hoc process task.
+        ob_start();
+        api::approve_data_request($datarequest->get('id'));
+        $this->runAdhocTasks('\tool_dataprivacy\task\process_data_request_task');
+        ob_end_clean();
+
+        $request = api::get_request($datarequest->get('id'));
+        $this->assertEquals(api::DATAREQUEST_STATUS_REJECTED, $request->get('status'));
+
+        // Confirm they weren't deleted.
+        $user = core_user::get_user($request->get('userid'));
+        core_user::require_active_user($user);
     }
 
     /**
@@ -2126,6 +2154,33 @@ public function test_can_create_data_deletion_request_for_self_no() {
         $this->assertFalse(api::can_create_data_deletion_request_for_self());
     }
 
+    /**
+     * Test primary admin cannot create data deletion request for themselves
+     */
+    public function test_can_create_data_deletion_request_for_self_primary_admin() {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+        $this->assertFalse(api::can_create_data_deletion_request_for_self());
+    }
+
+    /**
+     * Test secondary admin can create data deletion request for themselves
+     */
+    public function test_can_create_data_deletion_request_for_self_secondary_admin() {
+        $this->resetAfterTest();
+
+        $admin1 = $this->getDataGenerator()->create_user();
+        $admin2 = $this->getDataGenerator()->create_user();
+
+        // The primary admin is the one listed first in the 'siteadmins' config.
+        set_config('siteadmins', implode(',', [$admin1->id, $admin2->id]));
+
+        // Set the current user as the second admin (non-primary).
+        $this->setUser($admin2);
+
+        $this->assertTrue(api::can_create_data_deletion_request_for_self());
+    }
+
     /**
      * Test user can create data deletion request for themselves if they have
      * "tool/dataprivacy:requestdelete" capability.
@@ -2171,7 +2226,8 @@ public function test_can_create_data_deletion_request_for_other_yes() {
     }
 
     /**
-     * Check parents can create data deletion request for their children but not others.
+     * Check parents can create data deletion request for their children (unless the child is the primary admin),
+     * but not other users.
      *
      * @throws coding_exception
      * @throws dml_exception
@@ -2194,5 +2250,9 @@ public function test_can_create_data_deletion_request_for_children() {
         $this->setUser($parent);
         $this->assertTrue(api::can_create_data_deletion_request_for_children($child->id));
         $this->assertFalse(api::can_create_data_deletion_request_for_children($otheruser->id));
+
+        // Now make child the primary admin, confirm parent can't make deletion request.
+        set_config('siteadmins', $child->id);
+        $this->assertFalse(api::can_create_data_deletion_request_for_children($child->id));
     }
 }
diff --git a/admin/tool/dataprivacy/tests/behat/datadelete.feature b/admin/tool/dataprivacy/tests/behat/datadelete.feature
index 5806102f6cc17..0a4da1b114f69 100644
--- a/admin/tool/dataprivacy/tests/behat/datadelete.feature
+++ b/admin/tool/dataprivacy/tests/behat/datadelete.feature
@@ -189,6 +189,12 @@ Feature: Data delete from the privacy API
     And I follow "Profile" in the user menu
     Then I should not see "Delete my account"
 
+  @javascript
+  Scenario: As a primary admin, the link to create a data deletion request should not be shown.
+    Given I log in as "admin"
+    When I follow "Profile" in the user menu
+    Then I should not see "Delete my account"
+
   @javascript
   Scenario: As a Privacy Officer, I cannot Approve to Deny deletion data request without permission.
     Given the following "permission overrides" exist:
diff --git a/admin/tool/log/db/upgrade.php b/admin/tool/log/db/upgrade.php
index bbf196143f9a0..b3de05d459bba 100644
--- a/admin/tool/log/db/upgrade.php
+++ b/admin/tool/log/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_tool_log_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/lang/en/tool_log.php b/admin/tool/log/lang/en/tool_log.php
index 571b91fdd8fba..9bc9423a8c9f0 100644
--- a/admin/tool/log/lang/en/tool_log.php
+++ b/admin/tool/log/lang/en/tool_log.php
@@ -24,7 +24,7 @@
 
 $string['actlogshdr'] = 'Available log stores';
 $string['configlogplugins'] = 'Please enable all required plugins and arrange them in appropriate order.';
-$string['exportlog'] = 'Include logs when exporting.';
+$string['exportlog'] = 'Include logs when exporting';
 $string['exportlogdetail'] = 'Include logs that relate to the user when exporting.';
 $string['logging'] = 'Logging';
 $string['managelogging'] = 'Manage log stores';
diff --git a/admin/tool/log/store/database/db/upgrade.php b/admin/tool/log/store/database/db/upgrade.php
index b5536abdda7e6..e17a51e1ea839 100644
--- a/admin/tool/log/store/database/db/upgrade.php
+++ b/admin/tool/log/store/database/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2019032800, 'logstore', 'database');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/store/standard/db/upgrade.php b/admin/tool/log/store/standard/db/upgrade.php
index e1ac5a2ddc102..a341ac8eab900 100644
--- a/admin/tool/log/store/standard/db/upgrade.php
+++ b/admin/tool/log/store/standard/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2019032800, 'logstore', 'standard');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/lp/amd/build/competencies.min.js b/admin/tool/lp/amd/build/competencies.min.js
index 6d24fd8aeaf14..51859f56099a7 100644
--- a/admin/tool/lp/amd/build/competencies.min.js
+++ b/admin/tool/lp/amd/build/competencies.min.js
@@ -1 +1 @@
-define(["jquery","core/notification","core/ajax","core/templates","core/str","tool_lp/competencypicker","tool_lp/dragdrop-reorder"],function(a,b,c,d,e,f,g){var h=function(b,c,d){this.itemid=b,this.itemtype=c,this.pageContextId=d,this.pickerInstance=null,a('[data-region="actions"] button').prop("disabled",!1),this.registerEvents(),this.registerDragDrop()};return h.prototype.registerDragDrop=function(){var a=this;e.get_string("movecompetency","tool_lp").done(function(b){g.dragdrop("movecompetency",b,{identifier:"movecompetency",component:"tool_lp"},{identifier:"movecompetencyafter",component:"tool_lp"},"drag-samenode","drag-parentnode","drag-handlecontainer",function(b,c){a.handleDrop(b,c)})}).fail(b.exception)},h.prototype.handleDrop=function(d,e){var f=a(d).data("id"),g=a(e).data("id"),h=this,i=[];if("course"==h.itemtype)i=c.call([{methodname:"core_competency_reorder_course_competency",args:{courseid:h.itemid,competencyidfrom:f,competencyidto:g}}]);else if("template"==h.itemtype)i=c.call([{methodname:"core_competency_reorder_template_competency",args:{templateid:h.itemid,competencyidfrom:f,competencyidto:g}}]);else{if("plan"!=h.itemtype)return;i=c.call([{methodname:"core_competency_reorder_plan_competency",args:{planid:h.itemid,competencyidfrom:f,competencyidto:g}}])}i[0].fail(b.exception)},h.prototype.pickCompetency=function(){var e,g,h,i,j=this;j.pickerInstance||("template"!==j.itemtype&&"course"!==j.itemtype||(i="parents"),j.pickerInstance=new f(j.pageContextId,(!1),i),j.pickerInstance.on("save",function(f,i){var k=i.competencyIds;"course"===j.itemtype?(e=[],a.each(k,function(a,b){e.push({methodname:"core_competency_add_competency_to_course",args:{courseid:j.itemid,competencyid:b}})}),e.push({methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:j.itemid,moduleid:0}}),g="tool_lp/course_competencies_page",h="coursecompetenciespage"):"template"===j.itemtype?(e=[],a.each(k,function(a,b){e.push({methodname:"core_competency_add_competency_to_template",args:{templateid:j.itemid,competencyid:b}})}),e.push({methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:j.itemid,pagecontext:{contextid:j.pageContextId}}}),g="tool_lp/template_competencies_page",h="templatecompetenciespage"):"plan"===j.itemtype&&(e=[],a.each(k,function(a,b){e.push({methodname:"core_competency_add_competency_to_plan",args:{planid:j.itemid,competencyid:b}})}),e.push({methodname:"tool_lp_data_for_plan_page",args:{planid:j.itemid}}),g="tool_lp/plan_page",h="plan-page"),c.call(e)[e.length-1].then(function(a){return d.render(g,a)}).then(function(b,c){a('[data-region="'+h+'"]').replaceWith(b),d.runTemplateJS(c)})["catch"](b.exception)})),j.pickerInstance.display()},h.prototype.doDelete=function(e){var f=this,g=[],h="",i="";"course"==f.itemtype?(g=c.call([{methodname:"core_competency_remove_competency_from_course",args:{courseid:f.itemid,competencyid:e}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:f.itemid,moduleid:0}}]),h="tool_lp/course_competencies_page",i="coursecompetenciespage"):"template"==f.itemtype?(g=c.call([{methodname:"core_competency_remove_competency_from_template",args:{templateid:f.itemid,competencyid:e}},{methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:f.itemid,pagecontext:{contextid:f.pageContextId}}}]),h="tool_lp/template_competencies_page",i="templatecompetenciespage"):"plan"==f.itemtype&&(g=c.call([{methodname:"core_competency_remove_competency_from_plan",args:{planid:f.itemid,competencyid:e}},{methodname:"tool_lp_data_for_plan_page",args:{planid:f.itemid}}]),h="tool_lp/plan_page",i="plan-page"),g[1].done(function(c){d.render(h,c).done(function(b,c){a('[data-region="'+i+'"]').replaceWith(b),d.runTemplateJS(c)}).fail(b.exception)}).fail(b.exception)},h.prototype.deleteHandler=function(a){var d,f=this,g=[];if("course"==f.itemtype)d="unlinkcompetencycourse";else if("template"==f.itemtype)d="unlinkcompetencytemplate";else{if("plan"!=f.itemtype)return;d="unlinkcompetencyplan"}g=c.call([{methodname:"core_competency_read_competency",args:{id:a}}]),g[0].done(function(c){e.get_strings([{key:"confirm",component:"moodle"},{key:d,component:"tool_lp",param:c.shortname},{key:"confirm",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(c){b.confirm(c[0],c[1],c[2],c[3],function(){f.doDelete(a)})}).fail(b.exception)}).fail(b.exception)},h.prototype.registerEvents=function(){var e=this;"course"==e.itemtype&&a('[data-region="coursecompetenciespage"]').on("change",'select[data-field="ruleoutcome"]',function(f){var g=[],h="tool_lp/course_competencies_page",i="coursecompetenciespage",j=a(f.target).data("id"),k=a(f.target).val();g=c.call([{methodname:"core_competency_set_course_competency_ruleoutcome",args:{coursecompetencyid:j,ruleoutcome:k}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:e.itemid,moduleid:0}}]),g[1].done(function(c){d.render(h,c).done(function(b,c){a('[data-region="'+i+'"]').replaceWith(b),d.runTemplateJS(c)}).fail(b.exception)}).fail(b.exception)}),a('[data-region="actions"] button').click(function(a){a.preventDefault(),e.pickCompetency()}),a('[data-action="delete-competency-link"]').click(function(b){b.preventDefault();var c=a(b.target).closest("[data-id]").data("id");e.deleteHandler(c)})},h});
\ No newline at end of file
+define(["jquery","core/notification","core/ajax","core/templates","core/str","tool_lp/competencypicker","tool_lp/dragdrop-reorder","core/pending"],function(a,b,c,d,e,f,g,h){var i=function(b,c,d){this.itemid=b,this.itemtype=c,this.pageContextId=d,this.pickerInstance=null,a('[data-region="actions"] button').prop("disabled",!1),this.registerEvents(),this.registerDragDrop()};return i.prototype.registerDragDrop=function(){var a=this;e.get_string("movecompetency","tool_lp").done(function(b){g.dragdrop("movecompetency",b,{identifier:"movecompetency",component:"tool_lp"},{identifier:"movecompetencyafter",component:"tool_lp"},"drag-samenode","drag-parentnode","drag-handlecontainer",function(b,c){a.handleDrop(b,c)})}).fail(b.exception)},i.prototype.handleDrop=function(d,e){var f=a(d).data("id"),g=a(e).data("id"),h=this,i=[];if("course"==h.itemtype)i=c.call([{methodname:"core_competency_reorder_course_competency",args:{courseid:h.itemid,competencyidfrom:f,competencyidto:g}}]);else if("template"==h.itemtype)i=c.call([{methodname:"core_competency_reorder_template_competency",args:{templateid:h.itemid,competencyidfrom:f,competencyidto:g}}]);else{if("plan"!=h.itemtype)return;i=c.call([{methodname:"core_competency_reorder_plan_competency",args:{planid:h.itemid,competencyidfrom:f,competencyidto:g}}])}i[0].fail(b.exception)},i.prototype.pickCompetency=function(){var e,g,i,j,k=this;return k.pickerInstance||("template"!==k.itemtype&&"course"!==k.itemtype||(j="parents"),k.pickerInstance=new f(k.pageContextId,(!1),j),k.pickerInstance.on("save",function(f,j){var l=j.competencyIds,m=new h;"course"===k.itemtype?(e=[],a.each(l,function(a,b){e.push({methodname:"core_competency_add_competency_to_course",args:{courseid:k.itemid,competencyid:b}})}),e.push({methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:k.itemid,moduleid:0}}),g="tool_lp/course_competencies_page",i="coursecompetenciespage"):"template"===k.itemtype?(e=[],a.each(l,function(a,b){e.push({methodname:"core_competency_add_competency_to_template",args:{templateid:k.itemid,competencyid:b}})}),e.push({methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:k.itemid,pagecontext:{contextid:k.pageContextId}}}),g="tool_lp/template_competencies_page",i="templatecompetenciespage"):"plan"===k.itemtype&&(e=[],a.each(l,function(a,b){e.push({methodname:"core_competency_add_competency_to_plan",args:{planid:k.itemid,competencyid:b}})}),e.push({methodname:"tool_lp_data_for_plan_page",args:{planid:k.itemid}}),g="tool_lp/plan_page",i="plan-page"),c.call(e)[e.length-1].then(function(a){return d.render(g,a)}).then(function(b,c){d.replaceNode(a('[data-region="'+i+'"]'),b,c)}).then(m.resolve)["catch"](b.exception)})),k.pickerInstance.display()},i.prototype.doDelete=function(e){var f=this,g=[],h="",i="";"course"==f.itemtype?(g=c.call([{methodname:"core_competency_remove_competency_from_course",args:{courseid:f.itemid,competencyid:e}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:f.itemid,moduleid:0}}]),h="tool_lp/course_competencies_page",i="coursecompetenciespage"):"template"==f.itemtype?(g=c.call([{methodname:"core_competency_remove_competency_from_template",args:{templateid:f.itemid,competencyid:e}},{methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:f.itemid,pagecontext:{contextid:f.pageContextId}}}]),h="tool_lp/template_competencies_page",i="templatecompetenciespage"):"plan"==f.itemtype&&(g=c.call([{methodname:"core_competency_remove_competency_from_plan",args:{planid:f.itemid,competencyid:e}},{methodname:"tool_lp_data_for_plan_page",args:{planid:f.itemid}}]),h="tool_lp/plan_page",i="plan-page"),g[1].done(function(c){d.render(h,c).done(function(b,c){a('[data-region="'+i+'"]').replaceWith(b),d.runTemplateJS(c)}).fail(b.exception)}).fail(b.exception)},i.prototype.deleteHandler=function(a){var d,f=this,g=[];if("course"==f.itemtype)d="unlinkcompetencycourse";else if("template"==f.itemtype)d="unlinkcompetencytemplate";else{if("plan"!=f.itemtype)return;d="unlinkcompetencyplan"}g=c.call([{methodname:"core_competency_read_competency",args:{id:a}}]),g[0].done(function(c){e.get_strings([{key:"confirm",component:"moodle"},{key:d,component:"tool_lp",param:c.shortname},{key:"confirm",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(c){b.confirm(c[0],c[1],c[2],c[3],function(){f.doDelete(a)})}).fail(b.exception)}).fail(b.exception)},i.prototype.registerEvents=function(){var e=this;"course"==e.itemtype&&a('[data-region="coursecompetenciespage"]').on("change",'select[data-field="ruleoutcome"]',function(f){var g=new h,i=[],j="tool_lp/course_competencies_page",k="coursecompetenciespage",l=a(f.target).data("id"),m=a(f.target).val();i=c.call([{methodname:"core_competency_set_course_competency_ruleoutcome",args:{coursecompetencyid:l,ruleoutcome:m}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:e.itemid,moduleid:0}}]),i[1].then(function(a){return d.render(j,a)}).then(function(b,c){return d.replaceNode(a('[data-region="'+k+'"]'),b,c)}).then(g.resolve)["catch"](b.exception)}),a('[data-region="actions"] button').click(function(a){var b=new h;a.preventDefault(),e.pickCompetency().then(b.resolve)["catch"]()}),a('[data-action="delete-competency-link"]').click(function(b){b.preventDefault();var c=a(b.target).closest("[data-id]").data("id");e.deleteHandler(c)})},i});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/competencyactions.min.js b/admin/tool/lp/amd/build/competencyactions.min.js
index 993a3ef943bf6..ebca76e08e770 100644
--- a/admin/tool/lp/amd/build/competencyactions.min.js
+++ b/admin/tool/lp/amd/build/competencyactions.min.js
@@ -1 +1 @@
-define(["jquery","core/url","core/templates","core/notification","core/str","core/ajax","tool_lp/dragdrop-reorder","tool_lp/tree","tool_lp/dialogue","tool_lp/menubar","tool_lp/competencypicker","tool_lp/competency_outcomes","tool_lp/competencyruleconfig"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n,o,p,q,r,s,t=null,u=null,v=null,w=null,x=function(){var c=a('[data-region="competencyactions"]').data("competency"),f={competencyframeworkid:t.getCompetencyFrameworkId(),pagecontextid:n};null!==c&&(f.parentid=c.id);var g=function(){var c=a.param(f);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+c)};null!==c&&t.hasRule(c.id)?e.get_strings([{key:"confirm",component:"moodle"},{key:"addingcompetencywillresetparentrule",component:"tool_lp",param:c.shortname},{key:"yes",component:"core"},{key:"no",component:"core"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],g)}).fail(d.exception):g()},y=function(){var b=a('[data-region="filtercompetencies"]').data("frameworkid"),c=f.call([{methodname:"core_competency_set_parent_competency",args:{competencyid:u,parentid:v}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(E).fail(d.exception)},z=function(){if(v="undefined"==typeof v?0:v,v!=u){var a=t.getCompetency(v)||{},b=t.getCompetency(u)||{},c="movecompetencywillresetrules",f=!1;b.parentid!=v&&(a.path&&a.path.indexOf("/"+b.id+"/")>=0&&(c="movecompetencytochildofselfwillresetrules",f=f||t.hasRule(b.id)),f=f||t.hasRule(a.id)||t.hasRule(b.parentid),f?e.get_strings([{key:"confirm",component:"moodle"},{key:c,component:"tool_lp"},{key:"yes",component:"moodle"},{key:"no",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],y)}).fail(d.exception):y())}},A=function(b){var c=a(b.getContent()),d=c.find("[data-enhance=movetree]"),e=new h(d,(!1));e.on("selectionchanged",function(b,c){var d=c.selected;v=a(d).data("id")}),d.show(),c.on("click",'[data-action="move"]',function(){b.close(),z()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},B=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],B(b[c],b))},C=function(b){b.preventDefault();var g=a('[data-region="competencyactions"]').data("competency");u=g.id;var h=f.call([{methodname:"core_competency_search_competencies",args:{competencyframeworkid:g.competencyframeworkid,searchtext:""}},{methodname:"core_competency_read_competency_framework",args:{id:g.competencyframeworkid}}]);a.when.apply(null,h).done(function(a,b){var f,h=[];for(f=0;f<a.length;f++){var j=a[f];"0"==j.parentid&&(j.children=[],j.haschildren=0,h[h.length]=j,B(j,a))}e.get_strings([{key:"movecompetency",component:"tool_lp",param:g.shortname},{key:"move",component:"tool_lp"},{key:"cancel",component:"moodle"}]).done(function(a){var e={framework:b,competencies:h};c.render("tool_lp/competencies_move_tree",e).done(function(b){new i(a[0],b,A)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},D=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:t.getCompetencyFrameworkId(),id:c.id,parentid:c.parentid,pagecontextid:n},e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},E=function(b){c.render("tool_lp/manage_competencies_page",b).done(function(b,d){a('[data-region="managecompetencies"]').replaceWith(b),c.runTemplateJS(d)}).fail(d.exception)},F=function(b){b.preventDefault();var c=a('[data-region="filtercompetencies"]').data("frameworkid"),e=f.call([{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:c,search:a('[data-region="filtercompetencies"] input').val()}}]);e[0].done(E).fail(d.exception)},G=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"core_competency_move_up_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(E).fail(d.exception)},H=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"core_competency_move_down_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(E).fail(d.exception)},I=function(){var b=a('[data-region="competencyactions"]').data("competency"),g=f.call([{methodname:"tool_lp_list_courses_using_competency",args:{id:b.id}}]);g[0].done(function(a){var b={courses:a};c.render("tool_lp/linked_courses_summary",b).done(function(a){e.get_string("linkedcourses","tool_lp").done(function(b){new i(b,a,A)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},J=function(){q=a('[data-region="competencyactions"]').data("competency"),o||(o=new k(n,q.competencyframeworkid),o.on("save",function(b,e){var g=e.competencyIds,h=[];a.each(g,function(a,b){h.push({methodname:"core_competency_add_related_competency",args:{competencyid:b,relatedcompetencyid:q.id}})}),h.push({methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:q.id}});var i=f.call(h);i[h.length-1].then(function(a){return c.render("tool_lp/related_competencies",a)}).then(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),U()})["catch"](d.exception)})),o.setDisallowedCompetencyIDs([q.id]),o.display()},K=function(b){b.preventDefault(),q=a('[data-region="competencyactions"]').data("competency"),p.setTargetCompetencyId(q.id),p.display()},L=function(a,b){var c={id:q.id,shortname:q.shortname,idnumber:q.idnumber,description:q.description,descriptionformat:q.descriptionformat,ruletype:b.ruletype,ruleoutcome:b.ruleoutcome,ruleconfig:b.ruleconfig},e=f.call([{methodname:"core_competency_update_competency",args:{competency:c}}]);e[0].then(function(a){a&&(q.ruletype=b.ruletype,q.ruleoutcome=b.ruleoutcome,q.ruleconfig=b.ruleconfig,X(q))})["catch"](d.exception)},M=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"core_competency_delete_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[0].done(function(a){a===!1&&e.get_strings([{key:"competencycannotbedeleted",component:"tool_lp",param:b.shortname},{key:"cancel",component:"moodle"}]).done(function(a){d.alert(null,a[0])}).fail(d.exception)}).fail(d.exception),c[1].done(E).fail(d.exception)},N=function(){var b=a('[data-region="competencyactions"]').data("competency"),c="deletecompetency";t.hasRule(b.parentid)&&(c="deletecompetencyparenthasrule"),e.get_strings([{key:"confirm",component:"moodle"},{key:c,component:"tool_lp",param:b.shortname},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],M)}).fail(d.exception)},O=function(b){b.originalEvent.dataTransfer.setData("text",a(b.target).parent().data("id"))},P=function(a){a.originalEvent.dataTransfer.dropEffect="move",a.preventDefault()},Q=function(b){b.preventDefault(),a(this).addClass("currentdragtarget")},R=function(b){b.preventDefault(),a(this).removeClass("currentdragtarget")},S=function(b){b.preventDefault(),u=b.originalEvent.dataTransfer.getData("text"),v=a(b.target).parent().data("id"),a(this).removeClass("currentdragtarget"),z()},T=function(b){b.preventDefault();var e=this.id.substr(11),g=a('[data-region="competencyactions"]').data("competency"),h=f.call([{methodname:"core_competency_remove_related_competency",args:{relatedcompetencyid:e,competencyid:g.id}},{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:g.id}}]);h[1].done(function(b){c.render("tool_lp/related_competencies",b).done(function(b){a('[data-region="relatedcompetencies"]').replaceWith(b),U()}).fail(d.exception)}).fail(d.exception)},U=function(){a('[data-action="deleterelation"]').on("click",T)},V=function(a){a.id!==w&&(w=a.id,f.call([{methodname:"core_competency_competency_viewed",args:{id:a.id}}]))},W=function(a){var b=r[a];return b||(b="competency"),b},X=function(e){var g=a.Deferred().resolve().promise(),h={};h.competency=e,h.showdeleterelatedaction=!0,h.showrelatedcompetencies=!0,h.showrule=!1,h.pluginbaseurl=b.relativeUrl("/admin/tool/lp"),e.ruleoutcome!=l.NONE&&(g=l.getString(e.ruleoutcome).then(function(b){var c;return a.each(s,function(a,b){b.type==e.ruletype&&(c=b.name)}),[b,c]})),g.then(function(a){return"undefined"!=typeof a&&(h.showrule=!0,h.rule={outcome:a[0],type:a[1]}),h}).then(function(a){return c.render("tool_lp/competency_summary",a)}).then(function(b){return a('[data-region="competencyinfo"]').html(b),a('[data-action="deleterelation"]').on("click",T),c.render("tool_lp/loading",{})}).then(function(a,b){return c.replaceNodeContents('[data-region="relatedcompetencies"]',a,b),f.call([{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:e.id}}])[0]}).then(function(a){return c.render("tool_lp/related_competencies",a)}).then(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),U()})["catch"](d.exception)},Y=function(a){return e.get_string("taxonomy_add_"+W(a),"tool_lp")},Z=function(a){return e.get_string("taxonomy_selected_"+W(a),"tool_lp")},$=function(b,c){var e=c.selected,f=a(e).data("id"),g=a('[data-region="competencyactions"] [data-action="add"]'),h=a('[data-region="competencyactionsmenu"]'),i=a('[data-region="selected-competency"]'),k=0,l=1;if(j.closeAll(),"undefined"==typeof f)a('[data-region="competencyinfo"]').html(e.clone().children().remove().end().text()),a('[data-region="competencyactions"]').data("competency",null),h.hide();else{var m=t.getCompetency(f);k=t.getCompetencyLevel(f),l=k+1,h.show(),a('[data-region="competencyactions"]').data("competency",m),X(m),V(m)}return Z(k).then(function(a){i.text(a)})["catch"](d.exception),Y(l).then(function(a){g.show().find('[data-region="term"]').text(a)})["catch"](d.exception),b.preventDefault(),!1},_=function(a){var b=a.split(",");return b.unshift(""),delete b[0],b};return{init:function(b,c,d,e){t=b,n=c,r=_(d),s=e,a('[data-region="competencyactions"] [data-action="add"]').on("click",x),j.enhance(".competencyactionsmenu",{'[data-action="edit"]':D,'[data-action="delete"]':N,'[data-action="move"]':C,'[data-action="moveup"]':G,'[data-action="movedown"]':H,'[data-action="linkedcourses"]':I,'[data-action="relatedcompetencies"]':J.bind(this),'[data-action="competencyrules"]':K.bind(this)}),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="competencyactions"] [data-action="add"]').hide(),a('[data-region="filtercompetencies"]').on("submit",F);var f=a('[data-region="managecompetencies"] [data-enhance="tree"]');f.on("dragstart","li>span",O).on("dragover","li>span",P).on("dragenter","li>span",Q).on("dragleave","li>span",R).on("drop","li>span",S),b.on("selectionchanged",$),p=new m(t,s),p.on("save",L.bind(this))}}});
\ No newline at end of file
+define(["jquery","core/url","core/templates","core/notification","core/str","core/ajax","tool_lp/dragdrop-reorder","tool_lp/tree","tool_lp/dialogue","tool_lp/menubar","tool_lp/competencypicker","tool_lp/competency_outcomes","tool_lp/competencyruleconfig","core/pending"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n){var o,p,q,r,s,t,u=null,v=null,w=null,x=null,y=function(){var c=a('[data-region="competencyactions"]').data("competency"),f={competencyframeworkid:u.getCompetencyFrameworkId(),pagecontextid:o};null!==c&&(f.parentid=c.id);var g=function(){var c=a.param(f);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+c)};null!==c&&u.hasRule(c.id)?e.get_strings([{key:"confirm",component:"moodle"},{key:"addingcompetencywillresetparentrule",component:"tool_lp",param:c.shortname},{key:"yes",component:"core"},{key:"no",component:"core"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],g)}).fail(d.exception):g()},z=function(){var b=a('[data-region="filtercompetencies"]').data("frameworkid"),c=f.call([{methodname:"core_competency_set_parent_competency",args:{competencyid:v,parentid:w}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(F).fail(d.exception)},A=function(){if(w="undefined"==typeof w?0:w,w!=v){var a=u.getCompetency(w)||{},b=u.getCompetency(v)||{},c="movecompetencywillresetrules",f=!1;b.parentid!=w&&(a.path&&a.path.indexOf("/"+b.id+"/")>=0&&(c="movecompetencytochildofselfwillresetrules",f=f||u.hasRule(b.id)),f=f||u.hasRule(a.id)||u.hasRule(b.parentid),f?e.get_strings([{key:"confirm",component:"moodle"},{key:c,component:"tool_lp"},{key:"yes",component:"moodle"},{key:"no",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],z)}).fail(d.exception):z())}},B=function(b){var c=a(b.getContent()),d=c.find("[data-enhance=movetree]"),e=new h(d,(!1));e.on("selectionchanged",function(b,c){var d=c.selected;w=a(d).data("id")}),d.show(),c.on("click",'[data-action="move"]',function(){b.close(),A()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},C=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],C(b[c],b))},D=function(b){b.preventDefault();var g=a('[data-region="competencyactions"]').data("competency");v=g.id;var h=f.call([{methodname:"core_competency_search_competencies",args:{competencyframeworkid:g.competencyframeworkid,searchtext:""}},{methodname:"core_competency_read_competency_framework",args:{id:g.competencyframeworkid}}]);a.when.apply(null,h).done(function(a,b){var f,h=[];for(f=0;f<a.length;f++){var j=a[f];"0"==j.parentid&&(j.children=[],j.haschildren=0,h[h.length]=j,C(j,a))}e.get_strings([{key:"movecompetency",component:"tool_lp",param:g.shortname},{key:"move",component:"tool_lp"},{key:"cancel",component:"moodle"}]).done(function(a){var e={framework:b,competencies:h};c.render("tool_lp/competencies_move_tree",e).done(function(b){new i(a[0],b,B)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},E=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:u.getCompetencyFrameworkId(),id:c.id,parentid:c.parentid,pagecontextid:o},e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},F=function(b){c.render("tool_lp/manage_competencies_page",b).done(function(b,d){a('[data-region="managecompetencies"]').replaceWith(b),c.runTemplateJS(d)}).fail(d.exception)},G=function(b){b.preventDefault();var c=a('[data-region="filtercompetencies"]').data("frameworkid"),e=f.call([{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:c,search:a('[data-region="filtercompetencies"] input').val()}}]);e[0].done(F).fail(d.exception)},H=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"core_competency_move_up_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(F).fail(d.exception)},I=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"core_competency_move_down_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(F).fail(d.exception)},J=function(){var b=a('[data-region="competencyactions"]').data("competency"),g=f.call([{methodname:"tool_lp_list_courses_using_competency",args:{id:b.id}}]);g[0].done(function(a){var b={courses:a};c.render("tool_lp/linked_courses_summary",b).done(function(a){e.get_string("linkedcourses","tool_lp").done(function(b){new i(b,a,B)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},K=function(){r=a('[data-region="competencyactions"]').data("competency"),p||(p=new k(o,r.competencyframeworkid),p.on("save",function(b,e){var g=new n,h=e.competencyIds,i=[];a.each(h,function(a,b){i.push({methodname:"core_competency_add_related_competency",args:{competencyid:b,relatedcompetencyid:r.id}})}),i.push({methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:r.id}});var j=f.call(i);j[i.length-1].then(function(a){return c.render("tool_lp/related_competencies",a)}).then(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),V()}).then(g.resolve)["catch"](d.exception)})),p.setDisallowedCompetencyIDs([r.id]),p.display()},L=function(b){b.preventDefault(),r=a('[data-region="competencyactions"]').data("competency"),q.setTargetCompetencyId(r.id),q.display()},M=function(a,b){var c={id:r.id,shortname:r.shortname,idnumber:r.idnumber,description:r.description,descriptionformat:r.descriptionformat,ruletype:b.ruletype,ruleoutcome:b.ruleoutcome,ruleconfig:b.ruleconfig},e=f.call([{methodname:"core_competency_update_competency",args:{competency:c}}]);e[0].then(function(a){a&&(r.ruletype=b.ruletype,r.ruleoutcome=b.ruleoutcome,r.ruleconfig=b.ruleconfig,Y(r))})["catch"](d.exception)},N=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"core_competency_delete_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[0].done(function(a){a===!1&&e.get_strings([{key:"competencycannotbedeleted",component:"tool_lp",param:b.shortname},{key:"cancel",component:"moodle"}]).done(function(a){d.alert(null,a[0])}).fail(d.exception)}).fail(d.exception),c[1].done(F).fail(d.exception)},O=function(){var b=a('[data-region="competencyactions"]').data("competency"),c="deletecompetency";u.hasRule(b.parentid)&&(c="deletecompetencyparenthasrule"),e.get_strings([{key:"confirm",component:"moodle"},{key:c,component:"tool_lp",param:b.shortname},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],N)}).fail(d.exception)},P=function(b){b.originalEvent.dataTransfer.setData("text",a(b.target).parent().data("id"))},Q=function(a){a.originalEvent.dataTransfer.dropEffect="move",a.preventDefault()},R=function(b){b.preventDefault(),a(this).addClass("currentdragtarget")},S=function(b){b.preventDefault(),a(this).removeClass("currentdragtarget")},T=function(b){b.preventDefault(),v=b.originalEvent.dataTransfer.getData("text"),w=a(b.target).parent().data("id"),a(this).removeClass("currentdragtarget"),A()},U=function(b){b.preventDefault();var e=this.id.substr(11),g=a('[data-region="competencyactions"]').data("competency"),h=f.call([{methodname:"core_competency_remove_related_competency",args:{relatedcompetencyid:e,competencyid:g.id}},{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:g.id}}]);h[1].done(function(b){c.render("tool_lp/related_competencies",b).done(function(b){a('[data-region="relatedcompetencies"]').replaceWith(b),V()}).fail(d.exception)}).fail(d.exception)},V=function(){a('[data-action="deleterelation"]').on("click",U)},W=function(a){a.id!==x&&(x=a.id,f.call([{methodname:"core_competency_competency_viewed",args:{id:a.id}}]))},X=function(a){var b=s[a];return b||(b="competency"),b},Y=function(e){var g=a.Deferred().resolve().promise(),h={};h.competency=e,h.showdeleterelatedaction=!0,h.showrelatedcompetencies=!0,h.showrule=!1,h.pluginbaseurl=b.relativeUrl("/admin/tool/lp"),e.ruleoutcome!=l.NONE&&(g=l.getString(e.ruleoutcome).then(function(b){var c;return a.each(t,function(a,b){b.type==e.ruletype&&(c=b.name)}),[b,c]})),g.then(function(a){return"undefined"!=typeof a&&(h.showrule=!0,h.rule={outcome:a[0],type:a[1]}),h}).then(function(a){return c.render("tool_lp/competency_summary",a)}).then(function(b){return a('[data-region="competencyinfo"]').html(b),a('[data-action="deleterelation"]').on("click",U),c.render("tool_lp/loading",{})}).then(function(a,b){return c.replaceNodeContents('[data-region="relatedcompetencies"]',a,b),f.call([{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:e.id}}])[0]}).then(function(a){return c.render("tool_lp/related_competencies",a)}).then(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),V()})["catch"](d.exception)},Z=function(a){return e.get_string("taxonomy_add_"+X(a),"tool_lp")},$=function(a){return e.get_string("taxonomy_selected_"+X(a),"tool_lp")},_=function(b,c){var e=c.selected,f=a(e).data("id"),g=a('[data-region="competencyactions"] [data-action="add"]'),h=a('[data-region="competencyactionsmenu"]'),i=a('[data-region="selected-competency"]'),k=0,l=1;if(j.closeAll(),"undefined"==typeof f)a('[data-region="competencyinfo"]').html(e.clone().children().remove().end().text()),a('[data-region="competencyactions"]').data("competency",null),h.hide();else{var m=u.getCompetency(f);k=u.getCompetencyLevel(f),l=k+1,h.show(),a('[data-region="competencyactions"]').data("competency",m),Y(m),W(m)}return $(k).then(function(a){i.text(a)})["catch"](d.exception),Z(l).then(function(a){g.show().find('[data-region="term"]').text(a)})["catch"](d.exception),b.preventDefault(),!1},aa=function(a){var b=a.split(",");return b.unshift(""),delete b[0],b};return{init:function(b,c,d,e){u=b,o=c,s=aa(d),t=e,a('[data-region="competencyactions"] [data-action="add"]').on("click",y),j.enhance(".competencyactionsmenu",{'[data-action="edit"]':E,'[data-action="delete"]':O,'[data-action="move"]':D,'[data-action="moveup"]':H,'[data-action="movedown"]':I,'[data-action="linkedcourses"]':J,'[data-action="relatedcompetencies"]':K.bind(this),'[data-action="competencyrules"]':L.bind(this)}),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="competencyactions"] [data-action="add"]').hide(),a('[data-region="filtercompetencies"]').on("submit",G);var f=a('[data-region="managecompetencies"] [data-enhance="tree"]');f.on("dragstart","li>span",P).on("dragover","li>span",Q).on("dragenter","li>span",R).on("dragleave","li>span",S).on("drop","li>span",T),b.on("selectionchanged",_),q=new m(u,t),q.on("save",M.bind(this))}}});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/competencypicker.min.js b/admin/tool/lp/amd/build/competencypicker.min.js
index e32b0808ae228..d9e8f4099f178 100644
--- a/admin/tool/lp/amd/build/competencypicker.min.js
+++ b/admin/tool/lp/amd/build/competencypicker.min.js
@@ -1 +1 @@
-define(["jquery","core/notification","core/ajax","core/templates","tool_lp/dialogue","core/str","tool_lp/tree"],function(a,b,c,d,e,f,g){var h=function(b,c,d,e){var f=this;f._eventNode=a("<div></div>"),f._frameworks=[],f._reset(),f._pageContextId=b,f._pageContextIncludes=d||"children",f._multiSelect="undefined"==typeof e||e===!0,c&&(f._frameworkId=c,f._singleFramework=!0)};return h.prototype._competencies=null,h.prototype._disallowedCompetencyIDs=null,h.prototype._eventNode=null,h.prototype._frameworks=null,h.prototype._frameworkId=null,h.prototype._pageContextId=null,h.prototype._pageContextIncludes=null,h.prototype._popup=null,h.prototype._searchText="",h.prototype._selectedCompetencies=null,h.prototype._singleFramework=!1,h.prototype._multiSelect=!0,h.prototype._onlyVisible=!0,h.prototype._afterRender=function(){var c=this,d=new g(c._find("[data-enhance=linktree]"),c._multiSelect);c._find("[data-enhance=linktree]").show(),d.on("selectionchanged",function(b,d){var e=d.selected;b.preventDefault();var f=[];a.each(e,function(b,d){var e=a(d).data("id"),g=!0;"undefined"==typeof e?g=!1:a.each(c._disallowedCompetencyIDs,function(a,b){b==e&&(g=!1)}),g&&f.push(e)}),c._selectedCompetencies=f,c._selectedCompetencies.length?c._find('[data-region="competencylinktree"] [data-action="add"]').removeAttr("disabled"):c._find('[data-region="competencylinktree"] [data-action="add"]').attr("disabled","disabled")}),c._singleFramework||c._find('[data-action="chooseframework"]').change(function(d){c._frameworkId=a(d.target).val(),c._loadCompetencies().then(c._refresh.bind(c))["catch"](b.exception)}),c._find('[data-region="filtercompetencies"] button').click(function(b){return b.preventDefault(),a(b.target).attr("disabled","disabled"),c._searchText=c._find('[data-region="filtercompetencies"] input').val()||"",c._refresh().always(function(){a(b.target).removeAttr("disabled")})}),c._find('[data-region="competencylinktree"] [data-action="cancel"]').click(function(a){a.preventDefault(),c.close()}),c._find('[data-region="competencylinktree"] [data-action="add"]').click(function(a){a.preventDefault(),c._selectedCompetencies.length&&(c._multiSelect?c._trigger("save",{competencyIds:c._selectedCompetencies}):c._trigger("save",{competencyId:c._selectedCompetencies[0]}),c.close())});var e=c._selectedCompetencies.slice(0);a.each(e,function(a,b){var e=c._find("[data-id="+b+"]");e.length&&(d.toggleItem(e),d.updateFocus(e))})},h.prototype.close=function(){var a=this;a._popup.close(),a._reset()},h.prototype.display=function(){var c=this;return a.when(f.get_string("competencypicker","tool_lp"),c._render()).then(function(a,b){c._popup=new e(a,b[0],c._afterRender.bind(c))})["catch"](b.exception)},h.prototype._fetchCompetencies=function(a,d){var e=this;return c.call([{methodname:"core_competency_search_competencies",args:{searchtext:d,competencyframeworkid:a}}])[0].done(function(a){function b(a,c){for(var d=0;d<c.length;d++)c[d].parentid==a.id&&(a.haschildren=!0,c[d].children=[],c[d].haschildren=!1,a.children[a.children.length]=c[d],b(c[d],c))}var c,d,f=[];for(c=0;c<a.length;c++)d=a[c],"0"==d.parentid&&(d.children=[],d.haschildren=0,f[f.length]=d,b(d,a));e._competencies=f}).fail(b.exception)},h.prototype._find=function(b){return a(this._popup.getContent()).find(b)},h.prototype._getFramework=function(b){var c;return a.each(this._frameworks,function(a,d){if(d.id==b)return void(c=d)}),c},h.prototype._loadCompetencies=function(){return this._fetchCompetencies(this._frameworkId,this._searchText)},h.prototype._loadFrameworks=function(){var d,e=this;return e._frameworks.length>0?a.when():(d=e._singleFramework?c.call([{methodname:"core_competency_read_competency_framework",args:{id:this._frameworkId}}])[0].then(function(a){return[a]}):c.call([{methodname:"core_competency_list_competency_frameworks",args:{sort:"shortname",context:{contextid:e._pageContextId},includes:e._pageContextIncludes,onlyvisible:e._onlyVisible}}])[0],d.done(function(a){e._frameworks=a}).fail(b.exception))},h.prototype.on=function(a,b){this._eventNode.on(a,b)},h.prototype._preRender=function(){var b=this;return b._loadFrameworks().then(function(){return!b._frameworkId&&b._frameworks.length>0&&(b._frameworkId=b._frameworks[0].id),b._frameworkId?b._loadCompetencies():(b._frameworks=[],a.when())})},h.prototype._refresh=function(){var a=this;return a._render().then(function(b){a._find('[data-region="competencylinktree"]').replaceWith(b),a._afterRender()})},h.prototype._render=function(){var b=this;return b._preRender().then(function(){b._singleFramework||a.each(b._frameworks,function(a,c){c.id==b._frameworkId?c.selected=!0:c.selected=!1});var c={competencies:b._competencies,framework:b._getFramework(b._frameworkId),frameworks:b._frameworks,search:b._searchText,singleFramework:b._singleFramework};return d.render("tool_lp/competency_picker",c)})},h.prototype._reset=function(){this._competencies=[],this._disallowedCompetencyIDs=[],this._popup=null,this._searchText="",this._selectedCompetencies=[]},h.prototype.setDisallowedCompetencyIDs=function(a){this._disallowedCompetencyIDs=a},h.prototype._trigger=function(a,b){this._eventNode.trigger(a,[b])},h});
\ No newline at end of file
+define(["jquery","core/notification","core/ajax","core/templates","tool_lp/dialogue","core/str","tool_lp/tree","core/pending"],function(a,b,c,d,e,f,g,h){var i=function(b,c,d,e){var f=this;f._eventNode=a("<div></div>"),f._frameworks=[],f._reset(),f._pageContextId=b,f._pageContextIncludes=d||"children",f._multiSelect="undefined"==typeof e||e===!0,c&&(f._frameworkId=c,f._singleFramework=!0)};return i.prototype._competencies=null,i.prototype._disallowedCompetencyIDs=null,i.prototype._eventNode=null,i.prototype._frameworks=null,i.prototype._frameworkId=null,i.prototype._pageContextId=null,i.prototype._pageContextIncludes=null,i.prototype._popup=null,i.prototype._searchText="",i.prototype._selectedCompetencies=null,i.prototype._singleFramework=!1,i.prototype._multiSelect=!0,i.prototype._onlyVisible=!0,i.prototype._afterRender=function(){var c=this,d=new g(c._find("[data-enhance=linktree]"),c._multiSelect);c._find("[data-enhance=linktree]").show(),d.on("selectionchanged",function(b,d){var e=d.selected;b.preventDefault();var f=[];a.each(e,function(b,d){var e=a(d).data("id"),g=!0;"undefined"==typeof e?g=!1:a.each(c._disallowedCompetencyIDs,function(a,b){b==e&&(g=!1)}),g&&f.push(e)}),c._selectedCompetencies=f,c._selectedCompetencies.length?c._find('[data-region="competencylinktree"] [data-action="add"]').removeAttr("disabled"):c._find('[data-region="competencylinktree"] [data-action="add"]').attr("disabled","disabled")}),c._singleFramework||c._find('[data-action="chooseframework"]').change(function(d){c._frameworkId=a(d.target).val(),c._loadCompetencies().then(c._refresh.bind(c))["catch"](b.exception)}),c._find('[data-region="filtercompetencies"] button').click(function(b){return b.preventDefault(),a(b.target).attr("disabled","disabled"),c._searchText=c._find('[data-region="filtercompetencies"] input').val()||"",c._refresh().always(function(){a(b.target).removeAttr("disabled")})}),c._find('[data-region="competencylinktree"] [data-action="cancel"]').click(function(a){a.preventDefault(),c.close()}),c._find('[data-region="competencylinktree"] [data-action="add"]').click(function(a){a.preventDefault();var b=new h;c._selectedCompetencies.length&&(c._multiSelect?c._trigger("save",{competencyIds:c._selectedCompetencies}):c._trigger("save",{competencyId:c._selectedCompetencies[0]}),c.close(),b.resolve())});var e=c._selectedCompetencies.slice(0);a.each(e,function(a,b){var e=c._find("[data-id="+b+"]");e.length&&(d.toggleItem(e),d.updateFocus(e))})},i.prototype.close=function(){var a=this;a._popup.close(),a._reset()},i.prototype.display=function(){var c=this;return a.when(f.get_string("competencypicker","tool_lp"),c._render()).then(function(a,b){c._popup=new e(a,b[0],c._afterRender.bind(c))})["catch"](b.exception)},i.prototype._fetchCompetencies=function(a,d){var e=this;return c.call([{methodname:"core_competency_search_competencies",args:{searchtext:d,competencyframeworkid:a}}])[0].done(function(a){function b(a,c){for(var d=0;d<c.length;d++)c[d].parentid==a.id&&(a.haschildren=!0,c[d].children=[],c[d].haschildren=!1,a.children[a.children.length]=c[d],b(c[d],c))}var c,d,f=[];for(c=0;c<a.length;c++)d=a[c],"0"==d.parentid&&(d.children=[],d.haschildren=0,f[f.length]=d,b(d,a));e._competencies=f}).fail(b.exception)},i.prototype._find=function(b){return a(this._popup.getContent()).find(b)},i.prototype._getFramework=function(b){var c;return a.each(this._frameworks,function(a,d){if(d.id==b)return void(c=d)}),c},i.prototype._loadCompetencies=function(){return this._fetchCompetencies(this._frameworkId,this._searchText)},i.prototype._loadFrameworks=function(){var d,e=this;return e._frameworks.length>0?a.when():(d=e._singleFramework?c.call([{methodname:"core_competency_read_competency_framework",args:{id:this._frameworkId}}])[0].then(function(a){return[a]}):c.call([{methodname:"core_competency_list_competency_frameworks",args:{sort:"shortname",context:{contextid:e._pageContextId},includes:e._pageContextIncludes,onlyvisible:e._onlyVisible}}])[0],d.done(function(a){e._frameworks=a}).fail(b.exception))},i.prototype.on=function(a,b){this._eventNode.on(a,b)},i.prototype._preRender=function(){var b=this;return b._loadFrameworks().then(function(){return!b._frameworkId&&b._frameworks.length>0&&(b._frameworkId=b._frameworks[0].id),b._frameworkId?b._loadCompetencies():(b._frameworks=[],a.when())})},i.prototype._refresh=function(){var a=this;return a._render().then(function(b){a._find('[data-region="competencylinktree"]').replaceWith(b),a._afterRender()})},i.prototype._render=function(){var b=this;return b._preRender().then(function(){b._singleFramework||a.each(b._frameworks,function(a,c){c.id==b._frameworkId?c.selected=!0:c.selected=!1});var c={competencies:b._competencies,framework:b._getFramework(b._frameworkId),frameworks:b._frameworks,search:b._searchText,singleFramework:b._singleFramework};return d.render("tool_lp/competency_picker",c)})},i.prototype._reset=function(){this._competencies=[],this._disallowedCompetencyIDs=[],this._popup=null,this._searchText="",this._selectedCompetencies=[]},i.prototype.setDisallowedCompetencyIDs=function(a){this._disallowedCompetencyIDs=a},i.prototype._trigger=function(a,b){this._eventNode.trigger(a,[b])},i});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/course_competency_settings.min.js b/admin/tool/lp/amd/build/course_competency_settings.min.js
index fe53dc6c88156..7a68944f40e6b 100644
--- a/admin/tool/lp/amd/build/course_competency_settings.min.js
+++ b/admin/tool/lp/amd/build/course_competency_settings.min.js
@@ -1 +1 @@
-define(["jquery","core/notification","tool_lp/dialogue","core/str","core/ajax","core/templates"],function(a,b,c,d,e,f){var g=function(b){a(b).on("click",this.configureSettings.bind(this))};return g.prototype._dialogue=null,g.prototype.configureSettings=function(e){var g=a(e.target).closest("a").data("courseid"),h=a(e.target).closest("a").data("pushratingstouserplans"),i={courseid:g,settings:{pushratingstouserplans:h}};e.preventDefault(),f.render("tool_lp/course_competency_settings",i).done(function(a){d.get_string("configurecoursecompetencysettings","tool_lp").done(function(b){this._dialogue=new c(b,a,this.addListeners.bind(this))}.bind(this)).fail(b.exception)}.bind(this)).fail(b.exception)},g.prototype.addListeners=function(){var a=this._find('[data-action="save"]');a.on("click",this.saveSettings.bind(this));var b=this._find('[data-action="cancel"]');b.on("click",this.cancelChanges.bind(this))},g.prototype.cancelChanges=function(a){a.preventDefault(),this._dialogue.close()},g.prototype._find=function(b){return a('[data-region="coursecompetencysettings"]').find(b)},g.prototype.saveSettings=function(a){a.preventDefault();var c=this._find('input[name="pushratingstouserplans"]:checked').val(),d=this._find('input[name="courseid"]').val(),f={pushratingstouserplans:c};e.call([{methodname:"core_competency_update_course_competency_settings",args:{courseid:d,settings:f}}])[0].done(function(){this.refreshCourseCompetenciesPage()}.bind(this)).fail(b.exception)},g.prototype.refreshCourseCompetenciesPage=function(){var c=this._find('input[name="courseid"]').val();e.call([{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:c,moduleid:0}}])[0].done(function(c){f.render("tool_lp/course_competencies_page",c).done(function(b,c){a('[data-region="coursecompetenciespage"]').replaceWith(b),f.runTemplateJS(c),this._dialogue.close()}.bind(this)).fail(b.exception)}.bind(this)).fail(b.exception)},g});
\ No newline at end of file
+define(["jquery","core/notification","tool_lp/dialogue","core/str","core/ajax","core/templates","core/pending"],function(a,b,c,d,e,f,g){var h=function(b){a(b).on("click",this.configureSettings.bind(this))};return h.prototype._dialogue=null,h.prototype.configureSettings=function(e){var h=new g,i=a(e.target).closest("a").data("courseid"),j=a(e.target).closest("a").data("pushratingstouserplans"),k={courseid:i,settings:{pushratingstouserplans:j}};e.preventDefault(),a.when(d.get_string("configurecoursecompetencysettings","tool_lp"),f.render("tool_lp/course_competency_settings",k)).then(function(a,b){return this._dialogue=new c(a,b[0],this.addListeners.bind(this)),this._dialogue}.bind(this)).then(h.resolve)["catch"](b.exception)},h.prototype.addListeners=function(){var a=this._find('[data-action="save"]');a.on("click",this.saveSettings.bind(this));var b=this._find('[data-action="cancel"]');b.on("click",this.cancelChanges.bind(this))},h.prototype.cancelChanges=function(a){a.preventDefault(),this._dialogue.close()},h.prototype._find=function(b){return a('[data-region="coursecompetencysettings"]').find(b)},h.prototype.saveSettings=function(a){var c=new g;a.preventDefault();var d=this._find('input[name="pushratingstouserplans"]:checked').val(),f=this._find('input[name="courseid"]').val(),h={pushratingstouserplans:d};e.call([{methodname:"core_competency_update_course_competency_settings",args:{courseid:f,settings:h}}])[0].then(function(){return this.refreshCourseCompetenciesPage()}.bind(this)).then(c.resolve)["catch"](b.exception)},h.prototype.refreshCourseCompetenciesPage=function(){var c=this._find('input[name="courseid"]').val(),d=new g;e.call([{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:c,moduleid:0}}])[0].then(function(a){return f.render("tool_lp/course_competencies_page",a)}).then(function(b,c){f.replaceNode(a('[data-region="coursecompetenciespage"]'),b,c),this._dialogue.close()}.bind(this)).then(d.resolve)["catch"](b.exception)},h});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/grade_dialogue.min.js b/admin/tool/lp/amd/build/grade_dialogue.min.js
index 6bfa3dfeec81d..06d1725d32ded 100644
--- a/admin/tool/lp/amd/build/grade_dialogue.min.js
+++ b/admin/tool/lp/amd/build/grade_dialogue.min.js
@@ -1 +1 @@
-define(["jquery","core/notification","core/templates","tool_lp/dialogue","tool_lp/event_base","core/str"],function(a,b,c,d,e,f){var g=function(a){e.prototype.constructor.apply(this,[]),this._ratingOptions=a};return g.prototype=Object.create(e.prototype),g.prototype._popup=null,g.prototype._ratingOptions=null,g.prototype._afterRender=function(){var b=this._find('[data-action="rate"]'),c=this._find('[name="rating"]'),d=this._find('[name="comment"]');this._find('[data-action="cancel"]').click(function(a){a.preventDefault(),this._trigger("cancelled"),this.close()}.bind(this)),c.change(function(){var c=a(this);c.val()?b.prop("disabled",!1):b.prop("disabled",!0)}).change(),b.click(function(a){a.preventDefault();var b=c.val();b&&(this._trigger("rated",{rating:b,note:d.val()}),this.close())}.bind(this))},g.prototype.close=function(){this._popup.close(),this._popup=null},g.prototype.display=function(){return this._render().then(function(a){return f.get_string("rate","tool_lp").then(function(b){this._popup=new d(b,a,this._afterRender.bind(this))}.bind(this))}.bind(this)).fail(b.exception)},g.prototype._find=function(b){return a(this._popup.getContent()).find(b)},g.prototype._render=function(){var a={cangrade:this._canGrade,ratings:this._ratingOptions};return c.render("tool_lp/competency_grader",a)},g});
\ No newline at end of file
+define(["jquery","core/notification","core/templates","tool_lp/dialogue","tool_lp/event_base","core/str"],function(a,b,c,d,e,f){var g=function(a){e.prototype.constructor.apply(this,[]),this._ratingOptions=a};return g.prototype=Object.create(e.prototype),g.prototype._popup=null,g.prototype._ratingOptions=null,g.prototype._afterRender=function(){var b=this._find('[data-action="rate"]'),c=this._find('[name="rating"]'),d=this._find('[name="comment"]');this._find('[data-action="cancel"]').click(function(a){a.preventDefault(),this._trigger("cancelled"),this.close()}.bind(this)),c.change(function(){var c=a(this);c.val()?b.prop("disabled",!1):b.prop("disabled",!0)}).change(),b.click(function(a){a.preventDefault();var b=c.val();b&&(this._trigger("rated",{rating:b,note:d.val()}),this.close())}.bind(this))},g.prototype.close=function(){this._popup.close(),this._popup=null},g.prototype.display=function(){return a.when(f.get_string("rate","tool_lp"),this._render()).then(function(a,b){return this._popup=new d(a,b[0],this._afterRender.bind(this)),this._popup}.bind(this))["catch"](b.exception)},g.prototype._find=function(b){return a(this._popup.getContent()).find(b)},g.prototype._render=function(){var a={cangrade:this._canGrade,ratings:this._ratingOptions};return c.render("tool_lp/competency_grader",a)},g});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/grade_user_competency_inline.min.js b/admin/tool/lp/amd/build/grade_user_competency_inline.min.js
index 6ea96241ba16c..80725888f2253 100644
--- a/admin/tool/lp/amd/build/grade_user_competency_inline.min.js
+++ b/admin/tool/lp/amd/build/grade_user_competency_inline.min.js
@@ -1 +1 @@
-define(["jquery","core/notification","core/ajax","core/log","tool_lp/grade_dialogue","tool_lp/event_base","tool_lp/scalevalues"],function(a,b,c,d,e,f,g){var h=function(b,c,d,e,g,h,i){f.prototype.constructor.apply(this,[]);var j=a(b);if(!j.length)throw new Error("Could not find the trigger");this._scaleId=c,this._competencyId=d,this._userId=e,this._planId=g,this._courseId=h,this._chooseStr=i,this._setUp(),j.click(function(a){a.preventDefault(),this._dialogue.display()}.bind(this)),this._planId?(this._methodName="core_competency_grade_competency_in_plan",this._args={competencyid:this._competencyId,planid:this._planId}):this._courseId?(this._methodName="core_competency_grade_competency_in_course",this._args={competencyid:this._competencyId,courseid:this._courseId,userid:this._userId}):(this._methodName="core_competency_grade_competency",this._args={userid:this._userId,competencyid:this._competencyId})};return h.prototype=Object.create(f.prototype),h.prototype._setUp=function(){var a=[],d=this,f=g.get_values(d._scaleId);f.done(function(f){a.push({value:"",name:d._chooseStr});for(var g=0;g<f.length;g++){var h=f[g];a.push({value:h.id,name:h.name})}d._dialogue=new e(a),d._dialogue.on("rated",function(a,e){var f=d._args;f.grade=e.rating,f.note=e.note,c.call([{methodname:d._methodName,args:f,done:function(a){d._trigger("competencyupdated",{args:f,evidence:a})},fail:b.exception}])})}).fail(b.exception)},h.prototype._scaleId=null,h.prototype._competencyId=null,h.prototype._userId=null,h.prototype._planId=null,h.prototype._courseId=null,h.prototype._chooseStr=null,h.prototype._dialogue=null,h});
\ No newline at end of file
+define(["jquery","core/notification","core/ajax","core/log","tool_lp/grade_dialogue","tool_lp/event_base","tool_lp/scalevalues"],function(a,b,c,d,e,f,g){var h=function(b,c,d,e,g,h,i){f.prototype.constructor.apply(this,[]);var j=a(b);if(!j.length)throw new Error("Could not find the trigger");this._scaleId=c,this._competencyId=d,this._userId=e,this._planId=g,this._courseId=h,this._chooseStr=i,this._setUp(),j.click(function(a){a.preventDefault(),this._dialogue.display()}.bind(this)),this._planId?(this._methodName="core_competency_grade_competency_in_plan",this._args={competencyid:this._competencyId,planid:this._planId}):this._courseId?(this._methodName="core_competency_grade_competency_in_course",this._args={competencyid:this._competencyId,courseid:this._courseId,userid:this._userId}):(this._methodName="core_competency_grade_competency",this._args={userid:this._userId,competencyid:this._competencyId})};return h.prototype=Object.create(f.prototype),h.prototype._setUp=function(){var a=[],d=this,f=g.get_values(d._scaleId);f.then(function(b){a.push({value:"",name:d._chooseStr});for(var c=0;c<b.length;c++){var e=b[c];a.push({value:e.id,name:e.name})}return a}).then(function(a){return new e(a)}).then(function(a){return a.on("rated",function(a,e){var f=d._args;f.grade=e.rating,f.note=e.note,c.call([{methodname:d._methodName,args:f,done:function(a){d._trigger("competencyupdated",{args:f,evidence:a})},fail:b.exception}])}),a}).then(function(a){d._dialogue=a}).fail(b.exception)},h.prototype._scaleId=null,h.prototype._competencyId=null,h.prototype._userId=null,h.prototype._planId=null,h.prototype._courseId=null,h.prototype._chooseStr=null,h.prototype._dialogue=null,h});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/src/competencies.js b/admin/tool/lp/amd/src/competencies.js
index e3a517677ab10..82052a4b40636 100644
--- a/admin/tool/lp/amd/src/competencies.js
+++ b/admin/tool/lp/amd/src/competencies.js
@@ -27,8 +27,9 @@ define(['jquery',
         'core/templates',
         'core/str',
         'tool_lp/competencypicker',
-        'tool_lp/dragdrop-reorder'],
-       function($, notification, ajax, templates, str, Picker, dragdrop) {
+        'tool_lp/dragdrop-reorder',
+        'core/pending'],
+       function($, notification, ajax, templates, str, Picker, dragdrop, Pending) {
 
     /**
      * Constructor
@@ -117,6 +118,7 @@ define(['jquery',
      * Pick a competency
      *
      * @method pickCompetency
+     * @return {Promise}
      */
     competencies.prototype.pickCompetency = function() {
         var self = this;
@@ -132,6 +134,7 @@ define(['jquery',
             self.pickerInstance = new Picker(self.pageContextId, false, pageContextIncludes);
             self.pickerInstance.on('save', function(e, data) {
                 var compIds = data.competencyIds;
+                var pendingPromise = new Pending();
 
                 if (self.itemtype === "course") {
                     requests = [];
@@ -181,17 +184,20 @@ define(['jquery',
                     pagerender = 'tool_lp/plan_page';
                     pageregion = 'plan-page';
                 }
-                ajax.call(requests)[requests.length - 1].then(function(context) {
+                ajax.call(requests)[requests.length - 1]
+                .then(function(context) {
                     return templates.render(pagerender, context);
-                }).then(function(html, js) {
-                    $('[data-region="' + pageregion + '"]').replaceWith(html);
-                    templates.runTemplateJS(js);
+                })
+                .then(function(html, js) {
+                    templates.replaceNode($('[data-region="' + pageregion + '"]'), html, js);
                     return;
-                }).catch(notification.exception);
+                })
+                .then(pendingPromise.resolve)
+                .catch(notification.exception);
             });
         }
 
-        self.pickerInstance.display();
+        return self.pickerInstance.display();
     };
 
     /**
@@ -302,6 +308,7 @@ define(['jquery',
         if (localthis.itemtype == 'course') {
             // Course completion rule handling.
             $('[data-region="coursecompetenciespage"]').on('change', 'select[data-field="ruleoutcome"]', function(e) {
+                var pendingPromise = new Pending();
                 var requests = [];
                 var pagerender = 'tool_lp/course_competencies_page';
                 var pageregion = 'coursecompetenciespage';
@@ -314,18 +321,24 @@ define(['jquery',
                       args: {courseid: localthis.itemid, moduleid: 0}}
                 ]);
 
-                requests[1].done(function(context) {
-                    templates.render(pagerender, context).done(function(html, js) {
-                        $('[data-region="' + pageregion + '"]').replaceWith(html);
-                        templates.runTemplateJS(js);
-                    }).fail(notification.exception);
-                }).fail(notification.exception);
+                requests[1].then(function(context) {
+                    return templates.render(pagerender, context);
+                })
+                .then(function(html, js) {
+                    return templates.replaceNode($('[data-region="' + pageregion + '"]'), html, js);
+                })
+                .then(pendingPromise.resolve)
+                .catch(notification.exception);
             });
         }
 
         $('[data-region="actions"] button').click(function(e) {
+            var pendingPromise = new Pending();
             e.preventDefault();
-            localthis.pickCompetency();
+
+            localthis.pickCompetency()
+                .then(pendingPromise.resolve)
+                .catch();
         });
         $('[data-action="delete-competency-link"]').click(function(e) {
             e.preventDefault();
diff --git a/admin/tool/lp/amd/src/competencyactions.js b/admin/tool/lp/amd/src/competencyactions.js
index 60c04daa6d5d7..78a7cd3811403 100644
--- a/admin/tool/lp/amd/src/competencyactions.js
+++ b/admin/tool/lp/amd/src/competencyactions.js
@@ -33,8 +33,12 @@ define(['jquery',
         'tool_lp/menubar',
         'tool_lp/competencypicker',
         'tool_lp/competency_outcomes',
-        'tool_lp/competencyruleconfig'],
-       function($, url, templates, notification, str, ajax, dragdrop, Ariatree, Dialogue, menubar, Picker, Outcomes, RuleConfig) {
+        'tool_lp/competencyruleconfig',
+        'core/pending',
+        ],
+       function(
+            $, url, templates, notification, str, ajax, dragdrop, Ariatree, Dialogue, menubar, Picker, Outcomes, RuleConfig, Pending
+        ) {
 
     // Private variables and functions.
     /** @var {Object} treeModel - This is an object representing the nodes in the tree. */
@@ -412,6 +416,7 @@ define(['jquery',
         if (!pickerInstance) {
             pickerInstance = new Picker(pageContextId, relatedTarget.competencyframeworkid);
             pickerInstance.on('save', function(e, data) {
+                var pendingPromise = new Pending();
                 var compIds = data.competencyIds;
 
                 var calls = [];
@@ -436,7 +441,9 @@ define(['jquery',
                     templates.runTemplateJS(js);
                     updatedRelatedCompetencies();
                     return;
-                }).catch(notification.exception);
+                })
+                .then(pendingPromise.resolve)
+                .catch(notification.exception);
             });
         }
 
diff --git a/admin/tool/lp/amd/src/competencypicker.js b/admin/tool/lp/amd/src/competencypicker.js
index 23dce8a71ab51..c3cb0b161f931 100644
--- a/admin/tool/lp/amd/src/competencypicker.js
+++ b/admin/tool/lp/amd/src/competencypicker.js
@@ -31,8 +31,10 @@ define(['jquery',
         'core/templates',
         'tool_lp/dialogue',
         'core/str',
-        'tool_lp/tree'],
-        function($, Notification, Ajax, Templates, Dialogue, Str, Tree) {
+        'tool_lp/tree',
+        'core/pending'
+        ],
+        function($, Notification, Ajax, Templates, Dialogue, Str, Tree, Pending) {
 
     /**
      * Competency picker class.
@@ -157,6 +159,7 @@ define(['jquery',
         // Add listener for add.
         self._find('[data-region="competencylinktree"] [data-action="add"]').click(function(e) {
             e.preventDefault();
+            var pendingPromise = new Pending();
             if (!self._selectedCompetencies.length) {
                 return;
             }
@@ -168,7 +171,10 @@ define(['jquery',
                 self._trigger('save', {competencyId: self._selectedCompetencies[0]});
             }
 
+            // The dialogue here is a YUI dialogue and doesn't support Promises at all.
+            // However, it is typically synchronous so this shoudl suffice.
             self.close();
+            pendingPromise.resolve();
         });
 
         // The list of selected competencies will be modified while looping (because of the listeners above).
diff --git a/admin/tool/lp/amd/src/course_competency_settings.js b/admin/tool/lp/amd/src/course_competency_settings.js
index ff21ade439915..22074910ae465 100644
--- a/admin/tool/lp/amd/src/course_competency_settings.js
+++ b/admin/tool/lp/amd/src/course_competency_settings.js
@@ -26,8 +26,10 @@ define(['jquery',
         'tool_lp/dialogue',
         'core/str',
         'core/ajax',
-        'core/templates'],
-       function($, notification, Dialogue, str, ajax, templates) {
+        'core/templates',
+        'core/pending'
+        ],
+       function($, notification, Dialogue, str, ajax, templates, Pending) {
 
     /**
      * Constructor
@@ -48,6 +50,7 @@ define(['jquery',
      * @method configureSettings
      */
     settingsMod.prototype.configureSettings = function(e) {
+        var pendingPromise = new Pending();
         var courseid = $(e.target).closest('a').data('courseid');
         var currentValue = $(e.target).closest('a').data('pushratingstouserplans');
         var context = {
@@ -56,16 +59,21 @@ define(['jquery',
         };
         e.preventDefault();
 
-        templates.render('tool_lp/course_competency_settings', context).done(function(html) {
-            str.get_string('configurecoursecompetencysettings', 'tool_lp').done(function(title) {
-                this._dialogue = new Dialogue(
-                    title,
-                    html,
-                    this.addListeners.bind(this)
-                );
-            }.bind(this)).fail(notification.exception);
-        }.bind(this)).fail(notification.exception);
-
+        $.when(
+            str.get_string('configurecoursecompetencysettings', 'tool_lp'),
+            templates.render('tool_lp/course_competency_settings', context)
+        )
+        .then(function(title, templateResult) {
+            this._dialogue = new Dialogue(
+                title,
+                templateResult[0],
+                this.addListeners.bind(this)
+            );
+
+            return this._dialogue;
+        }.bind(this))
+        .then(pendingPromise.resolve)
+        .catch(notification.exception);
     };
 
     /**
@@ -108,6 +116,7 @@ define(['jquery',
      * @method saveSettings
      */
     settingsMod.prototype.saveSettings = function(e) {
+        var pendingPromise = new Pending();
         e.preventDefault();
 
         var newValue = this._find('input[name="pushratingstouserplans"]:checked').val();
@@ -117,9 +126,12 @@ define(['jquery',
         ajax.call([
             {methodname: 'core_competency_update_course_competency_settings',
               args: {courseid: courseId, settings: settings}}
-        ])[0].done(function() {
-            this.refreshCourseCompetenciesPage();
-        }.bind(this)).fail(notification.exception);
+        ])[0]
+        .then(function() {
+            return this.refreshCourseCompetenciesPage();
+        }.bind(this))
+        .then(pendingPromise.resolve)
+        .catch(notification.exception);
 
     };
 
@@ -131,18 +143,23 @@ define(['jquery',
      */
     settingsMod.prototype.refreshCourseCompetenciesPage = function() {
         var courseId = this._find('input[name="courseid"]').val();
+        var pendingPromise = new Pending();
 
         ajax.call([
             {methodname: 'tool_lp_data_for_course_competencies_page',
               args: {courseid: courseId, moduleid: 0}}
-        ])[0].done(function(context) {
-            templates.render('tool_lp/course_competencies_page', context).done(function(html, js) {
-                $('[data-region="coursecompetenciespage"]').replaceWith(html);
-                templates.runTemplateJS(js);
-                this._dialogue.close();
-            }.bind(this)).fail(notification.exception);
-        }.bind(this)).fail(notification.exception);
-
+        ])[0]
+        .then(function(context) {
+            return templates.render('tool_lp/course_competencies_page', context);
+        })
+        .then(function(html, js) {
+            templates.replaceNode($('[data-region="coursecompetenciespage"]'), html, js);
+            this._dialogue.close();
+
+            return;
+        }.bind(this))
+        .then(pendingPromise.resolve)
+        .catch(notification.exception);
     };
 
     return /** @alias module:tool_lp/configurecoursecompetencysettings */ settingsMod;
diff --git a/admin/tool/lp/amd/src/grade_dialogue.js b/admin/tool/lp/amd/src/grade_dialogue.js
index 576b511f3d79d..80ef97c5c773d 100644
--- a/admin/tool/lp/amd/src/grade_dialogue.js
+++ b/admin/tool/lp/amd/src/grade_dialogue.js
@@ -102,15 +102,20 @@ define(['jquery',
      * @return {Promise}
      */
     Grade.prototype.display = function() {
-        return this._render().then(function(html) {
-            return Str.get_string('rate', 'tool_lp').then(function(title) {
-                this._popup = new Dialogue(
-                    title,
-                    html,
-                    this._afterRender.bind(this)
-                );
-            }.bind(this));
-        }.bind(this)).fail(Notification.exception);
+        return $.when(
+            Str.get_string('rate', 'tool_lp'),
+            this._render()
+        )
+        .then(function(title, templateResult) {
+            this._popup = new Dialogue(
+                title,
+                templateResult[0],
+                this._afterRender.bind(this)
+            );
+
+            return this._popup;
+        }.bind(this))
+        .catch(Notification.exception);
     };
 
     /**
diff --git a/admin/tool/lp/amd/src/grade_user_competency_inline.js b/admin/tool/lp/amd/src/grade_user_competency_inline.js
index 7a030b6be4bfb..81e4f3577c0c0 100644
--- a/admin/tool/lp/amd/src/grade_user_competency_inline.js
+++ b/admin/tool/lp/amd/src/grade_user_competency_inline.js
@@ -95,7 +95,7 @@ define(['jquery',
             self = this;
 
         var promise = ScaleValues.get_values(self._scaleId);
-        promise.done(function(scalevalues) {
+        promise.then(function(scalevalues) {
             options.push({
                 value: '',
                 name: self._chooseStr
@@ -109,8 +109,13 @@ define(['jquery',
                 });
             }
 
-            self._dialogue = new GradeDialogue(options);
-            self._dialogue.on('rated', function(e, data) {
+            return options;
+        })
+        .then(function(options) {
+            return new GradeDialogue(options);
+        })
+        .then(function(dialogue) {
+            dialogue.on('rated', function(e, data) {
                 var args = self._args;
                 args.grade = data.rating;
                 args.note = data.note;
@@ -123,7 +128,15 @@ define(['jquery',
                     fail: notification.exception
                 }]);
             });
-        }).fail(notification.exception);
+
+            return dialogue;
+        })
+        .then(function(dialogue) {
+            self._dialogue = dialogue;
+
+            return;
+        })
+        .fail(notification.exception);
     };
 
     /** @type {Number} The scale id for this competency. */
diff --git a/admin/tool/lp/classes/output/manage_competency_frameworks_page.php b/admin/tool/lp/classes/output/manage_competency_frameworks_page.php
index 7a2181b586d79..07a6dad7687b9 100644
--- a/admin/tool/lp/classes/output/manage_competency_frameworks_page.php
+++ b/admin/tool/lp/classes/output/manage_competency_frameworks_page.php
@@ -75,7 +75,7 @@ public function __construct(context $pagecontext) {
             );
             $this->navigation[] = $addpage;
             $competenciesrepository = new single_button(
-                new moodle_url('https://moodle.net/competencies'),
+                new moodle_url('https://archive.moodle.net/competencies'),
                 get_string('competencyframeworksrepository', 'tool_lp'),
                 'get'
             );
diff --git a/admin/tool/lp/templates/competency_plan_navigation.mustache b/admin/tool/lp/templates/competency_plan_navigation.mustache
index 92add2659afff..66747cbe85526 100644
--- a/admin/tool/lp/templates/competency_plan_navigation.mustache
+++ b/admin/tool/lp/templates/competency_plan_navigation.mustache
@@ -32,7 +32,7 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-sm-right card card-block">
+<div class="float-sm-right border p-2 mb-2">
 {{#hascompetencies}}
 <span>
 <label for="competency-nav-{{uniqid}}" class="accesshide">{{#str}}jumptocompetency, tool_lp{{/str}}</label>
diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache
index 8de78a04c5497..6d3622b8218d4 100644
--- a/admin/tool/lp/templates/course_competencies_page.mustache
+++ b/admin/tool/lp/templates/course_competencies_page.mustache
@@ -82,7 +82,7 @@
         {{/comppath}}
         {{#usercompetencycourse}}
             {{#grade}}
-            <span class="badge {{^proficiency}}badge-danger{{/proficiency}}">{{gradename}}</span>
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}}">{{gradename}}</span>
             {{/grade}}
         {{/usercompetencycourse}}
         {{#canmanagecoursecompetencies}}
diff --git a/admin/tool/lp/templates/course_competency_statistics.mustache b/admin/tool/lp/templates/course_competency_statistics.mustache
index 31260af1d28e3..73c74de8f42a7 100644
--- a/admin/tool/lp/templates/course_competency_statistics.mustache
+++ b/admin/tool/lp/templates/course_competency_statistics.mustache
@@ -49,7 +49,7 @@
     Template statistics template.
 }}
 {{#competencycount}}
-<div data-region="coursecompetencystatistics" class="card">
+<div data-region="coursecompetencystatistics" class="border p-2 mb-2">
     {{#canbegradedincourse}}
         {{< tool_lp/progress_bar}}
             {{$progresstext}}
diff --git a/admin/tool/lp/templates/evidence_summary.mustache b/admin/tool/lp/templates/evidence_summary.mustache
index 83984da434f34..5033ce977d804 100644
--- a/admin/tool/lp/templates/evidence_summary.mustache
+++ b/admin/tool/lp/templates/evidence_summary.mustache
@@ -44,7 +44,7 @@
       "id": 1
     }
 }}
-<div class="card well-small evidence" data-region="evidence" data-id="{{id}}">
+<div class="border p-2 mb-2 evidence" data-region="evidence" data-id="{{id}}">
     {{#candelete}}
         <div class="float-sm-right">
             <a href="#" data-action="delete-evidence">{{#pix}}t/delete{{/pix}}</a>
diff --git a/admin/tool/lp/templates/manage_competencies_page.mustache b/admin/tool/lp/templates/manage_competencies_page.mustache
index 92354ec7212d9..ccc67ba15af6d 100644
--- a/admin/tool/lp/templates/manage_competencies_page.mustache
+++ b/admin/tool/lp/templates/manage_competencies_page.mustache
@@ -50,10 +50,12 @@
         <div class="col-lg-6">
             <p>
                 <form data-region="filtercompetencies" data-frameworkid="{{framework.id}}" class="form-inline">
-                    <div class="form-group">
+                    <div class="input-group mb-3">
                         <label class="accesshide" for="filter{{uniqid}}">{{#str}}search, tool_lp{{/str}}</label>
                         <input class="form-control" type="text" id="filter{{uniqid}}" placeholder="{{#str}}search, tool_lp{{/str}}" value="{{search}}">
-                        <button class="btn btn-secondary">{{#pix}}a/search, , {{#str}}search{{/str}}{{/pix}}</button>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary">{{#pix}}a/search, , {{#str}}search{{/str}}{{/pix}}</button>
+                        </div>
                     </div>
                 </form>
             </p>
@@ -62,8 +64,8 @@
             </ul>
         </div>
 
-        <div class="card col-lg-6">
-            <div class="card-block card-body">
+        <div class="col-lg-6">
+            <div class="border p-2 mb-2">
                 <div class="card-title">
                     <h4 data-region="selected-competency">{{#str}}selectedcompetency, tool_lp{{/str}}</h4>
                         <span data-region="competencyactionsmenu" class="float-sm-right">
diff --git a/admin/tool/lp/templates/module_navigation.mustache b/admin/tool/lp/templates/module_navigation.mustache
index aa10239bb6e96..4b68402c0a94e 100644
--- a/admin/tool/lp/templates/module_navigation.mustache
+++ b/admin/tool/lp/templates/module_navigation.mustache
@@ -28,8 +28,10 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-right card p-2">
+<div class="float-right border mb-2 p-2">
 <form class="user-competency-course-navigation">
+<input type="hidden" name="courseid" value="{{courseid}}"/>
+<input type="hidden" name="mod" value="{{moduleid}}"/>
 {{#hasmodules}}
 <span>
 <label for="module-nav-{{uniqid}}" class="accesshide">{{#str}}filterbyactivity, tool_lp{{/str}}</label>
diff --git a/admin/tool/lp/templates/template_competencies_page.mustache b/admin/tool/lp/templates/template_competencies_page.mustache
index aa3895c662700..e5f7ca29f3a67 100644
--- a/admin/tool/lp/templates/template_competencies_page.mustache
+++ b/admin/tool/lp/templates/template_competencies_page.mustache
@@ -26,10 +26,8 @@
     </h2>
     <div>{{{template.description}}}</div>
     {{#canmanagetemplatecompetencies}}
-    <div data-region="actions" class="clearfix">
-        <div class="float-left">
-            <button disabled class="btn btn-secondary">{{#str}}addtemplatecompetencies, tool_lp{{/str}}</button>
-        </div>
+    <div data-region="actions" class="my-4">
+        <button disabled class="btn btn-secondary">{{#str}}addtemplatecompetencies, tool_lp{{/str}}</button>
     </div>
     {{/canmanagetemplatecompetencies}}
     <h3 class="mt-1">{{#str}}templatecompetencies, tool_lp{{/str}}</h3>
@@ -41,7 +39,7 @@
             <div class="drag-parentnode">
                 {{#competencies}}
                 <div class="drag-samenode" data-id="{{competency.id}}">
-                    <div class="card">
+                    <div class="border p-2 mb-2">
                         {{#canmanagetemplatecompetencies}}
                         <span class="drag-handlecontainer float-left"></span>
                         <div class="float-sm-right">
diff --git a/admin/tool/lp/templates/template_statistics.mustache b/admin/tool/lp/templates/template_statistics.mustache
index 9751cbd09ea04..418b4934b9e44 100644
--- a/admin/tool/lp/templates/template_statistics.mustache
+++ b/admin/tool/lp/templates/template_statistics.mustache
@@ -45,8 +45,7 @@
     Template statistics template.
 }}
 {{#competencycount}}
-<div data-region="templatestatistics" class="card">
-    <div class="card-block">
+<div data-region="templatestatistics" class="border p-2 mb-2">
     {{< tool_lp/progress_bar}}
         {{$progresstext}}
             {{#str}}xcompetencieslinkedoutofy, tool_lp, { "x": "{{linkedcompetencycount}}", "y": "{{competencycount}}" } {{/str}}
@@ -90,6 +89,5 @@
         </div>
     </div>
     {{/leastproficientcount}}
-    </div>
 </div>
 {{/competencycount}}
diff --git a/admin/tool/lp/templates/user_competency_course_navigation.mustache b/admin/tool/lp/templates/user_competency_course_navigation.mustache
index 331c3e15892ca..2a9f2deeda4c9 100644
--- a/admin/tool/lp/templates/user_competency_course_navigation.mustache
+++ b/admin/tool/lp/templates/user_competency_course_navigation.mustache
@@ -35,9 +35,12 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-sm-right card card-block p-x-1 p-b-1">
+<div class="float-sm-right border p-2 mb-2">
 <p>{{{groupselector}}}</p>
 <form class="user-competency-course-navigation">
+<input type="hidden" name="userid" value="{{userid}}"/>
+<input type="hidden" name="competencyid" value="{{competencyid}}"/>
+<input type="hidden" name="courseid" value="{{courseid}}"/>
 {{#hasusers}}
 <span>
 <label for="user-nav-{{uniqid}}" class="accesshide">{{#str}}jumptouser, tool_lp{{/str}}</label>
diff --git a/admin/tool/lp/templates/user_competency_summary.mustache b/admin/tool/lp/templates/user_competency_summary.mustache
index 4ee61f12b541e..863aaed949d58 100644
--- a/admin/tool/lp/templates/user_competency_summary.mustache
+++ b/admin/tool/lp/templates/user_competency_summary.mustache
@@ -57,7 +57,7 @@
         </dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/admin/tool/lp/templates/user_competency_summary_in_course.mustache b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
index a5acf4f747526..fe97642fd172d 100644
--- a/admin/tool/lp/templates/user_competency_summary_in_course.mustache
+++ b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
@@ -81,7 +81,7 @@
         {{#usercompetencycourse}}
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/admin/tool/lp/templates/user_competency_summary_in_plan.mustache b/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
index 60ec206b0b934..bb13c95f6592d 100644
--- a/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
+++ b/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
@@ -68,7 +68,7 @@
         </dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
@@ -101,7 +101,7 @@
         <dd>{{gradename}} - {{#str}}plancompleted, tool_lp{{/str}}</dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge{{^proficiency}} badge-danger{{/proficiency}} float-left">
+            <span class="badge {{#proficiency}}badge-success{{/proficiency}}{{^proficiency}}badge-danger{{/proficiency}} float-left">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/admin/tool/lp/tests/behat/framework_crud.feature b/admin/tool/lp/tests/behat/framework_crud.feature
index df34c22897985..168a028ef4e9d 100644
--- a/admin/tool/lp/tests/behat/framework_crud.feature
+++ b/admin/tool/lp/tests/behat/framework_crud.feature
@@ -6,6 +6,7 @@ Feature: Manage competency frameworks
 
   Background:
     Given I log in as "admin"
+    And I change window size to "small"
     And I am on site homepage
 
   Scenario: Create a new framework
diff --git a/admin/tool/lp/tests/behat/template_crud.feature b/admin/tool/lp/tests/behat/template_crud.feature
index 0156243a98d85..a5386ffccb99e 100644
--- a/admin/tool/lp/tests/behat/template_crud.feature
+++ b/admin/tool/lp/tests/behat/template_crud.feature
@@ -6,6 +6,7 @@ Feature: Manage plearning plan templates
 
   Background:
     Given I log in as "admin"
+    And I change window size to "small"
     And I am on site homepage
 
   Scenario: Create a new learning plan template
diff --git a/admin/tool/messageinbound/lang/en/tool_messageinbound.php b/admin/tool/messageinbound/lang/en/tool_messageinbound.php
index 1711f5ede9267..8daab15f8868c 100644
--- a/admin/tool/messageinbound/lang/en/tool_messageinbound.php
+++ b/admin/tool/messageinbound/lang/en/tool_messageinbound.php
@@ -105,7 +105,7 @@
 $string['name'] = 'Name';
 $string['ssl'] = 'SSL (Auto-detect SSL version)';
 $string['sslv2'] = 'SSLv2 (Force SSL Version 2)';
-$string['sslv3'] = 'SSLv2 (Force SSL Version 3)';
+$string['sslv3'] = 'SSLv3 (Force SSL Version 3)';
 $string['taskcleanup'] = 'Cleanup of unverified incoming email';
 $string['taskpickup'] = 'Incoming email pickup';
 $string['tls'] = 'TLS (TLS; started via protocol-level negotiation over unencrypted channel; RECOMMENDED way of initiating secure connection)';
diff --git a/admin/tool/mobile/classes/api.php b/admin/tool/mobile/classes/api.php
index 02027bd4054f9..a60b8f6b95cbf 100644
--- a/admin/tool/mobile/classes/api.php
+++ b/admin/tool/mobile/classes/api.php
@@ -206,6 +206,12 @@ public static function get_public_config() {
         $identityprovidersdata = \auth_plugin_base::prepare_identity_providers_for_output($identityproviders, $OUTPUT);
         if (!empty($identityprovidersdata)) {
             $settings['identityproviders'] = $identityprovidersdata;
+            // Clean URLs to avoid breaking Web Services.
+            // We can't do it in prepare_identity_providers_for_output() because it may break the web output.
+            foreach ($settings['identityproviders'] as &$ip) {
+                $ip['url'] = (!empty($ip['url'])) ? clean_param($ip['url'], PARAM_URL) : '';
+                $ip['iconurl'] = (!empty($ip['iconurl'])) ? clean_param($ip['iconurl'], PARAM_URL) : '';
+            }
         }
 
         // If age is verified, return also the admin contact details.
diff --git a/admin/tool/mobile/db/upgrade.php b/admin/tool/mobile/db/upgrade.php
index 73748aa8d9ef4..6d5c5a79c41a7 100644
--- a/admin/tool/mobile/db/upgrade.php
+++ b/admin/tool/mobile/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_tool_mobile_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2019021100, 'tool', 'mobile');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/mobile/lang/en/tool_mobile.php b/admin/tool/mobile/lang/en/tool_mobile.php
index 0b6ba8172c0fc..e9d2fd81d0a96 100644
--- a/admin/tool/mobile/lang/en/tool_mobile.php
+++ b/admin/tool/mobile/lang/en/tool_mobile.php
@@ -82,7 +82,7 @@
 $string['mobileauthentication'] = 'Mobile authentication';
 $string['mobilecssurl'] = 'CSS';
 $string['mobilefeatures'] = 'Mobile features';
-$string['mobilenotificationsdisabledwarning'] = 'Mobile notifications are not enabled. They should be enabled in Manage message outputs.';
+$string['mobilenotificationsdisabledwarning'] = 'Mobile notifications are not enabled. They should be enabled in Notification settings.';
 $string['mobilesettings'] = 'Mobile settings';
 $string['offlineuse'] = 'Offline use';
 $string['pluginname'] = 'Moodle app tools';
@@ -91,7 +91,7 @@
 $string['remoteaddons'] = 'Remote add-ons';
 $string['selfsignedoruntrustedcertificatewarning'] = 'It seems that the HTTPS certificate is self-signed or not trusted. The mobile app will only work with trusted sites.';
 $string['setuplink'] = 'App download page';
-$string['setuplink_desc'] = 'URL of page with links to download the mobile app from the App Store and Google Play.';
+$string['setuplink_desc'] = 'URL of page with options to download the mobile app from the App Store and Google Play. The app download page link is displayed in the page footer and in a user\'s profile. Leave blank to not display a link.';
 $string['smartappbanners'] = 'App Banners';
 $string['typeoflogin'] = 'Type of login';
 $string['typeoflogin_desc'] = 'If the site uses a SSO authentication method, then select via a browser window or via an embedded browser. An embedded browser provides a better user experience, though it doesn\'t work with all SSO plugins.';
diff --git a/admin/tool/mobile/launch.php b/admin/tool/mobile/launch.php
index 1e74e37fc32dd..2c5fc181b50d3 100644
--- a/admin/tool/mobile/launch.php
+++ b/admin/tool/mobile/launch.php
@@ -30,7 +30,7 @@
 
 $serviceshortname  = required_param('service',  PARAM_ALPHANUMEXT);
 $passport          = required_param('passport',  PARAM_RAW);    // Passport send from the app to validate the response URL.
-$urlscheme         = optional_param('urlscheme', 'moodlemobile', PARAM_NOTAGS); // The URL scheme the app supports.
+$urlscheme         = optional_param('urlscheme', 'moodlemobile', PARAM_ALPHANUM); // The URL scheme the app supports.
 $confirmed         = optional_param('confirmed', false, PARAM_BOOL);  // If we are being redirected after user confirmation.
 $oauthsso          = optional_param('oauthsso', 0, PARAM_INT); // Id of the OpenID issuer (for OAuth direct SSO).
 
diff --git a/admin/tool/mobile/settings.php b/admin/tool/mobile/settings.php
index 5a313ed3b1a6f..e4f94ece5e4cc 100644
--- a/admin/tool/mobile/settings.php
+++ b/admin/tool/mobile/settings.php
@@ -63,7 +63,7 @@
 
         $temp->add(new admin_setting_configtext('tool_mobile/forcedurlscheme',
                     new lang_string('forcedurlscheme_key', 'tool_mobile'),
-                    new lang_string('forcedurlscheme', 'tool_mobile'), '', PARAM_NOTAGS));
+                    new lang_string('forcedurlscheme', 'tool_mobile'), '', PARAM_ALPHANUM));
 
         $ADMIN->add('mobileapp', $temp);
 
diff --git a/admin/tool/mobile/tests/externallib_test.php b/admin/tool/mobile/tests/externallib_test.php
index f3d1815eec2c4..f0b91995fd863 100644
--- a/admin/tool/mobile/tests/externallib_test.php
+++ b/admin/tool/mobile/tests/externallib_test.php
@@ -99,6 +99,7 @@ public function test_get_public_config() {
         );
         $this->assertEquals($expected, $result);
 
+        $this->setAdminUser();
         // Change some values.
         set_config('registerauth', 'email');
         $authinstructions = 'Something with <b>html tags</b>';
@@ -112,6 +113,18 @@ public function test_get_public_config() {
         set_config('lang', 'a_b');  // Set invalid lang.
         set_config('disabledfeatures', 'myoverview', 'tool_mobile');
 
+        // Enable couple of issuers.
+        $issuer = \core\oauth2\api::create_standard_issuer('google');
+        $irecord = $issuer->to_record();
+        $irecord->clientid = 'mock';
+        $irecord->clientsecret = 'mock';
+        core\oauth2\api::update_issuer($irecord);
+
+        set_config('hostname', 'localhost', 'auth_cas');
+        set_config('auth_logo', 'http://invalidurl.com//invalid/', 'auth_cas');
+        set_config('auth_name', 'CAS', 'auth_cas');
+        set_config('auth', 'oauth2,cas');
+
         list($authinstructions, $notusedformat) = external_format_text($authinstructions, FORMAT_MOODLE, $context->id);
         $expected['registerauth'] = 'email';
         $expected['authinstructions'] = $authinstructions;
@@ -133,7 +146,26 @@ public function test_get_public_config() {
 
         $result = external::get_public_config();
         $result = external_api::clean_returnvalue(external::get_public_config_returns(), $result);
+        // First check providers.
+        $identityproviders = $result['identityproviders'];
+        unset($result['identityproviders']);
+
+        $this->assertEquals('Google', $identityproviders[0]['name']);
+        $this->assertEquals($irecord->image, $identityproviders[0]['iconurl']);
+        $this->assertContains($CFG->wwwroot, $identityproviders[0]['url']);
+
+        $this->assertEquals('CAS', $identityproviders[1]['name']);
+        $this->assertEmpty($identityproviders[1]['iconurl']);
+        $this->assertContains($CFG->wwwroot, $identityproviders[1]['url']);
+
         $this->assertEquals($expected, $result);
+
+        // Change providers img.
+        $newurl = 'validimage.png';
+        set_config('auth_logo', $newurl, 'auth_cas');
+        $result = external::get_public_config();
+        $result = external_api::clean_returnvalue(external::get_public_config_returns(), $result);
+        $this->assertContains($newurl, $result['identityproviders'][1]['iconurl']);
     }
 
     /**
diff --git a/admin/tool/monitor/db/upgrade.php b/admin/tool/monitor/db/upgrade.php
index f8579c9183ae0..139dec78dd186 100644
--- a/admin/tool/monitor/db/upgrade.php
+++ b/admin/tool/monitor/db/upgrade.php
@@ -62,5 +62,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/monitor/tests/privacy_test.php b/admin/tool/monitor/tests/privacy_test.php
index 8993b7731ed53..3d419c7e4d5d9 100644
--- a/admin/tool/monitor/tests/privacy_test.php
+++ b/admin/tool/monitor/tests/privacy_test.php
@@ -28,6 +28,7 @@
 use \tool_monitor\privacy\provider;
 use \core_privacy\local\request\approved_contextlist;
 use \core_privacy\local\request\approved_userlist;
+use \core_privacy\tests\provider_testcase;
 
 /**
  * Privacy test for the event monitor
@@ -37,7 +38,7 @@
  * @copyright  2018 Adrian Greeve <adriangreeve.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_monitor_privacy_testcase extends advanced_testcase {
+class tool_monitor_privacy_testcase extends provider_testcase {
 
     /**
      * Set up method.
diff --git a/admin/tool/oauth2/classes/form/issuer.php b/admin/tool/oauth2/classes/form/issuer.php
index 5efe02b99b87c..a122a027352c1 100644
--- a/admin/tool/oauth2/classes/form/issuer.php
+++ b/admin/tool/oauth2/classes/form/issuer.php
@@ -46,6 +46,9 @@ class issuer extends persistent {
     /** @var string $type */
     protected $type;
 
+    /** @var boolean $showrequireconfirm Whether to show the require confirmation email checkbox or not. */
+    protected $showrequireconfirm;
+
     /**
      * Constructor.
      *
@@ -71,6 +74,7 @@ public function __construct($action = null, $customdata = null, $method = 'post'
         if (array_key_exists('type', $customdata)) {
             $this->type = $customdata['type'];
         }
+        $this->showrequireconfirm = !empty($customdata['showrequireconfirm']);
         parent::__construct($action, $customdata, $method, $target, $attributes, $editable, $ajaxformdata);
     }
 
@@ -157,9 +161,11 @@ public function definition() {
         $mform->addElement('checkbox', 'showonloginpage', get_string('issuershowonloginpage', 'tool_oauth2'));
         $mform->addHelpButton('showonloginpage', 'issuershowonloginpage', 'tool_oauth2');
 
-        // Require confirmation email for new accounts.
-        $mform->addElement('advcheckbox', 'requireconfirmation', get_string('issuerrequireconfirmation', 'tool_oauth2'));
-        $mform->addHelpButton('requireconfirmation', 'issuerrequireconfirmation', 'tool_oauth2');
+        if ($this->showrequireconfirm) {
+            // Require confirmation email for new accounts.
+            $mform->addElement('advcheckbox', 'requireconfirmation', get_string('issuerrequireconfirmation', 'tool_oauth2'));
+            $mform->addHelpButton('requireconfirmation', 'issuerrequireconfirmation', 'tool_oauth2');
+        }
 
         $mform->addElement('hidden', 'sortorder');
         $mform->setType('sortorder', PARAM_INT);
diff --git a/admin/tool/oauth2/issuers.php b/admin/tool/oauth2/issuers.php
index 87fb17d11325a..55f5beaa8444c 100644
--- a/admin/tool/oauth2/issuers.php
+++ b/admin/tool/oauth2/issuers.php
@@ -58,7 +58,24 @@
         $PAGE->navbar->add(get_string('createnewissuer', 'tool_oauth2'));
     }
 
-    $mform = new \tool_oauth2\form\issuer(null, ['persistent' => $issuer]);
+    $showrequireconfirm = false;
+    if (!empty($issuerid)) {
+        // Show the "Require confirmation email" checkbox for trusted issuers like Google, Facebook and Microsoft.
+        $likefacebook = $DB->sql_like('url', ':facebook');
+        $likegoogle = $DB->sql_like('url', ':google');
+        $likemicrosoft = $DB->sql_like('url', ':microsoft');
+        $params = [
+            'issuerid' => $issuerid,
+            'facebook' => '%facebook%',
+            'google' => '%google%',
+            'microsoft' => '%microsoft%',
+        ];
+        $select = "issuerid = :issuerid AND ($likefacebook OR $likegoogle OR $likemicrosoft)";
+        // We're querying from the oauth2_endpoint table because the base URLs of FB and Microsoft can be empty in the issuer table.
+        $showrequireconfirm = $DB->record_exists_select('oauth2_endpoint', $select, $params);
+    }
+
+    $mform = new \tool_oauth2\form\issuer(null, ['persistent' => $issuer, 'showrequireconfirm' => $showrequireconfirm]);
 }
 
 if ($mform && $mform->is_cancelled()) {
@@ -108,9 +125,11 @@
 
     $type = required_param('type', PARAM_ALPHA);
     $docs = required_param('docslink', PARAM_ALPHAEXT);
+    $showrequireconfirm = optional_param('showrequireconfirm', false, PARAM_BOOL);
     require_sesskey();
     $issuer = core\oauth2\api::init_standard_issuer($type);
-    $mform = new \tool_oauth2\form\issuer(null, ['persistent' => $issuer, 'type' => $type]);
+    $mform = new \tool_oauth2\form\issuer(null, ['persistent' => $issuer, 'type' => $type,
+        'showrequireconfirm' => $showrequireconfirm]);
 
     echo $OUTPUT->header();
     $mform->display();
@@ -178,26 +197,37 @@
     $issuers = core\oauth2\api::get_all_issuers();
     echo $renderer->issuers_table($issuers);
 
+    // Google template.
     $docs = 'admin/tool/oauth2/issuers/google';
-    $params = ['action' => 'edittemplate', 'type' => 'google', 'sesskey' => sesskey(), 'docslink' => $docs];
+    $params = ['action' => 'edittemplate', 'type' => 'google', 'sesskey' => sesskey(), 'docslink' => $docs,
+        'showrequireconfirm' => true];
     $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
     echo $renderer->single_button($addurl, get_string('createnewgoogleissuer', 'tool_oauth2'));
+
+    // Microsoft template.
     $docs = 'admin/tool/oauth2/issuers/microsoft';
-    $params = ['action' => 'edittemplate', 'type' => 'microsoft', 'sesskey' => sesskey(), 'docslink' => $docs];
+    $params = ['action' => 'edittemplate', 'type' => 'microsoft', 'sesskey' => sesskey(), 'docslink' => $docs,
+        'showrequireconfirm' => true];
     $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
     echo $renderer->single_button($addurl, get_string('createnewmicrosoftissuer', 'tool_oauth2'));
+
+    // Facebook template.
     $docs = 'admin/tool/oauth2/issuers/facebook';
-    $params = ['action' => 'edittemplate', 'type' => 'microsoft', 'sesskey' => sesskey(), 'docslink' => $docs];
-    $params = ['action' => 'edittemplate', 'type' => 'facebook', 'sesskey' => sesskey(), 'docslink' => $docs];
+    $params = ['action' => 'edittemplate', 'type' => 'facebook', 'sesskey' => sesskey(), 'docslink' => $docs,
+        'showrequireconfirm' => true];
     $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
     echo $renderer->single_button($addurl, get_string('createnewfacebookissuer', 'tool_oauth2'));
-    $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', ['action' => 'edit']);
+
+    // Nextcloud template.
     $docs = 'admin/tool/oauth2/issuers/nextcloud';
     $params = ['action' => 'edittemplate', 'type' => 'nextcloud', 'sesskey' => sesskey(), 'docslink' => $docs];
     $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', $params);
     echo $renderer->single_button($addurl, get_string('createnewnextcloudissuer', 'tool_oauth2'));
+
+    // Generic issuer.
     $addurl = new moodle_url('/admin/tool/oauth2/issuers.php', ['action' => 'edit']);
     echo $renderer->single_button($addurl, get_string('createnewissuer', 'tool_oauth2'));
+
     echo $OUTPUT->footer();
 
 }
diff --git a/admin/tool/phpunit/webrunner.php b/admin/tool/phpunit/webrunner.php
index 47a2b42ecb66d..32db732aacf04 100644
--- a/admin/tool/phpunit/webrunner.php
+++ b/admin/tool/phpunit/webrunner.php
@@ -131,11 +131,12 @@
             tool_phpunit_problem('Can not create configuration file');
         }
     }
-    $configdir = escapeshellarg($configdir);
-    // no cleanup of path - this is tricky because we can not use escapeshellarg and friends for escaping,
-    // this is from admin user so PARAM_PATH must be enough
     chdir($CFG->dirroot);
-    passthru("php $CFG->admin/tool/phpunit/cli/util.php --run -c $configdir $testclass $testpath", $code);
+    $configdir = escapeshellarg($configdir);
+    $cleanclass = escapeshellarg($testclass);
+    $cleanpath = escapeshellarg($testpath);
+
+    passthru("php $CFG->admin/tool/phpunit/cli/util.php --run -c $configdir $cleanclass $cleanpath", $code);
     chdir($oldcwd);
 
     echo '</pre>';
@@ -146,7 +147,7 @@
 }
 
 echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
-echo '<form method="get" action="webrunner.php">';
+echo '<form method="post" action="webrunner.php">';
 echo '<fieldset class="invisiblefieldset">';
 echo '<label for="testpath">Test one file</label> ';
 echo '<input type="text" id="testpath" name="testpath" value="'.s($testpath).'" size="50" /> (all test cases from webrunner.xml if empty)';
diff --git a/admin/tool/policy/amd/build/policyactions.min.js b/admin/tool/policy/amd/build/policyactions.min.js
index 2e547734159a6..2fcb6849eb6c1 100644
--- a/admin/tool/policy/amd/build/policyactions.min.js
+++ b/admin/tool/policy/amd/build/policyactions.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/notification","core/modal_factory","core/modal_events"],function(a,b,c,d,e){var f={VIEW_POLICY:'[data-action="view"]'},g=function(){this.registerEvents()};return g.prototype.registerEvents=function(){a(f.VIEW_POLICY).click(function(f){f.preventDefault();var g=a(this).data("versionid"),h=a(this).data("behalfid"),i={versionid:g,behalfid:h},j={methodname:"tool_policy_get_policy_version",args:i},k=a.Deferred(),l=a.Deferred(),m=d.create({title:k,body:l,large:!0}).then(function(a){return a.getRoot().on(e.hidden,function(){a.destroy()}),a}).then(function(a){return a.show(),a})["catch"](c.exception),n=b.call([j]);a.when(n[0]).then(function(a){if(a.result.policy)return k.resolve(a.result.policy.name),l.resolve(a.result.policy.content),a;throw new Error(a.warnings[0].message)})["catch"](function(a){return m.then(function(a){return a.hide(),a.destroy(),a})["catch"](c.exception),c.addNotification({message:a,type:"error"})})})},{init:function(){return new g}}});
\ No newline at end of file
+define(["jquery","core/ajax","core/notification","core/modal_factory","core/modal_events"],function(a,b,c,d,e){var f=function(a){this.registerEvents(a)};return f.prototype.registerEvents=function(f){f.on("click",function(f){f.preventDefault();var g=a(this).data("versionid"),h=a(this).data("behalfid"),i={versionid:g,behalfid:h},j={methodname:"tool_policy_get_policy_version",args:i},k=a.Deferred(),l=a.Deferred(),m=d.create({title:k,body:l,large:!0}).then(function(a){return a.getRoot().on(e.hidden,function(){a.destroy()}),a}).then(function(a){return a.show(),a})["catch"](c.exception),n=b.call([j]);a.when(n[0]).then(function(a){if(a.result.policy)return k.resolve(a.result.policy.name),l.resolve(a.result.policy.content),a;throw new Error(a.warnings[0].message)})["catch"](function(a){return m.then(function(a){return a.hide(),a.destroy(),a})["catch"](c.exception),c.addNotification({message:a,type:"error"})})})},{init:function(b){return b=a(b),new f(b)}}});
\ No newline at end of file
diff --git a/admin/tool/policy/amd/src/policyactions.js b/admin/tool/policy/amd/src/policyactions.js
index b3de54a487ccf..d8cd0f2bd9169 100644
--- a/admin/tool/policy/amd/src/policyactions.js
+++ b/admin/tool/policy/amd/src/policyactions.js
@@ -29,27 +29,18 @@ define([
     'core/modal_events'],
 function($, Ajax, Notification, ModalFactory, ModalEvents) {
 
-    /**
-     * List of action selectors.
-     *
-     * @type {{VIEW_POLICY: string}}
-     */
-    var ACTIONS = {
-        VIEW_POLICY: '[data-action="view"]'
-    };
-
     /**
      * PolicyActions class.
      */
-    var PolicyActions = function() {
-        this.registerEvents();
+    var PolicyActions = function(root) {
+        this.registerEvents(root);
     };
 
     /**
      * Register event listeners.
      */
-    PolicyActions.prototype.registerEvents = function() {
-        $(ACTIONS.VIEW_POLICY).click(function(e) {
+    PolicyActions.prototype.registerEvents = function(root) {
+        root.on("click", function(e) {
             e.preventDefault();
 
             var versionid = $(this).data('versionid');
@@ -127,8 +118,9 @@ function($, Ajax, Notification, ModalFactory, ModalEvents) {
          * @method init
          * @return {PolicyActions}
          */
-        'init': function() {
-            return new PolicyActions();
+        'init': function(root) {
+            root = $(root);
+            return new PolicyActions(root);
         }
     };
 });
diff --git a/admin/tool/policy/classes/form/accept_policy.php b/admin/tool/policy/classes/form/accept_policy.php
index e7bcec43a7d5d..d385b2b33a932 100644
--- a/admin/tool/policy/classes/form/accept_policy.php
+++ b/admin/tool/policy/classes/form/accept_policy.php
@@ -111,7 +111,7 @@ public function definition() {
             }
         }
 
-        $PAGE->requires->js_call_amd('tool_policy/policyactions', 'init');
+        $PAGE->requires->js_call_amd('tool_policy/policyactions', 'init', ['[data-action="view"]']);
     }
 
     /**
@@ -197,4 +197,4 @@ public function process() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/admin/tool/policy/db/upgrade.php b/admin/tool/policy/db/upgrade.php
index cf1a33b3ed4b4..87e99655470ab 100644
--- a/admin/tool/policy/db/upgrade.php
+++ b/admin/tool/policy/db/upgrade.php
@@ -63,5 +63,8 @@ function xmldb_tool_policy_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/policy/templates/guestconsent.mustache b/admin/tool/policy/templates/guestconsent.mustache
index 872757e085e07..9595e6985c42c 100644
--- a/admin/tool/policy/templates/guestconsent.mustache
+++ b/admin/tool/policy/templates/guestconsent.mustache
@@ -58,7 +58,7 @@ require(['jquery', 'tool_policy/jquery-eu-cookie-law-popup', 'tool_policy/policy
                    "<ul>{{#policies}}" +
                    "<li>" +
                    "<a href=\"{{pluginbaseurl}}/view.php?versionid={{id}}{{#returnurl}}&amp;returnurl={{.}}{{/returnurl}}\" " +
-                   "   data-action=\"view\" data-versionid=\"{{id}}\" data-behalfid=\"1\" >" +
+                   "   data-action=\"view-guest\" data-versionid=\"{{id}}\" data-behalfid=\"1\" >" +
                    "{{{name}}}" +
                    "</a>" +
                    "</li>" +
@@ -81,7 +81,7 @@ require(['jquery', 'tool_policy/jquery-eu-cookie-law-popup', 'tool_policy/policy
             {{/haspolicies}}
 
             // Initialise the JS for the modal window which displays the policy versions.
-            ActionsMod.init();
+            ActionsMod.init('[data-action="view-guest"]');
         });
 });
 
diff --git a/admin/tool/policy/templates/page_agreedocs.mustache b/admin/tool/policy/templates/page_agreedocs.mustache
index 40512ad59509d..60efaa6838e28 100644
--- a/admin/tool/policy/templates/page_agreedocs.mustache
+++ b/admin/tool/policy/templates/page_agreedocs.mustache
@@ -143,6 +143,6 @@
 {{#js}}
 // Initialise the JS for the modal window which displays the policy versions.
 require(['tool_policy/policyactions'], function(ActionsMod) {
-    ActionsMod.init();
+    ActionsMod.init('[data-action="view"]');
 });
 {{/js}}
diff --git a/admin/tool/policy/templates/page_nopermission.mustache b/admin/tool/policy/templates/page_nopermission.mustache
index 93b8296a3f79e..81f66f0dff9e5 100644
--- a/admin/tool/policy/templates/page_nopermission.mustache
+++ b/admin/tool/policy/templates/page_nopermission.mustache
@@ -73,6 +73,6 @@
 {{#js}}
 // Initialise the JS for the modal window which displays the policy versions.
 require(['tool_policy/policyactions'], function(ActionsMod) {
-    ActionsMod.init();
+    ActionsMod.init('[data-action="view"]');
 });
 {{/js}}
diff --git a/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php b/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php
index e9a36aa5cc6df..76a5f34871730 100644
--- a/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php
+++ b/admin/tool/spamcleaner/lang/en/tool_spamcleaner.php
@@ -28,7 +28,7 @@
 $string['spamcannotdelete'] = 'Cannot delete this user';
 $string['spamcannotfinduser'] = 'No users matching your search';
 $string['spamcleanerintro'] = '<p>This script allows you to search all user profiles for certain strings and then delete those accounts which are obviously created by spammers. You can search for multiple keywords using commas (e.g. casino, porn).</p>
-<p>For further information, see the documentation <a href="http://docs.moodle.org/en/Reducing_spam_in_Moodle">Reducing spam in Moodle</a>.</p>';
+<p>For further information, see the documentation <a href="https://docs.moodle.org/en/Reducing_spam_in_Moodle">Reducing spam in Moodle</a>.</p>';
 $string['spamdeleteall'] = 'Delete all these user accounts';
 $string['spamdeleteallconfirm'] = 'Are you sure you want to delete all these user accounts?  You can not undo this.';
 $string['spamdeleteconfirm'] = 'Are you sure you want to delete this entry?  You can not undo this.';
diff --git a/admin/tool/task/cli/schedule_task.php b/admin/tool/task/cli/schedule_task.php
index cf03700bd4f9d..85d7a4fd6ceeb 100644
--- a/admin/tool/task/cli/schedule_task.php
+++ b/admin/tool/task/cli/schedule_task.php
@@ -50,7 +50,7 @@
 -h, --help            Print out this help
 
 Example:
-\$sudo -u www-data /usr/bin/php admin/tool/task/cli/scheduled_task.php --execute=\\\\core\\\\task\\\\session_cleanup_task
+\$sudo -u www-data /usr/bin/php admin/tool/task/cli/schedule_task.php --execute=\\\\core\\\\task\\\\session_cleanup_task
 
 ";
 
diff --git a/admin/tool/uploadcourse/classes/course.php b/admin/tool/uploadcourse/classes/course.php
index 7656ae8b59376..8ae7a8d51267e 100644
--- a/admin/tool/uploadcourse/classes/course.php
+++ b/admin/tool/uploadcourse/classes/course.php
@@ -412,6 +412,12 @@ public function prepare() {
                 $this->error('invalidshortname', new lang_string('invalidshortname', 'tool_uploadcourse'));
                 return false;
             }
+
+            // Ensure we don't overflow the maximum length of the shortname field.
+            if (core_text::strlen($this->shortname) > 255) {
+                $this->error('invalidshortnametoolong', new lang_string('invalidshortnametoolong', 'tool_uploadcourse', 255));
+                return false;
+            }
         }
 
         $exists = $this->exists();
@@ -479,6 +485,12 @@ public function prepare() {
             return false;
         }
 
+        // Ensure we don't overflow the maximum length of the fullname field.
+        if (!empty($coursedata['fullname']) && core_text::strlen($coursedata['fullname']) > 254) {
+            $this->error('invalidfullnametoolong', new lang_string('invalidfullnametoolong', 'tool_uploadcourse', 254));
+            return false;
+        }
+
         // If the course does not exist, or will be forced created.
         if (!$exists || $mode === tool_uploadcourse_processor::MODE_CREATE_ALL) {
 
@@ -703,15 +715,29 @@ public function prepare() {
             $coursedata += $courseformat->validate_course_format_options($this->rawdata);
         }
 
-        // Special case, 'numsections' is not a course format option any more but still should apply from defaults.
+        // Special case, 'numsections' is not a course format option any more but still should apply from the template course,
+        // if any, and otherwise from defaults.
         if (!$exists || !array_key_exists('numsections', $coursedata)) {
             if (isset($this->rawdata['numsections']) && is_numeric($this->rawdata['numsections'])) {
                 $coursedata['numsections'] = (int)$this->rawdata['numsections'];
+            } else if (isset($this->options['templatecourse'])) {
+                $numsections = tool_uploadcourse_helper::get_coursesection_count($this->options['templatecourse']);
+                if ($numsections != 0) {
+                    $coursedata['numsections'] = $numsections;
+                } else {
+                    $coursedata['numsections'] = get_config('moodlecourse', 'numsections');
+                }
             } else {
                 $coursedata['numsections'] = get_config('moodlecourse', 'numsections');
             }
         }
 
+        // Visibility can only be 0 or 1.
+        if (!empty($coursedata['visible']) AND !($coursedata['visible'] == 0 OR $coursedata['visible'] == 1)) {
+            $this->error('invalidvisibilitymode', new lang_string('invalidvisibilitymode', 'tool_uploadcourse'));
+            return false;
+        }
+
         // Saving data.
         $this->data = $coursedata;
         $this->enrolmentdata = tool_uploadcourse_helper::get_enrolment_data($this->rawdata);
diff --git a/admin/tool/uploadcourse/classes/helper.php b/admin/tool/uploadcourse/classes/helper.php
index 2e514a70f2127..2325c9c02ae93 100644
--- a/admin/tool/uploadcourse/classes/helper.php
+++ b/admin/tool/uploadcourse/classes/helper.php
@@ -286,6 +286,25 @@ public static function get_role_ids() {
         return $roles;
     }
 
+    /**
+     * Helper to detect how many sections a course with a given shortname has.
+     *
+     * @param string $shortname shortname of a course to count sections from.
+     * @return integer count of sections.
+     */
+    public static function get_coursesection_count($shortname) {
+        global $DB;
+        if (!empty($shortname) || is_numeric($shortname)) {
+            // Creating restore from an existing course.
+            $course = $DB->get_record('course', array('shortname' => $shortname));
+        }
+        if (!empty($course)) {
+            $courseformat = course_get_format($course);
+            return $courseformat->get_last_section_number();
+        }
+        return 0;
+    }
+
     /**
      * Get the role renaming data from the passed data.
      *
diff --git a/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php b/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
index 6c20d8f49622c..9a0e2c6aad149 100644
--- a/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
+++ b/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
@@ -90,8 +90,11 @@
 $string['invalidencoding'] = 'Invalid encoding';
 $string['invalidmode'] = 'Invalid mode selected';
 $string['invalideupdatemode'] = 'Invalid update mode selected';
+$string['invalidvisibilitymode'] = 'Invalid visible mode';
 $string['invalidroles'] = 'Invalid role names: {$a}';
 $string['invalidshortname'] = 'Invalid shortname';
+$string['invalidfullnametoolong'] = 'The fullname field is limited to {$a} characters';
+$string['invalidshortnametoolong'] = 'The shortname field is limited to {$a} characters';
 $string['missingmandatoryfields'] = 'Missing value for mandatory fields: {$a}';
 $string['missingshortnamenotemplate'] = 'Missing shortname and shortname template not set';
 $string['mode'] = 'Upload mode';
diff --git a/admin/tool/uploadcourse/tests/course_test.php b/admin/tool/uploadcourse/tests/course_test.php
index 092469fc3643e..0add18ea2ccf7 100644
--- a/admin/tool/uploadcourse/tests/course_test.php
+++ b/admin/tool/uploadcourse/tests/course_test.php
@@ -82,6 +82,47 @@ public function test_invalid_shortname() {
         $this->assertArrayHasKey('invalidshortname', $co->get_errors());
     }
 
+    public function test_invalid_shortname_too_long() {
+        $this->resetAfterTest();
+
+        $mode = tool_uploadcourse_processor::MODE_CREATE_NEW;
+        $updatemode = tool_uploadcourse_processor::UPDATE_NOTHING;
+
+        $upload = new tool_uploadcourse_course($mode, $updatemode, [
+            'category' => 1,
+            'fullname' => 'New course',
+            'shortname' => str_repeat('X', 2000),
+        ]);
+
+        $this->assertFalse($upload->prepare());
+        $this->assertArrayHasKey('invalidshortnametoolong', $upload->get_errors());
+    }
+
+    public function test_invalid_fullname_too_long() {
+        $this->resetAfterTest();
+
+        $mode = tool_uploadcourse_processor::MODE_CREATE_NEW;
+        $updatemode = tool_uploadcourse_processor::UPDATE_NOTHING;
+
+        $upload = new tool_uploadcourse_course($mode, $updatemode, [
+            'category' => 1,
+            'fullname' => str_repeat('X', 2000),
+        ]);
+
+        $this->assertFalse($upload->prepare());
+        $this->assertArrayHasKey('invalidfullnametoolong', $upload->get_errors());
+    }
+
+    public function test_invalid_visibility() {
+        $this->resetAfterTest(true);
+        $mode = tool_uploadcourse_processor::MODE_CREATE_NEW;
+        $updatemode = tool_uploadcourse_processor::UPDATE_NOTHING;
+        $data = array('shortname' => 'test', 'fullname' => 'New course', 'summary' => 'New', 'category' => 1, 'visible' => 2);
+        $co = new tool_uploadcourse_course($mode, $updatemode, $data);
+        $this->assertFalse($co->prepare());
+        $this->assertArrayHasKey('invalidvisibilitymode', $co->get_errors());
+    }
+
     public function test_create() {
         global $DB;
         $this->resetAfterTest(true);
diff --git a/admin/tool/uploaduser/locallib.php b/admin/tool/uploaduser/locallib.php
index e988e777838ab..e389f8064e4f8 100644
--- a/admin/tool/uploaduser/locallib.php
+++ b/admin/tool/uploaduser/locallib.php
@@ -360,6 +360,7 @@ function uu_allowed_roles() {
  */
 function uu_allowed_roles_cache() {
     $allowedroles = get_assignable_roles(context_course::instance(SITEID), ROLENAME_SHORT);
+    $rolecache = [];
     foreach ($allowedroles as $rid=>$rname) {
         $rolecache[$rid] = new stdClass();
         $rolecache[$rid]->id   = $rid;
@@ -379,6 +380,7 @@ function uu_allowed_roles_cache() {
  */
 function uu_allowed_sysroles_cache() {
     $allowedroles = get_assignable_roles(context_system::instance(), ROLENAME_SHORT);
+    $rolecache = [];
     foreach ($allowedroles as $rid => $rname) {
         $rolecache[$rid] = new stdClass();
         $rolecache[$rid]->id   = $rid;
diff --git a/admin/tool/usertours/classes/manager.php b/admin/tool/usertours/classes/manager.php
index f29f481aae35a..c7e5b3e533f48 100644
--- a/admin/tool/usertours/classes/manager.php
+++ b/admin/tool/usertours/classes/manager.php
@@ -257,7 +257,7 @@ protected function print_tour_list() {
                 'title' => get_string('importtour', 'tool_usertours'),
             ],
             (object) [
-                'link'  => new \moodle_url('https://moodle.net/tours'),
+                'link'  => new \moodle_url('https://archive.moodle.net/tours'),
                 'linkproperties' => [
                         'target' => '_blank',
                     ],
diff --git a/admin/tool/usertours/classes/privacy/provider.php b/admin/tool/usertours/classes/privacy/provider.php
index 4441ba84b9994..3713d071236f0 100644
--- a/admin/tool/usertours/classes/privacy/provider.php
+++ b/admin/tool/usertours/classes/privacy/provider.php
@@ -77,18 +77,22 @@ public static function export_user_preferences(int $userid) {
             }
 
             if ($descriptionidentifier !== null) {
-                $time = transform::datetime($value);
-                $tour = \tool_usertours\tour::instance($tourid);
+                try {
+                    $tour = \tool_usertours\tour::instance($tourid);
+                    $time = transform::datetime($value);
 
-                writer::export_user_preference(
-                    'tool_usertours',
-                    $name,
-                    $time,
-                    get_string($descriptionidentifier, 'tool_usertours', (object) [
-                        'name' => $tour->get_name(),
-                        'time' => $time,
-                    ])
-                );
+                    writer::export_user_preference(
+                        'tool_usertours',
+                        $name,
+                        $time,
+                        get_string($descriptionidentifier, 'tool_usertours', (object) [
+                            'name' => $tour->get_name(),
+                            'time' => $time,
+                        ])
+                    );
+                } catch (\dml_missing_record_exception $ex) {
+                    // The tour related to this user preference no longer exists.
+                }
             }
         }
     }
diff --git a/admin/tool/usertours/db/upgrade.php b/admin/tool/usertours/db/upgrade.php
index 47e499422ffe4..523a453ceda0e 100644
--- a/admin/tool/usertours/db/upgrade.php
+++ b/admin/tool/usertours/db/upgrade.php
@@ -61,5 +61,8 @@ function xmldb_tool_usertours_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2019030600, 'tool', 'usertours');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/usertours/tests/privacy_provider_test.php b/admin/tool/usertours/tests/privacy_provider_test.php
index 8cfc81a515c4e..db0139d4b2987 100644
--- a/admin/tool/usertours/tests/privacy_provider_test.php
+++ b/admin/tool/usertours/tests/privacy_provider_test.php
@@ -112,4 +112,37 @@ public function test_export_user_preferences_requested() {
 
         $this->assertCount(2, (array) $prefs);
     }
+
+    /**
+     * Ensure that export_user_preferences excludes deleted tours.
+     */
+    public function test_export_user_preferences_deleted_tour() {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $user = \core_user::get_user_by_username('admin');
+
+        $alltours = $DB->get_records('tool_usertours_tours');
+
+        $tour1 = tour::instance(array_shift($alltours)->id);
+        $tour1->mark_user_completed();
+
+        $tour2 = tour::instance(array_shift($alltours)->id);
+        $tour2->mark_user_completed();
+        $tour2->remove();
+
+        $writer = writer::with_context(\context_system::instance());
+
+        provider::export_user_preferences($user->id);
+        $this->assertTrue($writer->has_any_data());
+
+        // We should have one preference.
+        $prefs = $writer->get_user_preferences('tool_usertours');
+        $this->assertCount(1, (array) $prefs);
+
+        // The preference should be related to the first tour.
+        $this->assertContains($tour1->get_name(), reset($prefs)->description);
+    }
 }
diff --git a/admin/tool/xmldb/actions/load_xml_file/load_xml_file.class.php b/admin/tool/xmldb/actions/load_xml_file/load_xml_file.class.php
index a6384153941da..3a7b01d59bedd 100644
--- a/admin/tool/xmldb/actions/load_xml_file/load_xml_file.class.php
+++ b/admin/tool/xmldb/actions/load_xml_file/load_xml_file.class.php
@@ -38,9 +38,6 @@ function init() {
         $this->can_subaction = ACTION_NONE;
         //$this->can_subaction = ACTION_HAVE_SUBACTIONS;
 
-        // Set own custom attributes
-        $this->sesskey_protected = false; // This action doesn't need sesskey protection
-
         // Get needed strings
         $this->loadStrings(array(
             // 'key' => 'module',
diff --git a/admin/tool/xmldb/actions/main_view/main_view.class.php b/admin/tool/xmldb/actions/main_view/main_view.class.php
index 5ac58fc4577f6..feef78ae00fbc 100644
--- a/admin/tool/xmldb/actions/main_view/main_view.class.php
+++ b/admin/tool/xmldb/actions/main_view/main_view.class.php
@@ -169,7 +169,7 @@ function invoke() {
                     file_exists($key . '/install.xml') &&
                     is_readable($key . '/install.xml') &&
                     empty($dbdir->xml_loaded)) {
-                    $b .= '<a href="index.php?action=load_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $key)) . '&amp;time=' . time() . '&amp;postaction=main_view#lastused">[' . $this->str['load'] . ']</a>';
+                    $b .= '<a href="index.php?action=load_xml_file&amp;sesskey=' . sesskey() . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $key)) . '&amp;time=' . time() . '&amp;postaction=main_view#lastused">[' . $this->str['load'] . ']</a>';
                 } else {
                     $b .= '[' . $this->str['load'] . ']';
                 }
@@ -239,7 +239,7 @@ function invoke() {
                     is_readable($key . '/install.xml') &&
                     !empty($dbdir->xml_loaded) &&
                     empty($dbdir->xml_changed)) {
-                    $b .= '<a href="index.php?action=unload_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $key)) . '&amp;time=' . time() . '&amp;postaction=main_view#lastused">[' . $this->str['unload'] . ']</a>';
+                    $b .= '<a href="index.php?action=unload_xml_file&amp;sesskey=' . sesskey() . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $key)) . '&amp;time=' . time() . '&amp;postaction=main_view#lastused">[' . $this->str['unload'] . ']</a>';
                 } else {
                     $b .= '[' . $this->str['unload'] . ']';
                 }
diff --git a/admin/tool/xmldb/actions/unload_xml_file/unload_xml_file.class.php b/admin/tool/xmldb/actions/unload_xml_file/unload_xml_file.class.php
index 0468cb2ca5d4c..78b2cab6d6e75 100644
--- a/admin/tool/xmldb/actions/unload_xml_file/unload_xml_file.class.php
+++ b/admin/tool/xmldb/actions/unload_xml_file/unload_xml_file.class.php
@@ -35,9 +35,6 @@ class unload_xml_file extends XMLDBAction {
     function init() {
         parent::init();
 
-        // Set own custom attributes
-        $this->sesskey_protected = false; // This action doesn't need sesskey protection
-
         // Get needed strings
         $this->loadStrings(array(
             // 'key' => 'module',
diff --git a/admin/tool/xmldb/lang/en/tool_xmldb.php b/admin/tool/xmldb/lang/en/tool_xmldb.php
index 2abd94722a51b..c465ed16c11c4 100644
--- a/admin/tool/xmldb/lang/en/tool_xmldb.php
+++ b/admin/tool/xmldb/lang/en/tool_xmldb.php
@@ -34,7 +34,7 @@
 $string['confirmdeletekey'] = 'Are you absolutely sure that you want to delete the key:';
 $string['confirmdeletetable'] = 'Are you absolutely sure that you want to delete the table:';
 $string['confirmdeletexmlfile'] = 'Are you absolutely sure that you want to delete the file:';
-$string['confirmcheckbigints'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-11038">potential wrong integer fields</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the integers in your DB properly defined.
+$string['confirmcheckbigints'] = 'This functionality will search for <a href="https://tracker.moodle.org/browse/MDL-11038">potential wrong integer fields</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the integers in your DB properly defined.
 
 Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
 
@@ -60,7 +60,7 @@
 It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of missing indexes.
 
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckoraclesemantics'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-29322">Oracle varchar2 columns using BYTE semantics</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the columns converted to use CHAR semantics instead (better for cross-db compatibility and increased contents max. length).
+$string['confirmcheckoraclesemantics'] = 'This functionality will search for <a href="https://tracker.moodle.org/browse/MDL-29322">Oracle varchar2 columns using BYTE semantics</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the columns converted to use CHAR semantics instead (better for cross-db compatibility and increased contents max. length).
 
 Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
 
@@ -140,7 +140,7 @@
 $string['key'] = 'Key';
 $string['keynameempty'] = 'The key name cannot be empty';
 $string['keys'] = 'Keys';
-$string['listreservedwords'] = 'List of Reserved Words<br />(used to keep <a href="http://docs.moodle.org/en/XMLDB_reserved_words" target="_blank">XMLDB_reserved_words</a> updated)';
+$string['listreservedwords'] = 'List of reserved words<br />(used to keep <a href="https://docs.moodle.org/en/XMLDB_reserved_words" target="_blank">XMLDB reserved words</a> updated)';
 $string['load'] = 'Load';
 $string['main_view'] = 'Main view';
 $string['masterprimaryuniqueordernomatch'] = 'The fields in your foreign key must be listed in the same order as they are listed in the UNIQUE KEY on the referenced table.';
diff --git a/admin/user.php b/admin/user.php
index f6ab61f6bf3e7..216906ccf4d25 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -401,7 +401,7 @@
             $row = array ();
             $row[] = "<a href=\"../user/view.php?id=$user->id&amp;course=$site->id\">$fullname</a>";
             foreach ($extracolumns as $field) {
-                $row[] = $user->{$field};
+                $row[] = s($user->{$field});
             }
             $row[] = $user->city;
             $row[] = $user->country;
diff --git a/admin/user/user_bulk_cohortadd.php b/admin/user/user_bulk_cohortadd.php
index 6ce1d9757356c..f5e39475835cc 100644
--- a/admin/user/user_bulk_cohortadd.php
+++ b/admin/user/user_bulk_cohortadd.php
@@ -138,7 +138,7 @@ function sort_compare($a, $b) {
             '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $user->id . '&amp;course=' . SITEID . '">' .
             $user->fullname .
             '</a>',
-            $user->email,
+            s($user->email),
             $user->city,
             $user->country,
             $user->lastaccess ? format_time(time() - $user->lastaccess) : $strnever
diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php
index dd7956629b342..ae6cd8a5395a0 100644
--- a/admin/user/user_bulk_display.php
+++ b/admin/user/user_bulk_display.php
@@ -72,7 +72,7 @@ function sort_compare($a, $b) {
     $table->data[] = array (
         '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.SITEID.'">'.$user->fullname.'</a>',
 //        $user->username,
-        $user->email,
+        s($user->email),
         $user->city,
         $user->country,
         $user->lastaccess ? format_time(time() - $user->lastaccess) : $strnever
diff --git a/analytics/classes/analysis.php b/analytics/classes/analysis.php
index 25d926a16981a..ddb9c6fce5b03 100644
--- a/analytics/classes/analysis.php
+++ b/analytics/classes/analysis.php
@@ -138,6 +138,9 @@ public function run() {
                 }
             }
         }
+
+        // Force GC to clean up the indicator instances used during the last iteration.
+        $this->analyser->instantiate_indicators();
     }
 
     /**
@@ -313,7 +316,8 @@ protected function process_time_splitting(\core_analytics\local\time_splitting\b
         }
 
         try {
-            $indicators = $this->analyser->get_indicators();
+            // Instantiate empty indicators to ensure that no garbage is dragged from previous analyses.
+            $indicators = $this->analyser->instantiate_indicators();
             foreach ($indicators as $key => $indicator) {
                 // The analyser attaches the main entities the sample depends on and are provided to the
                 // indicator to calculate the sample.
@@ -473,6 +477,11 @@ protected function calculate_indicators(\core_analytics\local\time_splitting\bas
                 list($samplesfeatures, $newindicatorcalculations, $indicatornotnulls) = $rangeindicator->calculate($sampleids,
                     $this->analyser->get_samples_origin(), $range['start'], $range['end'], $prevcalculations);
 
+                // Free memory ASAP.
+                unset($rangeindicator);
+                gc_collect_cycles();
+                gc_mem_caches();
+
                 // Copy the features data to the dataset.
                 foreach ($samplesfeatures as $analysersampleid => $features) {
 
@@ -502,7 +511,7 @@ protected function calculate_indicators(\core_analytics\local\time_splitting\bas
                         $indcalc->endtime = $range['end'];
                         $indcalc->sampleid = $sampleid;
                         $indcalc->sampleorigin = $this->analyser->get_samples_origin();
-                        $indcalc->indicator = $rangeindicator->get_id();
+                        $indcalc->indicator = $indicator->get_id();
                         $indcalc->value = $calculatedvalue;
                         $indcalc->timecreated = $timecreated;
                         $newcalculations[] = $indcalc;
diff --git a/analytics/classes/insights_generator.php b/analytics/classes/insights_generator.php
index 24fdfaf1d8d75..6101a961278d1 100644
--- a/analytics/classes/insights_generator.php
+++ b/analytics/classes/insights_generator.php
@@ -135,7 +135,7 @@ private function notification(\context $context, \stdClass $user, \moodle_url $i
         $message->component = 'moodle';
         $message->name = 'insights';
 
-        $message->userfrom = \core_user::get_noreply_user();
+        $message->userfrom = \core_user::get_support_user();
         $message->userto = $user;
 
         $message->subject = $this->target->get_insight_subject($this->modelid, $context);
@@ -193,18 +193,23 @@ private function prediction_info(\core_analytics\prediction $prediction) {
         $insighturl = null;
         foreach ($predictionactions as $action) {
             $actionurl = $action->get_url();
+            $opentoblank = false;
             if (!$actionurl->get_param('forwardurl')) {
 
-                $actiondoneurl = new \moodle_url('/report/insights/done.php');
+                $params = ['actionvisiblename' => $action->get_text(), 'target' => '_blank'];
+                $actiondoneurl = new \moodle_url('/report/insights/done.php', $params);
                 // Set the forward url to the 'done' script.
                 $actionurl->param('forwardurl', $actiondoneurl->out(false));
+
+                $opentoblank = true;
             }
 
             if (empty($insighturl)) {
                 // We use the primary action url as insight url so we log that the user followed the provided link.
                 $insighturl = $action->get_url();
             }
-            $actiondata = (object)['url' => $action->get_url()->out(false), 'text' => $action->get_text()];
+            $actiondata = (object)['url' => $action->get_url()->out(false), 'text' => $action->get_text(),
+                'opentoblank' => $opentoblank];
             $fullmessageplaintext .= get_string('insightinfomessageaction', 'analytics', $actiondata) . PHP_EOL;
             $messageactions[] = $actiondata;
         }
diff --git a/analytics/classes/local/analyser/base.php b/analytics/classes/local/analyser/base.php
index 1c65e2c627352..0065f15ab85a7 100644
--- a/analytics/classes/local/analyser/base.php
+++ b/analytics/classes/local/analyser/base.php
@@ -237,6 +237,23 @@ public function get_indicators(): array {
         return $this->indicators;
     }
 
+    /**
+     * Instantiate the indicators.
+     *
+     * @return \core_analytics\local\indicator\base[]
+     */
+    public function instantiate_indicators() {
+        foreach ($this->indicators as $key => $indicator) {
+            $this->indicators[$key] = call_user_func(array($indicator, 'instance'));
+        }
+
+        // Free memory ASAP.
+        gc_collect_cycles();
+        gc_mem_caches();
+
+        return $this->indicators;
+    }
+
     /**
      * Samples data this analyser provides.
      *
diff --git a/analytics/classes/local/analyser/by_course.php b/analytics/classes/local/analyser/by_course.php
index 99e70c1e6a1c9..c0d308b0d70da 100644
--- a/analytics/classes/local/analyser/by_course.php
+++ b/analytics/classes/local/analyser/by_course.php
@@ -50,12 +50,11 @@ public function get_analysables_iterator(?string $action = null) {
         if (!empty($this->options['filter'])) {
             $courses = array();
             foreach ($this->options['filter'] as $courseid) {
-                $courses[$courseid] = new \stdClass();
-                $courses[$courseid]->id = $courseid;
+                $courses[$courseid] = intval($courseid);
             }
 
             list($coursesql, $courseparams) = $DB->get_in_or_equal($courses, SQL_PARAMS_NAMED);
-            $sql .= " AND c.id IN $coursesql";
+            $sql .= " AND c.id $coursesql";
             $params = $params + $courseparams;
         }
 
diff --git a/analytics/classes/local/analysis/result_file.php b/analytics/classes/local/analysis/result_file.php
index 7a6b61e47acb4..16ef9f198b236 100644
--- a/analytics/classes/local/analysis/result_file.php
+++ b/analytics/classes/local/analysis/result_file.php
@@ -78,9 +78,9 @@ public function retrieve_cached_result(\core_analytics\local\time_splitting\base
         // if this analyser was analysed less that 1 week ago we skip generating a new one. This
         // helps scale the evaluation process as sites with tons of courses may need a lot of time to
         // complete an evaluation.
-        if (!empty($options['evaluation']) && !empty($options['reuseprevanalysed'])) {
+        if (!empty($this->options['evaluation']) && !empty($this->options['reuseprevanalysed'])) {
 
-            $previousanalysis = \core_analytics\dataset_manager::get_evaluation_analysable_file($this->analyser->get_modelid(),
+            $previousanalysis = \core_analytics\dataset_manager::get_evaluation_analysable_file($this->modelid,
                 $analysable->get_id(), $timesplitting->get_id());
             // 1 week is a partly random time interval, no need to worry about DST.
             $boundary = time() - WEEKSECS;
diff --git a/analytics/classes/local/indicator/community_of_inquiry_activity.php b/analytics/classes/local/indicator/community_of_inquiry_activity.php
index 5deaeb6049e3c..555bb420e7c8b 100644
--- a/analytics/classes/local/indicator/community_of_inquiry_activity.php
+++ b/analytics/classes/local/indicator/community_of_inquiry_activity.php
@@ -836,7 +836,8 @@ protected function activity_completed_by(\cm_info $activity, $starttime, $endtim
         // When the course is using format weeks we use the week's end date.
         $format = course_get_format($activity->get_modinfo()->get_course());
         // We should change this in MDL-60702.
-        if (method_exists($format, 'get_section_dates')) {
+        if (get_class($format) == 'format_weeks' || is_subclass_of($format, 'format_weeks')
+             && method_exists($format, 'get_section_dates')) {
             $dates = $format->get_section_dates($section);
 
             // We need to consider the +2 hours added by get_section_dates.
diff --git a/analytics/classes/local/target/base.php b/analytics/classes/local/target/base.php
index 0ea5e8b8e29c5..900b6a9593a07 100644
--- a/analytics/classes/local/target/base.php
+++ b/analytics/classes/local/target/base.php
@@ -95,6 +95,15 @@ public static function uses_insights() {
         return true;
     }
 
+    /**
+     * Should the insights of this model be linked from reports?
+     *
+     * @return bool
+     */
+    public function link_insights_report(): bool {
+        return true;
+    }
+
     /**
      * Based on facts (processed by machine learning backends) by default.
      *
@@ -130,12 +139,14 @@ public function prediction_actions(\core_analytics\prediction $prediction, $incl
         global $PAGE;
 
         $predictionid = $prediction->get_prediction_data()->id;
+        $contextid = $prediction->get_prediction_data()->contextid;
+        $modelid = $prediction->get_prediction_data()->modelid;
 
-        $PAGE->requires->js_call_amd('report_insights/actions', 'init', array($predictionid));
+        $PAGE->requires->js_call_amd('report_insights/actions', 'init', array($predictionid, $contextid, $modelid));
 
         $actions = array();
 
-        if ($includedetailsaction) {
+        if ($this->link_insights_report() && $includedetailsaction) {
 
             $predictionurl = new \moodle_url('/report/insights/prediction.php', array('id' => $predictionid));
             $detailstext = $this->get_view_details_text();
@@ -227,7 +238,12 @@ public function generate_insight_notifications($modelid, $samplecontexts, array
      */
     public function get_insights_users(\context $context) {
         if ($context->contextlevel === CONTEXT_USER) {
-            $users = [$context->instanceid => \core_user::get_user($context->instanceid)];
+            if (!has_capability('moodle/analytics:listowninsights', $context, $context->instanceid)) {
+                $users = [];
+            } else {
+                $users = [$context->instanceid => \core_user::get_user($context->instanceid)];
+            }
+
         } else if ($context->contextlevel >= CONTEXT_COURSE) {
             // At course level or below only enrolled users although this is not ideal for
             // teachers assigned at category level.
diff --git a/analytics/classes/manager.php b/analytics/classes/manager.php
index 6c40795121867..178c36fa7e531 100644
--- a/analytics/classes/manager.php
+++ b/analytics/classes/manager.php
@@ -480,6 +480,9 @@ public static function get_indicator_calculations($analysable, $starttime, $endt
     /**
      * Returns the models with insights at the provided context.
      *
+     * Note that this method is used for display purposes. It filters out models whose insights
+     * are not linked from the reports page.
+     *
      * @param \context $context
      * @return \core_analytics\model[]
      */
@@ -490,13 +493,52 @@ public static function get_models_with_insights(\context $context) {
         $models = self::get_all_models(true, true, $context);
         foreach ($models as $key => $model) {
             // Check that it not only have predictions but also generates insights from them.
-            if (!$model->uses_insights()) {
+            if (!$model->uses_insights() || !$model->get_target()->link_insights_report()) {
                 unset($models[$key]);
             }
         }
         return $models;
     }
 
+    /**
+     * Returns the models that generated insights in the provided context. It can also be used to add new models to the context.
+     *
+     * Note that if you use this function with $newmodelid is the caller responsibility to ensure that the
+     * provided model id generated insights for the provided context.
+     *
+     * @throws \coding_exception
+     * @param  \context $context
+     * @param  int|null $newmodelid A new model to add to the list of models with insights in the provided context.
+     * @return int[]
+     */
+    public static function cached_models_with_insights(\context $context, int $newmodelid = null) {
+
+        $cache = \cache::make('core', 'contextwithinsights');
+        $modelids = $cache->get($context->id);
+        if ($modelids === false) {
+            // The cache is empty, but we don't know if it is empty because there are no insights
+            // in this context or because cache/s have been purged, we need to be conservative and
+            // "pay" 1 db read to fill up the cache.
+
+            $models = \core_analytics\manager::get_models_with_insights($context);
+
+            if ($newmodelid && empty($models[$newmodelid])) {
+                throw new \coding_exception('The provided modelid ' . $newmodelid . ' did not generate any insights');
+            }
+
+            $modelids = array_keys($models);
+            $cache->set($context->id, $modelids);
+
+        } else if ($newmodelid && !in_array($newmodelid, $modelids)) {
+            // We add the context we got as an argument to the cache.
+
+            array_push($modelids, $newmodelid);
+            $cache->set($context->id, $modelids);
+        }
+
+        return $modelids;
+    }
+
     /**
      * Returns a prediction
      *
@@ -549,30 +591,32 @@ public static function add_builtin_models() {
     public static function cleanup() {
         global $DB;
 
-        // Clean up stuff that depends on contexts that do not exist anymore.
-        $sql = "SELECT DISTINCT ap.contextid FROM {analytics_predictions} ap
-                  LEFT JOIN {context} ctx ON ap.contextid = ctx.id
-                 WHERE ctx.id IS NULL";
-        $apcontexts = $DB->get_records_sql($sql);
-
-        $sql = "SELECT DISTINCT aic.contextid FROM {analytics_indicator_calc} aic
-                  LEFT JOIN {context} ctx ON aic.contextid = ctx.id
-                 WHERE ctx.id IS NULL";
-        $indcalccontexts = $DB->get_records_sql($sql);
+        $DB->execute("DELETE FROM {analytics_prediction_actions} WHERE predictionid IN
+                          (SELECT ap.id FROM {analytics_predictions} ap
+                        LEFT JOIN {context} ctx ON ap.contextid = ctx.id
+                            WHERE ctx.id IS NULL)");
 
-        $contexts = $apcontexts + $indcalccontexts;
-        if ($contexts) {
-            list($sql, $params) = $DB->get_in_or_equal(array_keys($contexts));
-            $DB->execute("DELETE FROM {analytics_prediction_actions} WHERE predictionid IN
-                (SELECT ap.id FROM {analytics_predictions} ap WHERE ap.contextid $sql)", $params);
-
-            $DB->delete_records_select('analytics_predictions', "contextid $sql", $params);
-            $DB->delete_records_select('analytics_indicator_calc', "contextid $sql", $params);
-        }
+        $contextsql = "SELECT id FROM {context} ctx";
+        $DB->delete_records_select('analytics_predictions', "contextid NOT IN ($contextsql)");
+        $DB->delete_records_select('analytics_indicator_calc', "contextid NOT IN ($contextsql)");
 
         // Clean up stuff that depends on analysable ids that do not exist anymore.
+
         $models = self::get_all_models();
         foreach ($models as $model) {
+
+            // We first dump into memory the list of analysables we have in the database (we could probably do this with 1 single
+            // query for the 3 tables, but it may be safer to do it separately).
+            $predictsamplesanalysableids = $DB->get_fieldset_select('analytics_predict_samples', 'DISTINCT analysableid',
+                'modelid = :modelid', ['modelid' => $model->get_id()]);
+            $predictsamplesanalysableids = array_flip($predictsamplesanalysableids);
+            $trainsamplesanalysableids = $DB->get_fieldset_select('analytics_train_samples', 'DISTINCT analysableid',
+                'modelid = :modelid', ['modelid' => $model->get_id()]);
+            $trainsamplesanalysableids = array_flip($trainsamplesanalysableids);
+            $usedanalysablesanalysableids = $DB->get_fieldset_select('analytics_used_analysables', 'DISTINCT analysableid',
+                'modelid = :modelid', ['modelid' => $model->get_id()]);
+            $usedanalysablesanalysableids = array_flip($usedanalysablesanalysableids);
+
             $analyser = $model->get_analyser(array('notimesplitting' => true));
             $analysables = $analyser->get_analysables_iterator();
 
@@ -581,17 +625,28 @@ public static function cleanup() {
                 if (!$analysable) {
                     continue;
                 }
-                $analysableids[] = $analysable->get_id();
-            }
-            if (empty($analysableids)) {
-                continue;
+                unset($predictsamplesanalysableids[$analysable->get_id()]);
+                unset($trainsamplesanalysableids[$analysable->get_id()]);
+                unset($usedanalysablesanalysableids[$analysable->get_id()]);
             }
 
-            list($notinsql, $params) = $DB->get_in_or_equal($analysableids, SQL_PARAMS_NAMED, 'param', false);
-            $params['modelid'] = $model->get_id();
+            $param = ['modelid' => $model->get_id()];
 
-            $DB->delete_records_select('analytics_predict_samples', "modelid = :modelid AND analysableid $notinsql", $params);
-            $DB->delete_records_select('analytics_train_samples', "modelid = :modelid AND analysableid $notinsql", $params);
+            if ($predictsamplesanalysableids) {
+                list($idssql, $idsparams) = $DB->get_in_or_equal(array_flip($predictsamplesanalysableids), SQL_PARAMS_NAMED);
+                $DB->delete_records_select('analytics_predict_samples', "modelid = :modelid AND analysableid $idssql",
+                    $param + $idsparams);
+            }
+            if ($trainsamplesanalysableids) {
+                list($idssql, $idsparams) = $DB->get_in_or_equal(array_flip($trainsamplesanalysableids), SQL_PARAMS_NAMED);
+                $DB->delete_records_select('analytics_train_samples', "modelid = :modelid AND analysableid $idssql",
+                    $param + $idsparams);
+            }
+            if ($usedanalysablesanalysableids) {
+                list($idssql, $idsparams) = $DB->get_in_or_equal(array_flip($usedanalysablesanalysableids), SQL_PARAMS_NAMED);
+                $DB->delete_records_select('analytics_used_analysables', "modelid = :modelid AND analysableid $idssql",
+                    $param + $idsparams);
+            }
         }
     }
 
diff --git a/analytics/classes/model.php b/analytics/classes/model.php
index cfe614b74aa33..6907190dfd501 100644
--- a/analytics/classes/model.php
+++ b/analytics/classes/model.php
@@ -933,19 +933,11 @@ protected function trigger_insights($samplecontexts, $predictionrecords) {
 
         $this->get_target()->generate_insight_notifications($this->model->id, $samplecontexts, $predictions);
 
-        // Update cache.
-        $cache = \cache::make('core', 'contextwithinsights');
-        foreach ($samplecontexts as $context) {
-            $modelids = $cache->get($context->id);
-            if (!$modelids) {
-                // The cache is empty, but we don't know if it is empty because there are no insights
-                // in this context or because cache/s have been purged, we need to be conservative and
-                // "pay" 1 db read to fill up the cache.
-                $models = \core_analytics\manager::get_models_with_insights($context);
-                $cache->set($context->id, array_keys($models));
-            } else if (!in_array($this->get_id(), $modelids)) {
-                array_push($modelids, $this->get_id());
-                $cache->set($context->id, $modelids);
+        if ($this->get_target()->link_insights_report()) {
+
+            // Update cache.
+            foreach ($samplecontexts as $context) {
+                \core_analytics\manager::cached_models_with_insights($context, $this->get_id());
             }
         }
     }
@@ -1000,7 +992,7 @@ protected function get_static_predictions(&$indicatorcalculations) {
         }
 
         // Get all samples data.
-        list($sampleids, $samplesdata) = $this->get_analyser()->get_samples($sampleids);
+        list($sampleids, $samplesdata) = $this->get_samples($sampleids);
 
         // Calculate the targets.
         $predictions = array();
@@ -1314,7 +1306,7 @@ public function get_predictions(\context $context, $skiphidden = true, $page = f
             return $prediction->sampleid;
         }, $predictions);
 
-        list($unused, $samplesdata) = $this->get_analyser()->get_samples($sampleids);
+        list($unused, $samplesdata) = $this->get_samples($sampleids);
 
         $current = 0;
 
@@ -1356,7 +1348,7 @@ public function get_predictions(\context $context, $skiphidden = true, $page = f
      */
     public function prediction_sample_data($predictionobj) {
 
-        list($unused, $samplesdata) = $this->get_analyser()->get_samples(array($predictionobj->sampleid));
+        list($unused, $samplesdata) = $this->get_samples(array($predictionobj->sampleid));
 
         if (empty($samplesdata[$predictionobj->sampleid])) {
             throw new \moodle_exception('errorsamplenotavailable', 'analytics');
@@ -1668,12 +1660,8 @@ public function clear() {
             $predictor->clear_model($this->get_unique_id(), $this->get_output_dir());
         }
 
-        $predictionids = $DB->get_fieldset_select('analytics_predictions', 'id', 'modelid = :modelid',
-            array('modelid' => $this->get_id()));
-        if ($predictionids) {
-            list($sql, $params) = $DB->get_in_or_equal($predictionids);
-            $DB->delete_records_select('analytics_prediction_actions', "predictionid $sql", $params);
-        }
+        $DB->delete_records_select('analytics_prediction_actions', "predictionid IN
+            (SELECT id FROM {analytics_predictions} WHERE modelid = :modelid)", ['modelid' => $this->get_id()]);
 
         $DB->delete_records('analytics_predictions', array('modelid' => $this->model->id));
         $DB->delete_records('analytics_predict_samples', array('modelid' => $this->model->id));
@@ -1759,30 +1747,94 @@ private function add_prediction_ids($predictionrecords) {
         $contextids = array_map(function($predictionobj) {
             return $predictionobj->contextid;
         }, $predictionrecords);
-        list($contextsql, $contextparams) = $DB->get_in_or_equal($contextids, SQL_PARAMS_NAMED);
-
-        // We select the fields that will allow us to map ids to $predictionrecords. Given that we already filter by modelid
-        // we have enough with sampleid and rangeindex. The reason is that the sampleid relation to a site is N - 1.
-        $fields = 'id, sampleid, rangeindex';
-
-        // We include the contextid and the timecreated filter to reduce the number of records in $dbpredictions. We can not
-        // add as many OR conditions as records in $predictionrecords.
-        $sql = "SELECT $fields
-                  FROM {analytics_predictions}
-                 WHERE modelid = :modelid
-                       AND contextid $contextsql
-                       AND timecreated >= :firsttimecreated";
-        $params = $contextparams + ['modelid' => $this->model->id, 'firsttimecreated' => $firstprediction->timecreated];
-        $dbpredictions = $DB->get_recordset_sql($sql, $params);
-        foreach ($dbpredictions as $id => $dbprediction) {
-            // The append_rangeindex implementation is the same regardless of the time splitting method in use.
-            $uniqueid = $this->get_time_splitting()->append_rangeindex($dbprediction->sampleid, $dbprediction->rangeindex);
-            $predictionrecords[$uniqueid]->id = $dbprediction->id;
+
+        // Limited to 30000 records as a middle point between the ~65000 params limit in pgsql and the size limit for mysql which
+        // can be increased if required up to a reasonable point.
+        $chunks = array_chunk($contextids, 30000);
+        foreach ($chunks as $contextidschunk) {
+            list($contextsql, $contextparams) = $DB->get_in_or_equal($contextidschunk, SQL_PARAMS_NAMED);
+
+            // We select the fields that will allow us to map ids to $predictionrecords. Given that we already filter by modelid
+            // we have enough with sampleid and rangeindex. The reason is that the sampleid relation to a site is N - 1.
+            $fields = 'id, sampleid, rangeindex';
+
+            // We include the contextid and the timecreated filter to reduce the number of records in $dbpredictions. We can not
+            // add as many OR conditions as records in $predictionrecords.
+            $sql = "SELECT $fields
+                      FROM {analytics_predictions}
+                     WHERE modelid = :modelid
+                           AND contextid $contextsql
+                           AND timecreated >= :firsttimecreated";
+            $params = $contextparams + ['modelid' => $this->model->id, 'firsttimecreated' => $firstprediction->timecreated];
+            $dbpredictions = $DB->get_recordset_sql($sql, $params);
+            foreach ($dbpredictions as $id => $dbprediction) {
+                // The append_rangeindex implementation is the same regardless of the time splitting method in use.
+                $uniqueid = $this->get_time_splitting()->append_rangeindex($dbprediction->sampleid, $dbprediction->rangeindex);
+                $predictionrecords[$uniqueid]->id = $dbprediction->id;
+            }
         }
 
         return $predictionrecords;
     }
 
+    /**
+     * Wrapper around analyser's get_samples to skip DB's max-number-of-params exception.
+     *
+     * @param  array  $sampleids
+     * @return array
+     */
+    public function get_samples(array $sampleids): array {
+
+        if (empty($sampleids)) {
+            throw new \coding_exception('No sample ids provided');
+        }
+
+        $chunksize = count($sampleids);
+
+        // We start with just 1 chunk, if it is too large for the db we split the list of sampleids in 2 and we
+        // try again. We repeat this process until the chunk is small enough for the db engine to process. The
+        // >= has been added in case there are other \dml_read_exceptions unrelated to the max number of params.
+        while (empty($done) && $chunksize >= 1) {
+
+            $chunks = array_chunk($sampleids, $chunksize);
+            $allsampleids = [];
+            $allsamplesdata = [];
+
+            foreach ($chunks as $index => $chunk) {
+
+                try {
+                    list($chunksampleids, $chunksamplesdata) = $this->get_analyser()->get_samples($chunk);
+                } catch (\dml_read_exception $e) {
+
+                    // Reduce the chunksize, we use floor() so the $chunksize is always less than the previous $chunksize value.
+                    $chunksize = floor($chunksize / 2);
+                    break;
+                }
+
+                // We can sum as these two arrays are indexed by sampleid and there are no collisions.
+                $allsampleids = $allsampleids + $chunksampleids;
+                $allsamplesdata = $allsamplesdata + $chunksamplesdata;
+
+                if ($index === count($chunks) - 1) {
+                    // We successfully processed all the samples in all chunks, we are done.
+                    $done = true;
+                }
+            }
+        }
+
+        if (empty($done)) {
+            if (!empty($e)) {
+                // Throw the last exception we caught, the \dml_read_exception we have been catching is unrelated to the max number
+                // of param's exception.
+                throw new \dml_read_exception($e);
+            } else {
+                throw new \coding_exception('We should never reach this point, there is a bug in ' .
+                    'core_analytics\\model::get_samples\'s code');
+            }
+        }
+        return [$allsampleids, $allsamplesdata];
+    }
+
     /**
      * Purges the insights cache.
      */
diff --git a/analytics/classes/privacy/provider.php b/analytics/classes/privacy/provider.php
index 36f6069a82a3c..c147bdfd974a5 100644
--- a/analytics/classes/privacy/provider.php
+++ b/analytics/classes/privacy/provider.php
@@ -306,13 +306,9 @@ public static function delete_data_for_all_users_in_context(\context $context) {
             $idssql = "SELECT ap.id FROM {analytics_predictions} ap
                         WHERE ap.contextid = :contextid AND ap.modelid = :modelid";
             $idsparams = ['contextid' => $context->id, 'modelid' => $modelid];
-            $predictionids = $DB->get_fieldset_sql($idssql, $idsparams);
-            if ($predictionids) {
-                list($predictionidssql, $params) = $DB->get_in_or_equal($predictionids, SQL_PARAMS_NAMED);
 
-                $DB->delete_records_select('analytics_prediction_actions', "predictionid IN ($idssql)", $idsparams);
-                $DB->delete_records_select('analytics_predictions', "id $predictionidssql", $params);
-            }
+            $DB->delete_records_select('analytics_prediction_actions', "predictionid IN ($idssql)", $idsparams);
+            $DB->delete_records_select('analytics_predictions', "contextid = :contextid AND modelid = :modelid", $idsparams);
         }
 
         // We delete them all this table is just a cache and we don't know which model filled it.
diff --git a/analytics/templates/insight_info_message_prediction.mustache b/analytics/templates/insight_info_message_prediction.mustache
index 9896031bf6d76..7bd76de7c0d85 100644
--- a/analytics/templates/insight_info_message_prediction.mustache
+++ b/analytics/templates/insight_info_message_prediction.mustache
@@ -33,7 +33,8 @@
                 "text": "Moodle"
             }, {
                 "url": "https://en.wikipedia.org/wiki/Noodle",
-                "text": "Noodle"
+                "text": "Noodle",
+                "opentoblank": 1
             }
         ]
     }
@@ -65,5 +66,5 @@ body:not(.dir-ltr):not(.dir-rtl) .btn-insight {
 
 <br/>
 {{#actions}}
-    <a class="btn btn-default m-r-1 m-b-1 btn-insight" href="{{url}}">{{text}}</a>
+    <a class="btn btn-default m-r-1 m-b-1 btn-insight" {{#opentoblank}}target="_blank" {{/opentoblank}}href="{{url}}">{{text}}</a>
 {{/actions}}
diff --git a/analytics/tests/analysis_test.php b/analytics/tests/analysis_test.php
index 0f5f3e6ff3f44..3ceb40e0c243c 100644
--- a/analytics/tests/analysis_test.php
+++ b/analytics/tests/analysis_test.php
@@ -65,7 +65,7 @@ public function test_fill_firstanalyses_cache() {
         $this->assertEquals($afewsecsago, $firstanalyses[$modelid . '_' . $course1->id]);
         $this->assertEquals($afewsecsago + 1, $firstanalyses[$modelid . '_' . $course2->id]);
 
-        // The cached elements gets refreshed.
+        // The cached elements get refreshed.
         $this->insert_used($modelid, $course1->id, 'prediction', $earliest);
         $firstanalyses = \core_analytics\analysis::fill_firstanalyses_cache($modelid, $course1->id);
         $this->assertCount(1, $firstanalyses);
@@ -78,7 +78,7 @@ public function test_fill_firstanalyses_cache() {
 
         // The generated ranges should start from the cached firstanalysis value, which is $earliest.
         $ranges = $seconds->get_all_ranges();
-        $this->assertCount(7, $ranges);
+        $this->assertGreaterThanOrEqual(7, count($ranges));
         $firstrange = reset($ranges);
         $this->assertEquals($earliest, $firstrange['time']);
     }
diff --git a/analytics/tests/fixtures/test_analysis.php b/analytics/tests/fixtures/test_analysis.php
index 6af04d1f2ea77..b4e85d2b032b0 100644
--- a/analytics/tests/fixtures/test_analysis.php
+++ b/analytics/tests/fixtures/test_analysis.php
@@ -41,7 +41,7 @@ class test_analysis extends \core_analytics\analysis {
      */
     public function process_analysable(\core_analytics\analysable $analysable): array {
         // Half a second.
-        usleep(500000);
+        sleep(1);
         return parent::process_analysable($analysable);
     }
 }
diff --git a/analytics/tests/fixtures/test_target_course_users.php b/analytics/tests/fixtures/test_target_course_users.php
index 8907a3c5b7f56..7be0a87f6d918 100644
--- a/analytics/tests/fixtures/test_target_course_users.php
+++ b/analytics/tests/fixtures/test_target_course_users.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-require_once(__DIR__ . '/test_target_shortname.php');
+require_once(__DIR__ . '/test_target_site_users.php');
 
 /**
  * Test target.
diff --git a/analytics/tests/manager_test.php b/analytics/tests/manager_test.php
index 167d41dde0cbd..74e67216b636b 100644
--- a/analytics/tests/manager_test.php
+++ b/analytics/tests/manager_test.php
@@ -134,8 +134,9 @@ public function test_deleted_analysable() {
         $model->train();
         $model->predict();
 
-        $npredictsamples = $DB->count_records('analytics_predict_samples');
-        $ntrainsamples = $DB->count_records('analytics_train_samples');
+        $this->assertNotEmpty($DB->count_records('analytics_predict_samples'));
+        $this->assertNotEmpty($DB->count_records('analytics_train_samples'));
+        $this->assertNotEmpty($DB->count_records('analytics_used_analysables'));
 
         // Now we delete an analysable, stored predict and training samples should be deleted.
         $deletedcontext = \context_course::instance($coursepredict1->id);
@@ -145,6 +146,7 @@ public function test_deleted_analysable() {
 
         $this->assertEmpty($DB->count_records('analytics_predict_samples', array('analysableid' => $coursepredict1->id)));
         $this->assertEmpty($DB->count_records('analytics_train_samples', array('analysableid' => $coursepredict1->id)));
+        $this->assertEmpty($DB->count_records('analytics_used_analysables', array('analysableid' => $coursepredict1->id)));
 
         set_config('enabled_stores', '', 'tool_log');
         get_log_manager(true);
diff --git a/analytics/tests/model_test.php b/analytics/tests/model_test.php
index 18a4faca676fd..7d24b991e6e24 100644
--- a/analytics/tests/model_test.php
+++ b/analytics/tests/model_test.php
@@ -292,7 +292,7 @@ public function test_model_timelimit() {
 
         $this->resetAfterTest(true);
 
-        set_config('modeltimelimit', 1, 'analytics');
+        set_config('modeltimelimit', 2, 'analytics');
 
         $courses = array();
         for ($i = 0; $i < 5; $i++) {
@@ -494,6 +494,61 @@ public function test_get_name_and_rename() {
         $this->assertEquals($data->name['value'], '');
     }
 
+    /**
+     * Tests model::get_samples()
+     *
+     * @return null
+     */
+    public function test_get_samples() {
+        $this->resetAfterTest();
+
+        if (!PHPUNIT_LONGTEST) {
+            $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
+        }
+
+        // 10000 should be enough to make oracle and mssql fail, if we want pgsql to fail we need around 70000
+        // users, that is a few minutes just to create the users.
+        $nusers = 10000;
+
+        $userids = [];
+        for ($i = 0; $i < $nusers; $i++) {
+            $user = $this->getDataGenerator()->create_user();
+            $userids[] = $user->id;
+        }
+
+        $upcomingactivities = null;
+        foreach (\core_analytics\manager::get_all_models() as $model) {
+            if (get_class($model->get_target()) === 'core_user\\analytics\\target\\upcoming_activities_due') {
+                $upcomingactivities = $model;
+            }
+        }
+
+        list($sampleids, $samplesdata) = $upcomingactivities->get_samples($userids);
+        $this->assertCount($nusers, $sampleids);
+        $this->assertCount($nusers, $samplesdata);
+
+        $subset = array_slice($userids, 0, 100);
+        list($sampleids, $samplesdata) = $upcomingactivities->get_samples($subset);
+        $this->assertCount(100, $sampleids);
+        $this->assertCount(100, $samplesdata);
+
+        $subset = array_slice($userids, 0, 2);
+        list($sampleids, $samplesdata) = $upcomingactivities->get_samples($subset);
+        $this->assertCount(2, $sampleids);
+        $this->assertCount(2, $samplesdata);
+
+        $subset = array_slice($userids, 0, 1);
+        list($sampleids, $samplesdata) = $upcomingactivities->get_samples($subset);
+        $this->assertCount(1, $sampleids);
+        $this->assertCount(1, $samplesdata);
+
+        // Unexisting, so nothing returned, but still 2 arrays.
+        list($sampleids, $samplesdata) = $upcomingactivities->get_samples([1231231231231231]);
+        $this->assertEmpty($sampleids);
+        $this->assertEmpty($samplesdata);
+
+    }
+
     /**
      * Generates a model log record.
      */
diff --git a/analytics/tests/prediction_test.php b/analytics/tests/prediction_test.php
index 1382c9789c9e9..7fbbdc631304f 100644
--- a/analytics/tests/prediction_test.php
+++ b/analytics/tests/prediction_test.php
@@ -436,6 +436,7 @@ public function provider_ml_classifiers_return() {
     /**
      * Basic test to check that prediction processors work as expected.
      *
+     * @coversNothing
      * @dataProvider provider_ml_test_evaluation_configuration
      * @param string $modelquality
      * @param int $ncourses
@@ -477,6 +478,13 @@ public function test_ml_evaluation_configuration($modelquality, $ncourses, $expe
             $message = 'The returned status code ' . $result->status . ' should include ' . $expected[$timesplitting];
             $filtered = $result->status & $expected[$timesplitting];
             $this->assertEquals($expected[$timesplitting], $filtered, $message);
+
+            $options = ['evaluation' => true, 'reuseprevanalysed' => true];
+            $result = new \core_analytics\local\analysis\result_file($model->get_id(), true, $options);
+            $timesplittingobj = \core_analytics\manager::get_time_splitting($timesplitting);
+            $analysable = new \core_analytics\site();
+            $cachedanalysis = $result->retrieve_cached_result($timesplittingobj, $analysable);
+            $this->assertInstanceOf(\stored_file::class, $cachedanalysis);
         }
 
         set_config('enabled_stores', '', 'tool_log');
@@ -486,6 +494,7 @@ public function test_ml_evaluation_configuration($modelquality, $ncourses, $expe
     /**
      * Tests the evaluation of already trained models.
      *
+     * @coversNothing
      * @dataProvider provider_ml_processors
      * @param  string $predictionsprocessorclass
      * @return null
diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index 56e5a7de9fd70..c29c9205e8127 100644
--- a/auth/cas/auth.php
+++ b/auth/cas/auth.php
@@ -365,13 +365,17 @@ public function loginpage_idp_list($wantsurl) {
             return [];
         }
 
-        $iconurl = moodle_url::make_pluginfile_url(
-            context_system::instance()->id,
-            'auth_cas',
-            'logo',
-            null,
-            '/',
-            $this->config->auth_logo);
+        if ($this->config->auth_logo) {
+            $iconurl = moodle_url::make_pluginfile_url(
+                context_system::instance()->id,
+                'auth_cas',
+                'logo',
+                null,
+                null,
+                $this->config->auth_logo);
+        } else {
+            $iconurl = null;
+        }
 
         return [
             [
diff --git a/auth/cas/db/upgrade.php b/auth/cas/db/upgrade.php
index 4df297c456f49..3d05e54e1e9df 100644
--- a/auth/cas/db/upgrade.php
+++ b/auth/cas/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/classes/output/login.php b/auth/classes/output/login.php
index 7034e978f5178..c98048b932747 100644
--- a/auth/classes/output/login.php
+++ b/auth/classes/output/login.php
@@ -72,6 +72,8 @@ class login implements renderable, templatable {
     public $username;
     /** @var string The csrf token to limit login to requests that come from the login form. */
     public $logintoken;
+    /** @var string Maintenance message, if Maintenance is enabled. */
+    public $maintenance;
 
     /**
      * Constructor.
@@ -109,6 +111,10 @@ public function __construct(array $authsequence, $username = '') {
             $this->instructions = get_string('loginsteps', 'core', 'signup.php');
         }
 
+        if ($CFG->maintenance_enabled == true && !empty($CFG->maintenance_message)) {
+            $this->maintenance = $CFG->maintenance_message;
+        }
+
         // Identity providers.
         $this->identityproviders = \auth_plugin_base::get_identity_providers($authsequence);
         $this->logintoken = \core\session\manager::get_login_token();
@@ -145,6 +151,7 @@ public function export_for_template(renderer_base $output) {
         $data->signupurl = $this->signupurl->out(false);
         $data->username = $this->username;
         $data->logintoken = $this->logintoken;
+        $data->maintenance = format_text($this->maintenance, FORMAT_MOODLE);
 
         return $data;
     }
diff --git a/auth/db/db/upgrade.php b/auth/db/db/upgrade.php
index f860220094323..ec2c80e2018b6 100644
--- a/auth/db/db/upgrade.php
+++ b/auth/db/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_auth_db_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/email/db/upgrade.php b/auth/email/db/upgrade.php
index f636d6ff99fa2..d1b60496c3c4f 100644
--- a/auth/email/db/upgrade.php
+++ b/auth/email/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_auth_email_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/email/lang/en/auth_email.php b/auth/email/lang/en/auth_email.php
index 596b4f7c82224..5920676109aee 100644
--- a/auth/email/lang/en/auth_email.php
+++ b/auth/email/lang/en/auth_email.php
@@ -24,7 +24,7 @@
 
 $string['auth_emaildescription'] = '<p>Email-based self-registration enables a user to create their own account via a \'Create new account\' button on the login page. The user then receives an email containing a secure link to a page where they can confirm their account. Future logins just check the username and password against the stored values in the Moodle database.</p><p>Note: In addition to enabling the plugin, email-based self-registration must also be selected from the self registration drop-down menu on the \'Manage authentication\' page.</p>';
 $string['auth_emailnoemail'] = 'Tried to send you an email but failed!';
-$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the sign-up page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See http://www.google.com/recaptcha for more details.';
+$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the sign-up page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See https://www.google.com/recaptcha for more details.';
 $string['auth_emailrecaptcha_key'] = 'Enable reCAPTCHA element';
 $string['auth_emailsettings'] = 'Settings';
 $string['pluginname'] = 'Email-based self-registration';
diff --git a/auth/ldap/db/upgrade.php b/auth/ldap/db/upgrade.php
index 6c5725574d824..cf73d4c2675a1 100644
--- a/auth/ldap/db/upgrade.php
+++ b/auth/ldap/db/upgrade.php
@@ -69,5 +69,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/ldap/lang/en/auth_ldap.php b/auth/ldap/lang/en/auth_ldap.php
index 6c84752555ce9..7a063ab171f97 100644
--- a/auth/ldap/lang/en/auth_ldap.php
+++ b/auth/ldap/lang/en/auth_ldap.php
@@ -94,7 +94,7 @@
 $string['auth_ldap_version'] = 'The version of the LDAP protocol your server is using.';
 $string['auth_ldap_version_key'] = 'Version';
 $string['auth_ntlmsso'] = 'NTLM SSO';
-$string['auth_ntlmsso_enabled'] = 'Set to yes to attempt Single Sign On with the NTLM domain. <strong>Note:</strong> this requires additional setup on the webserver to work, see <a href="http://docs.moodle.org/en/NTLM_authentication">http://docs.moodle.org/en/NTLM_authentication</a>';
+$string['auth_ntlmsso_enabled'] = 'Set to yes to attempt Single Sign On with the NTLM domain. Note that this requires additional setup on the server to work. For further details, see the documentation <a href="https://docs.moodle.org/en/NTLM_authentication">NTLM authentication</a>.';
 $string['auth_ntlmsso_enabled_key'] = 'Enable';
 $string['auth_ntlmsso_ie_fastpath'] = 'Set to enable the NTLM SSO fast path (bypasses certain steps if the client\'s browser is MS Internet Explorer).';
 $string['auth_ntlmsso_ie_fastpath_key'] = 'MS IE fast path?';
diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php
index 9209e9dcffdab..9f18bc79d3b07 100644
--- a/auth/manual/db/upgrade.php
+++ b/auth/manual/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php
index be29bcd6c88dc..e8eb8499fdf02 100644
--- a/auth/mnet/db/upgrade.php
+++ b/auth/mnet/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/none/db/upgrade.php b/auth/none/db/upgrade.php
index 2d5fc97003034..a051a323b464c 100644
--- a/auth/none/db/upgrade.php
+++ b/auth/none/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_auth_none_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/oauth2/classes/api.php b/auth/oauth2/classes/api.php
index 1b152b58bb74c..e5b0789b5769a 100644
--- a/auth/oauth2/classes/api.php
+++ b/auth/oauth2/classes/api.php
@@ -402,7 +402,6 @@ public static function user_deleted(\core\event\user_deleted $event) {
      * @return bool
      */
     public static function is_enabled() {
-        $plugininfo = \core_plugin_manager::instance()->get_plugin_info('auth_oauth2');
-        return $plugininfo->is_enabled();
+        return is_enabled_auth('oauth2');
     }
 }
diff --git a/auth/oauth2/classes/auth.php b/auth/oauth2/classes/auth.php
index 448c00ea6c7e1..1d1ff6fc14c1f 100644
--- a/auth/oauth2/classes/auth.php
+++ b/auth/oauth2/classes/auth.php
@@ -36,6 +36,7 @@
 
 require_once($CFG->libdir.'/authlib.php');
 require_once($CFG->dirroot.'/user/lib.php');
+require_once($CFG->dirroot.'/user/profile/lib.php');
 
 /**
  * Plugin for oauth2 authentication.
diff --git a/auth/oauth2/db/upgrade.php b/auth/oauth2/db/upgrade.php
index 7582cc9ce9d83..e68c4cded7453 100644
--- a/auth/oauth2/db/upgrade.php
+++ b/auth/oauth2/db/upgrade.php
@@ -47,5 +47,42 @@ function xmldb_auth_oauth2_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    if ($oldversion < 2019052001) {
+        // Fetch Facebook, Google, and Microsoft issuers. We use the URL field to determine the issuer type as it's the only
+        // field that contains the keyword that can somewhat let us reliably determine the issuer type.
+        $likefacebook = $DB->sql_like('oe.url', ':facebook');
+        $likegoogle = $DB->sql_like('oe.url', ':google');
+        $likemicrosoft = $DB->sql_like('oe.url', ':microsoft');
+
+        $params = [
+            'facebook' => '%facebook%',
+            'google' => '%google%',
+            'microsoft' => '%microsoft%',
+        ];
+
+        // We're querying from the oauth2_endpoint table because the base URLs of FB and Microsoft can be empty in the issuer table.
+        $subsql = "
+            SELECT DISTINCT oe.issuerid
+                       FROM {oauth2_endpoint} oe
+                      WHERE $likefacebook
+                            OR $likegoogle
+                            OR $likemicrosoft";
+
+        // Update non-Facebook/Google/Microsoft issuers and set requireconfirmation to 1.
+        $updatesql = "
+            UPDATE {oauth2_issuer}
+               SET requireconfirmation = 1
+             WHERE id NOT IN ({$subsql})";
+        $DB->execute($updatesql, $params);
+
+        // Delete linked logins for non-Facebook/Google/Microsoft issuers. They can easily re-link their logins anyway.
+        $DB->delete_records_select('auth_oauth2_linked_login', "issuerid NOT IN ($subsql)", $params);
+
+        upgrade_plugin_savepoint(true, 2019052001, 'auth', 'oauth2');
+    }
+
     return true;
 }
diff --git a/auth/oauth2/lang/en/auth_oauth2.php b/auth/oauth2/lang/en/auth_oauth2.php
index b6fe4b6431a8a..c3a4246bc9bb3 100644
--- a/auth/oauth2/lang/en/auth_oauth2.php
+++ b/auth/oauth2/lang/en/auth_oauth2.php
@@ -40,7 +40,10 @@
 line at the top of your web browser window.
 
 If you need help, please contact the site administrator,
-{$a->admin}';
+{$a->admin}
+
+If you did not do this, someone else could be trying to compromise your account.
+Please contact the site administrator immediately.';
 $string['confirmaccountemailsubject'] = '{$a}: account confirmation';
 $string['confirmationinvalid'] = 'The confirmation link is either invalid, or has expired. Please start the login process again to generate a new confirmation email.';
 $string['confirmationpending'] = 'This account is pending email confirmation.';
@@ -60,7 +63,10 @@
 line at the top of your web browser window.
 
 If you need help, please contact the site administrator,
-{$a->admin}';
+{$a->admin}
+
+If you did not do this, someone else could be trying to compromise your account.
+Please contact the site administrator immediately.';
 $string['confirmlinkedloginemailsubject'] = '{$a}: linked login confirmation';
 $string['createaccountswarning'] = 'This authentication plugin allows users to create accounts on your site. You may want to enable the setting "authpreventaccountcreation" if you use this plugin.';
 $string['createnewlinkedlogin'] = 'Link a new account ({$a})';
diff --git a/auth/oauth2/tests/api_test.php b/auth/oauth2/tests/api_test.php
index 83bf1a6c71adc..d2fc8e1fac0db 100644
--- a/auth/oauth2/tests/api_test.php
+++ b/auth/oauth2/tests/api_test.php
@@ -140,4 +140,23 @@ public function test_linked_logins() {
         $this->assertEquals($newuser->id, $match->get('userid'));
     }
 
+    /**
+     * Test that is_enabled correctly identifies when the plugin is enabled.
+     */
+    public function test_is_enabled() {
+        $this->resetAfterTest();
+
+        set_config('auth', 'manual,oauth2');
+        $this->assertTrue(\auth_oauth2\api::is_enabled());
+    }
+
+    /**
+     * Test that is_enabled correctly identifies when the plugin is disabled.
+     */
+    public function test_is_enabled_disabled() {
+        $this->resetAfterTest();
+
+        set_config('auth', 'manual');
+        $this->assertFalse(\auth_oauth2\api::is_enabled());
+    }
 }
diff --git a/auth/oauth2/version.php b/auth/oauth2/version.php
index 7b6b11be872c7..5aea7174c11e4 100644
--- a/auth/oauth2/version.php
+++ b/auth/oauth2/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019052000;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2019052001;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2019051100;        // Requires this Moodle version.
 $plugin->component = 'auth_oauth2';       // Full name of the plugin (used for diagnostics).
diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
index c52ad129135b9..8bedda9d34cc8 100644
--- a/auth/shibboleth/auth.php
+++ b/auth/shibboleth/auth.php
@@ -263,7 +263,8 @@ public function test_settings() {
         global $OUTPUT;
 
         if (!isset($this->config->user_attribute) || empty($this->config->user_attribute)) {
-            echo $OUTPUT->notification(get_string("shib_not_set_up_error", "auth_shibboleth"), 'notifyproblem');
+            echo $OUTPUT->notification(get_string("shib_not_set_up_error", "auth_shibboleth",
+                (new moodle_url('/auth/shibboleth/README.txt'))->out()), 'notifyproblem');
             return;
         }
         if ($this->config->convert_data and $this->config->convert_data != '' and !is_readable($this->config->convert_data)) {
@@ -294,12 +295,19 @@ public function loginpage_idp_list($wantsurl) {
         }
 
         $url = new moodle_url('/auth/shibboleth/index.php');
-        $iconurl = moodle_url::make_pluginfile_url(context_system::instance()->id,
-                                                   'auth_shibboleth',
-                                                   'logo',
-                                                   null,
-                                                   '/',
-                                                   $config->auth_logo);
+
+        if ($config->auth_logo) {
+            $iconurl = moodle_url::make_pluginfile_url(
+                context_system::instance()->id,
+                'auth_shibboleth',
+                'logo',
+                null,
+                null,
+                $config->auth_logo);
+        } else {
+            $iconurl = null;
+        }
+
         $result[] = ['url' => $url, 'iconurl' => $iconurl, 'name' => $config->login_name];
         return $result;
     }
diff --git a/auth/shibboleth/db/upgrade.php b/auth/shibboleth/db/upgrade.php
index 640a02350ce06..d47ddad5f322a 100644
--- a/auth/shibboleth/db/upgrade.php
+++ b/auth/shibboleth/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_auth_shibboleth_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php
index b177f7c9b6233..0e0752c12cca9 100644
--- a/auth/shibboleth/index.php
+++ b/auth/shibboleth/index.php
@@ -32,8 +32,9 @@
     $shibbolethauth = get_auth_plugin('shibboleth');
 
     // Check whether Shibboleth is configured properly
+    $readmeurl = (new moodle_url('/auth/shibboleth/README.txt'))->out();
     if (empty($pluginconfig->user_attribute)) {
-        print_error('shib_not_set_up_error', 'auth_shibboleth');
+        print_error('shib_not_set_up_error', 'auth_shibboleth', '', $readmeurl);
      }
 
 /// If we can find the Shibboleth attribute, save it in session and return to main login page
@@ -91,7 +92,7 @@
     elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID']) || !empty($_SERVER['Shib-Application-ID'])) {
         print_error('shib_no_attributes_error', 'auth_shibboleth' , '', '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\'');
     } else {
-        print_error('shib_not_set_up_error', 'auth_shibboleth');
+        print_error('shib_not_set_up_error', 'auth_shibboleth', '', $readmeurl);
     }
 
 
diff --git a/auth/shibboleth/lang/en/auth_shibboleth.php b/auth/shibboleth/lang/en/auth_shibboleth.php
index 77d6ec4b4e4cb..ca9b65b81ad5e 100644
--- a/auth/shibboleth/lang/en/auth_shibboleth.php
+++ b/auth/shibboleth/lang/en/auth_shibboleth.php
@@ -28,7 +28,7 @@
 $string['auth_shib_auth_logo'] = 'Authentication method logo';
 $string['auth_shib_auth_logo_description'] = 'Provide a logo for the Shibboleth authentication method that is familiar to your users. This could be the logo of your Shibboleth federation, e.g. <tt>SWITCHaai Login</tt> or <tt>InCommon Login</tt> or similar.';
 $string['auth_shib_contact_administrator'] = 'In case you are not associated with the given organizations and you need access to a course on this server, please contact the <a href="mailto:{$a}">Moodle Administrator</a>.';
-$string['auth_shibbolethdescription'] = 'Using this method users are created and authenticated using <a href="http://shibboleth.internet2.edu/">Shibboleth</a>.<br />Be sure to read the <a href="../auth/shibboleth/README.txt">README</a> for Shibboleth on how to set up your Moodle with Shibboleth';
+$string['auth_shibbolethdescription'] = 'Using this method users are created and authenticated using Shibboleth. For set-up details, see the <a href="{$a}">Shibboleth README</a>.';
 $string['auth_shibboleth_errormsg'] = 'Please select the organization you are member of!';
 $string['auth_shibboleth_login'] = 'Shibboleth login';
 $string['auth_shibboleth_login_long'] = 'Login to Moodle via Shibboleth';
@@ -36,7 +36,7 @@
 $string['auth_shibboleth_select_member'] = 'I\'m a member of ...';
 $string['auth_shibboleth_select_organization'] = 'For authentication via Shibboleth, please select your organisation from the drop-down menu:';
 $string['auth_shib_convert_data'] = 'Data modification API';
-$string['auth_shib_convert_data_description'] = 'You can use this API to further modify the data provided by Shibboleth. Read the <a href="../auth/shibboleth/README.txt">README</a> for further instructions.';
+$string['auth_shib_convert_data_description'] = 'You can use this API to further modify the data provided by Shibboleth. Read the <a href="{$a}">README</a> for further instructions.';
 $string['auth_shib_convert_data_warning'] = 'The file does not exist or is not readable by the webserver process!';
 $string['auth_shib_changepasswordurl'] = 'Password-change URL';
 $string['auth_shib_idp_list'] = 'Identity providers';
@@ -57,6 +57,6 @@
 $string['shib_invalid_account_error'] = 'You seem to be Shibboleth authenticated but Moodle has no valid account for your username. Your account may not exist or it may have been suspended.';
 $string['shib_no_attributes_error'] = 'You seem to be Shibboleth authenticated but Moodle didn\'t receive any user attributes. Please check that your Identity Provider releases the necessary attributes ({$a}) to the Service Provider Moodle is running on or inform the webmaster of this server.';
 $string['shib_not_all_attributes_error'] = 'Moodle needs certain Shibboleth attributes which are not present in your case. The attributes are: {$a}<br />Please contact the webmaster of this server or your Identity Provider.';
-$string['shib_not_set_up_error'] = 'Shibboleth authentication doesn\'t seem to be set up correctly because no Shibboleth environment variables are present for this page. Please consult the <a href="README.txt">README</a> for further instructions on how to set up Shibboleth authentication or contact the webmaster of this Moodle installation.';
+$string['shib_not_set_up_error'] = 'Shibboleth authentication doesn\'t seem to be set up correctly because no Shibboleth environment variables are present for this page. Please consult the <a href="{$a}">README</a> for further instructions on how to set up Shibboleth authentication or contact the webmaster of this Moodle installation.';
 $string['pluginname'] = 'Shibboleth';
 $string['privacy:metadata'] = 'The Shibboleth authentication plugin does not store any personal data.';
diff --git a/auth/shibboleth/settings.php b/auth/shibboleth/settings.php
index e4b4c3a9f860a..86dce35a92793 100644
--- a/auth/shibboleth/settings.php
+++ b/auth/shibboleth/settings.php
@@ -30,8 +30,9 @@
     require_once($CFG->dirroot.'/auth/shibboleth/classes/admin_setting_special_idp_configtextarea.php');
 
     // Introductory explanation.
+    $readmeurl = (new moodle_url('/auth/shibboleth/README.txt'))->out();
     $settings->add(new admin_setting_heading('auth_shibboleth/pluginname', '',
-            new lang_string('auth_shibbolethdescription', 'auth_shibboleth')));
+            new lang_string('auth_shibbolethdescription', 'auth_shibboleth', $readmeurl)));
 
     // Username.
     $settings->add(new admin_setting_configtext('auth_shibboleth/user_attribute', get_string('username'),
@@ -40,7 +41,7 @@
     // COnvert Data configuration file.
     $settings->add(new admin_setting_configfile('auth_shibboleth/convert_data',
             get_string('auth_shib_convert_data', 'auth_shibboleth'),
-            get_string('auth_shib_convert_data_description', 'auth_shibboleth'), ''));
+            get_string('auth_shib_convert_data_description', 'auth_shibboleth', $readmeurl), ''));
 
     // WAYF.
     $settings->add(new auth_shibboleth_admin_setting_special_wayf_select());
diff --git a/auth/tests/behat/behat_auth.php b/auth/tests/behat/behat_auth.php
index 30d1691a99e95..e7b65e581ff37 100644
--- a/auth/tests/behat/behat_auth.php
+++ b/auth/tests/behat/behat_auth.php
@@ -42,16 +42,23 @@ class behat_auth extends behat_base {
      * Logs in the user. There should exist a user with the same value as username and password.
      *
      * @Given /^I log in as "(?P<username_string>(?:[^"]|\\")*)"$/
+     * @param string $username the user to log in as.
+     * @param moodle_url|null $wantsurl optional, URL to go to after logging in.
      */
-    public function i_log_in_as($username) {
-        // In the mobile app the required tasks are different.
+    public function i_log_in_as(string $username, moodle_url $wantsurl = null) {
+        // In the mobile app the required tasks are different (does not support $wantsurl).
         if ($this->is_in_app()) {
             $this->execute('behat_app::login', [$username]);
             return;
         }
 
+        $loginurl = new moodle_url('/login/index.php');
+        if ($wantsurl !== null) {
+            $loginurl->param('wantsurl', $wantsurl->out_as_local_url());
+        }
+
         // Visit login page.
-        $this->getSession()->visit($this->locate_path('login/index.php'));
+        $this->getSession()->visit($this->locate_path($loginurl->out_as_local_url()));
 
         // Enter username and password.
         $this->execute('behat_forms::i_set_the_field_to', array('Username', $this->escape($username)));
diff --git a/availability/condition/grouping/tests/behat/availability_grouping.feature b/availability/condition/grouping/tests/behat/availability_grouping.feature
index 91f4d045d579d..2e242309b9ca5 100644
--- a/availability/condition/grouping/tests/behat/availability_grouping.feature
+++ b/availability/condition/grouping/tests/behat/availability_grouping.feature
@@ -92,3 +92,25 @@ Feature: availability_grouping
     # P1 should show but not B2.
     Then I should see "P1" in the "region-main" "region"
     And I should not see "P2" in the "region-main" "region"
+
+  @javascript
+  Scenario: Check grouping access restriction message on course homepage
+    Given the following "groupings" exist:
+      | name        | course | idnumber |
+      | Grouping A  | C1     | GA      |
+    And the following "grouping groups" exist:
+      | grouping  | group |
+      | GA        | GI1   |
+    And the following "activities" exist:
+      | activity  | name        | intro              | course | idnumber | groupmode | grouping |
+      | assign    | Test assign | Assign description | C1     | assign1  | 1         | GA       |
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I turn editing mode on
+    And I open "Test assign" actions menu
+    And I choose "Edit settings" in the open action menu
+    And I expand all fieldsets
+    And the field "groupingid" matches value "Grouping A"
+    And I press "Add group/grouping access restriction"
+    When I press "Save and return to course"
+    Then I should see "Not available unless: You belong to a group in Grouping A"
diff --git a/backup/backup.php b/backup/backup.php
index e0606d1b38460..7da76aa1ea8cb 100644
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -123,6 +123,9 @@
     if (!($bc = backup_ui::load_controller($backupid))) {
         $bc = new backup_controller($type, $id, backup::FORMAT_MOODLE,
                 backup::INTERACTIVE_YES, $backupmode, $USER->id);
+        // The backup id did not relate to a valid controller so we made a new controller.
+        // Now we need to reset the backup id to match the new controller.
+        $backupid = $bc->get_backupid();
     }
 
     // Prepare a progress bar which can display optionally during long-running
diff --git a/backup/controller/restore_controller.class.php b/backup/controller/restore_controller.class.php
index b709f7840ec8a..1f63e577cc3ee 100644
--- a/backup/controller/restore_controller.class.php
+++ b/backup/controller/restore_controller.class.php
@@ -332,6 +332,21 @@ public function get_executiontime() {
     public function get_plan() {
         return $this->plan;
     }
+    /**
+     * Gets the value for the requested setting
+     *
+     * @param string $name
+     * @param bool $default
+     * @return mixed
+     */
+    public function get_setting_value($name, $default = false) {
+        try {
+            return $this->get_plan()->get_setting($name)->get_value();
+        } catch (Exception $e) {
+            debugging('Failed to find the setting: '.$name, DEBUG_DEVELOPER);
+            return $default;
+        }
+    }
 
     public function get_info() {
         return $this->info;
@@ -341,6 +356,14 @@ public function execute_plan() {
         // Basic/initial prevention against time/memory limits
         core_php_time_limit::raise(1 * 60 * 60); // 1 hour for 1 course initially granted
         raise_memory_limit(MEMORY_EXTRA);
+
+        // Do course cleanup precheck, if required. This was originally in restore_ui. Moved to handle async backup/restore.
+        if ($this->get_target() == backup::TARGET_CURRENT_DELETING || $this->get_target() == backup::TARGET_EXISTING_DELETING) {
+            $options = array();
+            $options['keep_roles_and_enrolments'] = $this->get_setting_value('keep_roles_and_enrolments');
+            $options['keep_groups_and_groupings'] = $this->get_setting_value('keep_groups_and_groupings');
+            restore_dbops::delete_course_content($this->get_courseid(), $options);
+        }
         // If this is not a course restore or single activity restore (e.g. duplicate), inform the plan we are not
         // including all the activities for sure. This will affect any
         // task/step executed conditionally to stop processing information
diff --git a/backup/externallib.php b/backup/externallib.php
index 98119ecaa4ee4..dd7091025a379 100644
--- a/backup/externallib.php
+++ b/backup/externallib.php
@@ -71,6 +71,9 @@ public static function get_async_backup_progress($backupids, $contextid) {
         require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
         require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');
 
+        // Release session lock.
+        \core\session\manager::write_close();
+
         // Parameter validation.
         self::validate_parameters(
                 self::get_async_backup_progress_parameters(),
@@ -88,7 +91,6 @@ public static function get_async_backup_progress($backupids, $contextid) {
             require_capability('moodle/backup:backupactivity', $context);
         } else {
             require_capability('moodle/backup:backupcourse', $context);
-            $instanceid = $course->id;
         }
 
         $results = array();
@@ -142,6 +144,9 @@ public static function get_async_backup_links_backup_parameters() {
      * @since Moodle 3.7
      */
     public static function get_async_backup_links_backup($filename, $contextid) {
+        // Release session lock.
+        \core\session\manager::write_close();
+
         // Parameter validation.
         self::validate_parameters(
                 self::get_async_backup_links_backup_parameters(),
@@ -206,6 +211,9 @@ public static function get_async_backup_links_restore_parameters() {
      * @since Moodle 3.7
      */
     public static function get_async_backup_links_restore($backupid, $contextid) {
+        // Release session lock.
+        \core\session\manager::write_close();
+
         // Parameter validation.
         self::validate_parameters(
                 self::get_async_backup_links_restore_parameters(),
diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
index fe699b3f6603d..683e90225bee5 100644
--- a/backup/moodle2/restore_stepslib.php
+++ b/backup/moodle2/restore_stepslib.php
@@ -1980,6 +1980,12 @@ protected function after_execute() {
                 }
 
                 $capability = 'mod/' . $modname . ':addinstance';
+
+                if (!get_capability_info($capability)) {
+                    $this->log("Capability '{$capability}' was not found!", backup::LOG_WARNING);
+                    continue;
+                }
+
                 foreach ($roleids as $roleid) {
                     assign_capability($capability, CAP_PREVENT, $roleid, $context);
                 }
@@ -2107,9 +2113,12 @@ public function process_override($data) {
         $newroleid = $this->get_mappingid('role', $data->roleid);
         // If newroleid and context are valid assign it via API (it handles dupes and so on)
         if ($newroleid && $this->task->get_contextid()) {
-            // TODO: assign_capability() needs one userid param to be able to specify our restore userid
-            // TODO: it seems that assign_capability() doesn't check for valid capabilities at all ???
-            assign_capability($data->capability, $data->permission, $newroleid, $this->task->get_contextid());
+            if (!get_capability_info($data->capability)) {
+                $this->log("Capability '{$data->capability}' was not found!", backup::LOG_WARNING);
+            } else {
+                // TODO: assign_capability() needs one userid param to be able to specify our restore userid.
+                assign_capability($data->capability, $data->permission, $newroleid, $this->task->get_contextid());
+            }
         }
     }
 }
diff --git a/backup/restore.php b/backup/restore.php
index 4ee134e0093ca..750a39883800b 100644
--- a/backup/restore.php
+++ b/backup/restore.php
@@ -55,9 +55,11 @@
 if (is_null($course)) {
     $coursefullname = $SITE->fullname;
     $courseshortname = $SITE->shortname;
+    $courseurl = new moodle_url('/');
 } else {
     $coursefullname = $course->fullname;
     $courseshortname = $course->shortname;
+    $courseurl = course_get_url($course->id);
 }
 
 // Show page header.
@@ -173,7 +175,6 @@
     \core\task\manager::queue_adhoc_task($asynctask);
 
     // Add ajax progress bar and initiate ajax via a template.
-    $courseurl = new moodle_url('/course/view.php', array('id' => $course->id));
     $restoreurl = new moodle_url('/backup/restorefile.php', array('contextid' => $contextid));
     $progresssetup = array(
             'backupid' => $restoreid,
@@ -182,7 +183,6 @@
             'restoreurl' => $restoreurl->out()
     );
     echo $renderer->render_from_template('core/async_backup_status', $progresssetup);
-
 }
 
 $restore->destroy();
diff --git a/backup/util/checks/backup_check.class.php b/backup/util/checks/backup_check.class.php
index 164da0b38569a..7cd4c14af5455 100644
--- a/backup/util/checks/backup_check.class.php
+++ b/backup/util/checks/backup_check.class.php
@@ -128,15 +128,6 @@ public static function check_security($backup_controller, $apply) {
         // Now, if backup mode is hub or import, check userid has permissions for those modes
         // other modes will perform common checks only (backupxxxx capabilities in $typecapstocheck)
         switch ($mode) {
-            case backup::MODE_HUB:
-                if (!has_capability('moodle/backup:backuptargethub', $coursectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->courseid = $courseid;
-                    $a->capability = 'moodle/backup:backuptargethub';
-                    throw new backup_controller_exception('backup_user_missing_capability', $a);
-                }
-                break;
             case backup::MODE_IMPORT:
                 if (!has_capability('moodle/backup:backuptargetimport', $coursectx, $userid)) {
                     $a = new stdclass();
diff --git a/backup/util/checks/restore_check.class.php b/backup/util/checks/restore_check.class.php
index ee2b6cdbc9824..35fe2d9bf9b85 100644
--- a/backup/util/checks/restore_check.class.php
+++ b/backup/util/checks/restore_check.class.php
@@ -90,15 +90,6 @@ public static function check_security($restore_controller, $apply) {
         // Now, if restore mode is hub or import, check userid has permissions for those modes
         // other modes will perform common checks only (restorexxxx capabilities in $typecapstocheck)
         switch ($mode) {
-            case backup::MODE_HUB:
-                if (!has_capability('moodle/restore:restoretargethub', $coursectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->courseid = $courseid;
-                    $a->capability = 'moodle/restore:restoretargethub';
-                    throw new restore_controller_exception('restore_user_missing_capability', $a);
-                }
-                break;
             case backup::MODE_IMPORT:
                 if (!has_capability('moodle/restore:restoretargetimport', $coursectx, $userid)) {
                     $a = new stdclass();
diff --git a/backup/util/ui/amd/build/async_backup.min.js b/backup/util/ui/amd/build/async_backup.min.js
index 41384ff51353a..d999f4ac57a13 100644
--- a/backup/util/ui/amd/build/async_backup.min.js
+++ b/backup/util/ui/amd/build/async_backup.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/str","core/notification","core/templates"],function(a,b,c,d,e){function f(b,c){var d=Math.round(c)+"%",e=a("#"+b+"_bar"),f=c.toFixed(2)+"%";e.attr("aria-valuenow",d),e.css("width",d),e.text(f)}function g(c){var f=a("#"+c+"_bar").parent().parent(),g=f.parent(),h=f.siblings(),i=h[1],j=a(i).text(),k=h[0],l=a(k).text();b.call([{methodname:"core_backup_get_async_backup_links_backup",args:{filename:l,contextid:n}}])[0].done(function(a){var b={filename:l,time:j,size:a.filesize,fileurl:a.fileurl,restoreurl:a.restoreurl};e.render("core/async_backup_progress_row",b).then(function(a,b){e.replaceNodeContents(g,a,b)}).fail(function(){d.exception(new Error("Failed to load table row"))})})}function h(c){var f=a("#"+c+"_bar").parent().parent(),g=f.parent(),h=f.siblings(),i=h[0],j=h[1],k=a(j).text();b.call([{methodname:"core_backup_get_async_backup_links_restore",args:{backupid:c,contextid:n}}])[0].done(function(b){var c=a(i).text(),f={resourcename:c,restoreurl:b.restoreurl,time:k};e.render("core/async_restore_progress_row",f).then(function(a,b){e.replaceNodeContents(g,a,b)}).fail(function(){d.exception(new Error("Failed to load table row"))})})}function i(e){var g,h=100*e.progress,i=a("#"+m+"_bar"),j=a("#"+m+"_status"),k=a("#"+m+"_detail"),l=a("#"+m+"_button");if(e.status==s){i.addClass("bg-success"),f(m,h);var r="async"+p+"processing";c.get_string(r,"backup").then(function(a){return j.text(a),a})["catch"](function(){d.exception(new Error("Failed to load string: backup "+r))})}else if(e.status==t){i.addClass("bg-danger"),i.removeClass("bg-success"),f(m,100);var v="async"+p+"error",w="async"+p+"errordetail";g=[{key:v,component:"backup"},{key:w,component:"backup"}],c.get_strings(g).then(function(a){return j.text(a[0]),k.text(a[1]),a})["catch"](function(){d.exception(new Error("Failed to load string"))}),a(".backup_progress").children("span").removeClass("backup_stage_current"),a(".backup_progress").children("span").last().addClass("backup_stage_current"),clearInterval(q)}else if(e.status==u){i.addClass("bg-success"),f(m,100);var x="async"+p+"complete";if(c.get_string(x,"backup").then(function(a){return j.text(a),a})["catch"](function(){d.exception(new Error("Failed to load string: backup "+x))}),"restore"==p)b.call([{methodname:"core_backup_get_async_backup_links_restore",args:{backupid:m,contextid:n}}])[0].done(function(a){var b="async"+p+"completedetail",e="async"+p+"completebutton",f=[{key:b,component:"backup",param:a.restoreurl},{key:e,component:"backup"}];c.get_strings(f).then(function(b){return k.html(b[0]),l.text(b[1]),l.attr("href",a.restoreurl),b})["catch"](function(){d.exception(new Error("Failed to load string"))})});else{var y="async"+p+"completedetail",z="async"+p+"completebutton";g=[{key:y,component:"backup",param:o},{key:z,component:"backup"}],c.get_strings(g).then(function(a){return k.html(a[0]),l.text(a[1]),l.attr("href",o),a})["catch"](function(){d.exception(new Error("Failed to load string"))})}a(".backup_progress").children("span").removeClass("backup_stage_current"),a(".backup_progress").children("span").last().addClass("backup_stage_current"),clearInterval(q)}}function j(b){b.forEach(function(b){var c=100*b.progress,d=b.backupid,e=a("#"+d+"_bar"),i=b.operation;b.status==s?(e.addClass("bg-success"),f(d,c)):b.status==t?(e.addClass("bg-danger"),e.addClass("complete"),a("#"+d+"_bar").removeClass("bg-success"),f(d,100)):b.status==u&&(e.addClass("bg-success"),e.addClass("complete"),f(d,100),"backup"==i?g(d):h(d))})}function k(){b.call([{methodname:"core_backup_get_async_backup_progress",args:{backupids:[m],contextid:n}}])[0].done(function(a){i(a[0])})}function l(){var c=[],d=a(".progress").find(".progress-bar").not(".complete");d.each(function(){c.push(this.id.substring(0,32))}),c.length>0?b.call([{methodname:"core_backup_get_async_backup_progress",args:{backupids:c,contextid:n}}])[0].done(function(a){j(a)}):clearInterval(r)}var m,n,o,p,q,r,s=800,t=900,u=1e3,v={},w=5e3;return v.asyncBackupAllStatus=function(a){n=a,r=setInterval(l,w)},v.asyncBackupStatus=function(b,c,d,e){m=b,n=c,o=d,p="backup"==e?"backup":"restore",a(".backup_progress").children("a").removeAttr("href"),q=setInterval(k,w)},v});
\ No newline at end of file
+define(["jquery","core/ajax","core/str","core/notification","core/templates"],function(a,b,c,d,e){function f(b,c){var d=Math.round(c)+"%",e=a("#"+b+"_bar"),f=c.toFixed(2)+"%";e.attr("aria-valuenow",d),e.css("width",d),e.text(f)}function g(c){var f=a("#"+c+"_bar").parent().parent(),g=f.parent(),h=f.siblings(),i=h[1],j=a(i).text(),k=h[0],l=a(k).text();b.call([{methodname:"core_backup_get_async_backup_links_backup",args:{filename:l,contextid:n}}])[0].done(function(a){var b={filename:l,time:j,size:a.filesize,fileurl:a.fileurl,restoreurl:a.restoreurl};e.render("core/async_backup_progress_row",b).then(function(a,b){e.replaceNodeContents(g,a,b)}).fail(function(){d.exception(new Error("Failed to load table row"))})})}function h(c){var f=a("#"+c+"_bar").parent().parent(),g=f.parent(),h=f.siblings(),i=h[0],j=h[1],k=a(j).text();b.call([{methodname:"core_backup_get_async_backup_links_restore",args:{backupid:c,contextid:n}}])[0].done(function(b){var c=a(i).text(),f={resourcename:c,restoreurl:b.restoreurl,time:k};e.render("core/async_restore_progress_row",f).then(function(a,b){e.replaceNodeContents(g,a,b)}).fail(function(){d.exception(new Error("Failed to load table row"))})})}function i(e){var g,h=100*e.progress,i=a("#"+m+"_bar"),j=a("#"+m+"_status"),k=a("#"+m+"_detail"),l=a("#"+m+"_button");if(e.status==s){i.addClass("bg-success"),f(m,h);var r="async"+p+"processing";c.get_string(r,"backup").then(function(a){return j.text(a),a})["catch"](function(){d.exception(new Error("Failed to load string: backup "+r))})}else if(e.status==t){i.addClass("bg-danger"),i.removeClass("bg-success"),f(m,100);var v="async"+p+"error",w="async"+p+"errordetail";g=[{key:v,component:"backup"},{key:w,component:"backup"}],c.get_strings(g).then(function(a){return j.text(a[0]),k.text(a[1]),a})["catch"](function(){d.exception(new Error("Failed to load string"))}),a(".backup_progress").children("span").removeClass("backup_stage_current"),a(".backup_progress").children("span").last().addClass("backup_stage_current"),clearInterval(q)}else if(e.status==u){i.addClass("bg-success"),f(m,100);var x="async"+p+"complete";if(c.get_string(x,"backup").then(function(a){return j.text(a),a})["catch"](function(){d.exception(new Error("Failed to load string: backup "+x))}),"restore"==p)b.call([{methodname:"core_backup_get_async_backup_links_restore",args:{backupid:m,contextid:n}}])[0].done(function(a){var b="async"+p+"completedetail",e="async"+p+"completebutton",f=[{key:b,component:"backup",param:a.restoreurl},{key:e,component:"backup"}];c.get_strings(f).then(function(b){return k.html(b[0]),l.text(b[1]),l.attr("href",a.restoreurl),b})["catch"](function(){d.exception(new Error("Failed to load string"))})});else{var y="async"+p+"completedetail",z="async"+p+"completebutton";g=[{key:y,component:"backup",param:o},{key:z,component:"backup"}],c.get_strings(g).then(function(a){return k.html(a[0]),l.text(a[1]),l.attr("href",o),a})["catch"](function(){d.exception(new Error("Failed to load string"))})}a(".backup_progress").children("span").removeClass("backup_stage_current"),a(".backup_progress").children("span").last().addClass("backup_stage_current"),clearInterval(q)}}function j(b){b.forEach(function(b){var c=100*b.progress,d=b.backupid,e=a("#"+d+"_bar"),i=b.operation;b.status==s?(e.addClass("bg-success"),f(d,c)):b.status==t?(e.addClass("bg-danger"),e.addClass("complete"),a("#"+d+"_bar").removeClass("bg-success"),f(d,100)):b.status==u&&(e.addClass("bg-success"),e.addClass("complete"),f(d,100),"backup"==i?g(d):h(d))})}function k(){b.call([{methodname:"core_backup_get_async_backup_progress",args:{backupids:[m],contextid:n}}])[0].done(function(a){i(a[0])})}function l(){var c=[],d=a(".progress").find(".progress-bar").not(".complete");d.each(function(){c.push(this.id.substring(0,32))}),c.length>0?b.call([{methodname:"core_backup_get_async_backup_progress",args:{backupids:c,contextid:n}}])[0].done(function(a){j(a)}):clearInterval(r)}var m,n,o,p,q,r,s=800,t=900,u=1e3,v={},w=15e3;return v.asyncBackupAllStatus=function(a){n=a,r=setInterval(l,w)},v.asyncBackupStatus=function(b,c,d,e){m=b,n=c,o=d,p="backup"==e?"backup":"restore",a(".backup_progress").children("a").removeAttr("href"),q=setInterval(k,w)},v});
\ No newline at end of file
diff --git a/backup/util/ui/amd/src/async_backup.js b/backup/util/ui/amd/src/async_backup.js
index 0563fa8239d63..ff5214a35b8e9 100644
--- a/backup/util/ui/amd/src/async_backup.js
+++ b/backup/util/ui/amd/src/async_backup.js
@@ -39,7 +39,7 @@ define(['jquery', 'core/ajax', 'core/str', 'core/notification', 'core/templates'
      * Module level variables.
      */
     var Asyncbackup = {};
-    var checkdelay = 5000; //  How often we check for progress updates.
+    var checkdelay = 15000; //  How often we check for progress updates.
     var backupid; //  The backup id to get the progress for.
     var contextid; //  The course this backup progress is for.
     var restoreurl; //  The URL to view course restores.
diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php
index 4ee83e966f5da..af6beefc3a3e4 100644
--- a/backup/util/ui/renderer.php
+++ b/backup/util/ui/renderer.php
@@ -381,8 +381,10 @@ public function import_course_selector(moodle_url $nextstageurl, import_course_s
         $html .= $this->output->heading(get_string('importdatafrom'), 2, array('class' => 'header'));
         $html .= $this->backup_detail_pair(get_string('selectacourse', 'backup'), $this->render($courses));
         $attrs = array('type' => 'submit', 'value' => get_string('continue'), 'class' => 'btn btn-primary');
+        $html .= html_writer::start_tag('div', array('class' => 'mt-3'));
         $html .= $this->backup_detail_pair('', html_writer::empty_tag('input', $attrs));
         $html .= html_writer::end_tag('div');
+        $html .= html_writer::end_tag('div');
         $html .= html_writer::end_tag('form');
         $html .= html_writer::end_tag('div');
         return $html;
@@ -764,7 +766,7 @@ public function render_import_course_search(import_course_search $component) {
         if ($component->get_count() === 0) {
             $output .= $this->output->notification(get_string('nomatchingcourses', 'backup'));
 
-            $output .= html_writer::start_tag('div', array('class' => 'ics-search'));
+            $output .= html_writer::start_tag('div', array('class' => 'ics-search form-inline'));
             $attrs = array(
                 'type' => 'text',
                 'name' => restore_course_search::$VAR_SEARCH,
@@ -776,7 +778,7 @@ public function render_import_course_search(import_course_search $component) {
                 'type' => 'submit',
                 'name' => 'searchcourses',
                 'value' => get_string('search'),
-                'class' => 'btn btn-secondary'
+                'class' => 'btn btn-secondary ml-1'
             );
             $output .= html_writer::empty_tag('input', $attrs);
             $output .= html_writer::end_tag('div');
@@ -822,7 +824,7 @@ public function render_import_course_search(import_course_search $component) {
         $output .= html_writer::table($table);
         $output .= html_writer::end_tag('div');
 
-        $output .= html_writer::start_tag('div', array('class' => 'ics-search'));
+        $output .= html_writer::start_tag('div', array('class' => 'ics-search form-inline'));
         $attrs = array(
             'type' => 'text',
             'name' => restore_course_search::$VAR_SEARCH,
@@ -833,7 +835,7 @@ public function render_import_course_search(import_course_search $component) {
             'type' => 'submit',
             'name' => 'searchcourses',
             'value' => get_string('search'),
-            'class' => 'btn btn-secondary'
+            'class' => 'btn btn-secondary ml-1'
         );
         $output .= html_writer::empty_tag('input', $attrs);
         $output .= html_writer::end_tag('div');
diff --git a/backup/util/ui/restore_ui.class.php b/backup/util/ui/restore_ui.class.php
index 7c0de1bc27bf2..98a105704a385 100644
--- a/backup/util/ui/restore_ui.class.php
+++ b/backup/util/ui/restore_ui.class.php
@@ -215,12 +215,7 @@ public function execute() {
         if ($this->stage->get_stage() < self::STAGE_PROCESS) {
             throw new restore_ui_exception('restoreuifinalisedbeforeexecute');
         }
-        if ($this->controller->get_target() == backup::TARGET_CURRENT_DELETING || $this->controller->get_target() == backup::TARGET_EXISTING_DELETING) {
-            $options = array();
-            $options['keep_roles_and_enrolments'] = $this->get_setting_value('keep_roles_and_enrolments');
-            $options['keep_groups_and_groupings'] = $this->get_setting_value('keep_groups_and_groupings');
-            restore_dbops::delete_course_content($this->controller->get_courseid(), $options);
-        }
+
         $this->controller->execute_plan();
         $this->progress = self::PROGRESS_EXECUTED;
         $this->stage = new restore_ui_stage_complete($this, $this->stage->get_params(), $this->controller->get_results());
diff --git a/badges/assertion.php b/badges/assertion.php
index ec08d0faf5fb4..0c41062851e2c 100644
--- a/badges/assertion.php
+++ b/badges/assertion.php
@@ -36,7 +36,8 @@
 
 $hash = required_param('b', PARAM_ALPHANUM); // Issued badge unique hash for badge assertion.
 $action = optional_param('action', null, PARAM_BOOL); // Generates badge class if true.
-$obversion = optional_param('obversion', OPEN_BADGES_V1, PARAM_INT); // For control format OB specification version.
+// OB specification version. If it's not defined, the site will be used as default.
+$obversion = optional_param('obversion', badges_open_badges_backpack_api(), PARAM_INT);
 
 $assertion = new core_badges_assertion($hash, $obversion);
 
diff --git a/badges/classes/assertion.php b/badges/classes/assertion.php
index 9525019849870..872495eab84ca 100644
--- a/badges/classes/assertion.php
+++ b/badges/classes/assertion.php
@@ -127,7 +127,12 @@ public function get_badge_assertion($issued = true, $usesalt = true) {
             $hash = $this->_data->uniquehash;
             $email = empty($this->_data->backpackemail) ? $this->_data->email : $this->_data->backpackemail;
             $assertionurl = new moodle_url('/badges/assertion.php', array('b' => $hash, 'obversion' => $this->_obversion));
-            $classurl = new moodle_url('/badges/assertion.php', array('b' => $hash, 'action' => 1));
+
+            if ($this->_obversion == OPEN_BADGES_V2) {
+                $classurl = new moodle_url('/badges/badge_json.php', array('id' => $this->get_badge_id()));
+            } else {
+                $classurl = new moodle_url('/badges/assertion.php', array('b' => $hash, 'action' => 1));
+            }
 
             // Required.
             $assertion['uid'] = $hash;
@@ -193,7 +198,11 @@ public function get_badge_class($issued = true) {
             $class['image'] = 'data:image/png;base64,' . $imagedata;
             $class['criteria'] = $this->_url->out(false); // Currently issued badge URL.
             if ($issued) {
-                $issuerurl = new moodle_url('/badges/assertion.php', array('b' => $this->_data->uniquehash, 'action' => 0));
+                if ($this->_obversion == OPEN_BADGES_V2) {
+                    $issuerurl = new moodle_url('/badges/badge_json.php', array('id' => $this->get_badge_id(), 'action' => 0));
+                } else {
+                    $issuerurl = new moodle_url('/badges/assertion.php', array('b' => $this->_data->uniquehash, 'action' => 0));
+                }
                 $class['issuer'] = $issuerurl->out(false);
             }
             $this->embed_data_badge_version2($class, OPEN_BADGES_V2_TYPE_BADGE);
@@ -329,10 +338,10 @@ protected function embed_data_badge_version2 (&$json, $type = OPEN_BADGES_V2_TYP
             $hash = $this->_data->uniquehash;
             $assertionsurl = new moodle_url('/badges/assertion.php', array('b' => $hash, 'obversion' => $this->_obversion));
             $classurl = new moodle_url(
-                '/badges/assertion.php',
-                array('b' => $hash, 'action' => 1, 'obversion' => $this->_obversion)
+                '/badges/badge_json.php',
+                array('id' => $this->get_badge_id())
             );
-            $issuerurl = new moodle_url('/badges/assertion.php', array('b' => $this->_data->uniquehash, 'action' => 0,
+            $issuerurl = new moodle_url('/badges/badge_json.php', array('id' => $this->get_badge_id(), 'action' => 0,
                 'obversion' => $this->_obversion));
             // For assertion.
             if ($type == OPEN_BADGES_V2_TYPE_ASSERTION) {
diff --git a/badges/classes/form/badge.php b/badges/classes/form/badge.php
index f6d5e09d501df..faa64a651e93f 100644
--- a/badges/classes/form/badge.php
+++ b/badges/classes/form/badge.php
@@ -49,7 +49,6 @@ public function definition() {
         $mform = $this->_form;
         $badge = (isset($this->_customdata['badge'])) ? $this->_customdata['badge'] : false;
         $action = $this->_customdata['action'];
-        $languages = get_string_manager()->get_list_of_languages();
 
         $mform->addElement('header', 'badgedetails', get_string('badgedetails', 'badges'));
         $mform->addElement('text', 'name', get_string('name'), array('size' => '70'));
@@ -61,6 +60,8 @@ public function definition() {
         $mform->addElement('text', 'version', get_string('version', 'badges'), array('size' => '70'));
         $mform->setType('version', PARAM_TEXT);
         $mform->addHelpButton('version', 'version', 'badges');
+
+        $languages = get_string_manager()->get_list_of_languages();
         $mform->addElement('select', 'language', get_string('language'), $languages);
         $mform->addHelpButton('language', 'language', 'badges');
 
@@ -157,7 +158,16 @@ public function definition() {
         $mform->setType('action', PARAM_TEXT);
 
         if ($action == 'new') {
-            $mform->setDefault('language', $CFG->lang);
+            // Try to set default badge language to that of current language, or it's parent.
+            $language = current_language();
+            if (isset($languages[$language])) {
+                $defaultlanguage = $language;
+            } else {
+                // Calling get_parent_language returns an empty string instead of 'en'.
+                $defaultlanguage = get_parent_language($language) ?: 'en';
+            }
+
+            $mform->setDefault('language', $defaultlanguage);
             $this->add_action_buttons(true, get_string('createbutton', 'badges'));
         } else {
             // Add hidden fields.
diff --git a/badges/classes/form/collections.php b/badges/classes/form/collections.php
index 6f221b79e0adb..5a57ba2b426d1 100644
--- a/badges/classes/form/collections.php
+++ b/badges/classes/form/collections.php
@@ -79,24 +79,25 @@ public function definition() {
         $hasgroups = false;
         if (!empty($groups)) {
             foreach ($groups as $group) {
-                // Assertions or badges.
                 $count = 0;
-
+                // Handle attributes based on backpack's supported version.
                 if ($sitebackpack->apiversion == OPEN_BADGES_V2) {
+                    // OpenBadges v2 data attributes.
                     if (empty($group->published)) {
                         // Only public collections.
                         continue;
                     }
-                }
-                if (!empty($group->assertions)) {
+
+                    // Get the number of badges associated with this collection from the assertions array returned.
                     $count = count($group->assertions);
-                }
-                if (!empty($group->badges)) {
-                    $count = count($group->badges);
-                }
-                if (!empty($group->groupId)) {
+                } else {
+                    // OpenBadges v1 data attributes.
                     $group->entityId = $group->groupId;
+
+                    // Get the number of badges associated with this collection. In that case, the number is returned directly.
+                    $count = $group->badges;
                 }
+
                 if (!$hasgroups) {
                     $mform->addElement('static', 'selectgroup', '', get_string('selectgroup_start', 'badges'));
                 }
diff --git a/badges/classes/output/issued_badge.php b/badges/classes/output/issued_badge.php
index b669a19415dd9..bc70d3bbbf92d 100644
--- a/badges/classes/output/issued_badge.php
+++ b/badges/classes/output/issued_badge.php
@@ -54,6 +54,9 @@ class issued_badge implements renderable {
     /** @var badge class */
     public $badgeid = 0;
 
+    /** @var unique hash identifying the issued badge */
+    public $hash;
+
     /**
      * Initializes the badge to display
      *
@@ -62,7 +65,8 @@ class issued_badge implements renderable {
     public function __construct($hash) {
         global $DB;
 
-        $assertion = new \core_badges_assertion($hash);
+        $this->hash = $hash;
+        $assertion = new \core_badges_assertion($hash, badges_open_badges_backpack_api());
         $this->issued = $assertion->get_badge_assertion();
         $this->badgeclass = $assertion->get_badge_class();
 
diff --git a/badges/criteria/award_criteria_badge.php b/badges/criteria/award_criteria_badge.php
index d9bd7957dc459..ebddecf818026 100644
--- a/badges/criteria/award_criteria_badge.php
+++ b/badges/criteria/award_criteria_badge.php
@@ -112,7 +112,7 @@ public function get_options(&$mform) {
             if ($this->id !== 0) {
                 $selected = array_keys($this->params);
             }
-            $settings = array('multiple' => 'multiple', 'size' => 20, 'class' => 'selectbadge');
+            $settings = array('multiple' => 'multiple', 'size' => 20, 'class' => 'selectbadge', 'required' => 'required');
             $mform->addElement('select', 'badge_badges', get_string('addbadge', 'badges'), $select, $settings);
             $mform->addRule('badge_badges', get_string('requiredbadge', 'badges'), 'required');
             $mform->addHelpButton('badge_badges', 'addbadge', 'badges');
@@ -243,7 +243,6 @@ public function get_completed_criteria_sql() {
         if ($this->method == BADGE_CRITERIA_AGGREGATION_ANY) {
             // User has received ANY of the required badges.
             $join = " LEFT JOIN {badge_issued} bi2 ON bi2.userid = u.id";
-            $where = "AND (";
             $i = 0;
             foreach ($this->params as $param) {
                 if ($i == 0) {
@@ -254,7 +253,10 @@ public function get_completed_criteria_sql() {
                 $params['badgeid'.$i] = $param['badge'];
                 $i++;
             }
-            $where .= ") ";
+            // MDL-66032 Do not create expression if there are no badges in criteria.
+            if (!empty($where)) {
+                $where = ' AND (' . $where . ') ';
+            }
             return array($join, $where, $params);
         } else {
             // User has received ALL of the required badges.
diff --git a/badges/lib/bakerlib.php b/badges/lib/bakerlib.php
index 9507bfa44c12c..23fbcc8018677 100644
--- a/badges/lib/bakerlib.php
+++ b/badges/lib/bakerlib.php
@@ -114,23 +114,59 @@ public function check_chunks($type, $check) {
      * @param string $value Currently an assertion URL that is added to an image metadata.
      *
      * @return string $result File content with a new chunk as a string. Can be used in file_put_contents() to write to a file.
+     * @throws \moodle_exception when unsupported chunk type is defined.
      */
     public function add_chunks($type, $key, $value) {
         if (strlen($key) > 79) {
             debugging('Key is too big');
         }
 
-        // tEXt Textual data.
-        // Keyword:        1-79 bytes (character string)
-        // Null separator: 1 byte
-        // Text:           n bytes (character string)
-        $data = $key . "\0" . $value;
+        $dataparts = [];
+        if ($type === 'iTXt') {
+            // International textual data (iTXt).
+            // Keyword:             1-79 bytes (character string).
+            $dataparts[] = $key;
+            // Null separator:      1 byte.
+            $dataparts[] = "\x00";
+            // Compression flag:    1 byte
+            // A value of 0 means no compression.
+            $dataparts[] = "\x00";
+            // Compression method:  1 byte
+            // If compression is disabled, the method should also be 0.
+            $dataparts[] = "\x00";
+            // Language tag:        0 or more bytes (character string)
+            // When there is no language specified leave empty.
+
+            // Null separator:      1 byte.
+            $dataparts[] = "\x00";
+            // Translated keyword:  0 or more bytes
+            // When there is no translation specified, leave empty.
+
+            // Null separator:      1 byte.
+            $dataparts[] = "\x00";
+            // Text:                0 or more bytes.
+            $dataparts[] = $value;
+        } else if ($type === 'tEXt') {
+            // Textual data (tEXt).
+            // Keyword:             1-79 bytes (character string).
+            $dataparts[] = $key;
+            // Null separator:      1 byte.
+            $dataparts[] = "\0";
+            // Text:                n bytes (character string).
+            $dataparts[] = $value;
+        } else {
+            throw new \moodle_exception('Unsupported chunk type: ' . $type);
+        }
+
+        $data = implode($dataparts);
+
         $crc = pack("N", crc32($type . $data));
         $len = pack("N", strlen($data));
 
         // Chunk format: length + type + data + CRC.
         // CRC is a CRC-32 computed over the chunk type and chunk data.
         $newchunk = $len . $type . $data . $crc;
+        $this->_chunks[$type] = $data;
 
         $result = substr($this->_contents, 0, $this->_size - 12)
                 . $newchunk
diff --git a/badges/renderer.php b/badges/renderer.php
index 7e86ba2b9547e..341ef6dbf3421 100644
--- a/badges/renderer.php
+++ b/badges/renderer.php
@@ -337,13 +337,13 @@ protected function render_issued_badge(\core_badges\output\issued_badge $ibadge)
 
         if ($USER->id == $userinfo->id && !empty($CFG->enablebadges)) {
             $output .= $this->output->single_button(
-                        new moodle_url('/badges/badge.php', array('hash' => $issued['uid'], 'bake' => true)),
+                        new moodle_url('/badges/badge.php', array('hash' => $ibadge->hash, 'bake' => true)),
                         get_string('download'),
                         'POST');
             if (!empty($CFG->badges_allowexternalbackpack) && ($expiration > $now) && badges_user_has_backpack($USER->id)) {
 
                 if (badges_open_badges_backpack_api() == OPEN_BADGES_V1) {
-                    $assertion = new moodle_url('/badges/assertion.php', array('b' => $issued['uid']));
+                    $assertion = new moodle_url('/badges/assertion.php', array('b' => $ibadge->hash));
                     $action = new component_action('click', 'addtobackpack', array('assertion' => $assertion->out(false)));
                     $attributes = array(
                             'type'  => 'button',
@@ -354,7 +354,7 @@ protected function render_issued_badge(\core_badges\output\issued_badge $ibadge)
                     $this->output->add_action_handler($action, 'addbutton');
                     $output .= $tobackpack;
                 } else {
-                    $assertion = new moodle_url('/badges/backpack-add.php', array('hash' => $issued['uid']));
+                    $assertion = new moodle_url('/badges/backpack-add.php', array('hash' => $ibadge->hash));
                     $attributes = ['class' => 'btn btn-secondary m-1', 'role' => 'button'];
                     $tobackpack = html_writer::link($assertion, get_string('addtobackpack', 'badges'), $attributes);
                     $output .= $tobackpack;
@@ -420,12 +420,14 @@ protected function render_issued_badge(\core_badges\output\issued_badge $ibadge)
 
         $output .= $this->output->heading(get_string('issuancedetails', 'badges'), 3);
         $dl = array();
-        $issued['issuedOn'] = !preg_match( '~^[1-9][0-9]*$~', $issued['issuedOn'] ) ?
-            strtotime($issued['issuedOn']) : $issued['issuedOn'];
+        if (!is_numeric($issued['issuedOn'])) {
+            $issued['issuedOn'] = strtotime($issued['issuedOn']);
+        }
         $dl[get_string('dateawarded', 'badges')] = userdate($issued['issuedOn']);
         if (isset($issued['expires'])) {
-            $issued['expires'] = !preg_match( '~^[1-9][0-9]*$~', $issued['expires'] ) ?
-                strtotime($issued['expires']) : $issued['expires'];
+            if (!is_numeric($issued['expires'])) {
+                $issued['expires'] = strtotime($issued['expires']);
+            }
             if ($issued['expires'] < $now) {
                 $dl[get_string('expirydate', 'badges')] = userdate($issued['expires']) . get_string('warnexpired', 'badges');
 
@@ -508,7 +510,7 @@ protected function render_external_badge(\core_badges\output\external_badge $iba
         }
         $output .= html_writer::empty_tag('img', array('src' => $issued->image, 'width' => '100'));
         if (isset($assertion->expires)) {
-            $expiration = !strtotime($assertion->expires) ? s($assertion->expires) : strtotime($assertion->expires);
+            $expiration = is_numeric($assertion->expires) ? $assertion->expires : strtotime($assertion->expires);
             if ($expiration < $today) {
                 $output .= $this->output->pix_icon('i/expired',
                         get_string('expireddate', 'badges', userdate($expiration)),
@@ -564,7 +566,7 @@ protected function render_external_badge(\core_badges\output\external_badge $iba
 
         $dl = array();
         if (isset($assertion->issued_on)) {
-            $issuedate = !strtotime($assertion->issued_on) ? s($assertion->issued_on) : strtotime($assertion->issued_on);
+            $issuedate = is_numeric($assertion->issued_on) ? $assertion->issued_on : strtotime($assertion->issued_on);
             $dl[get_string('dateawarded', 'badges')] = userdate($issuedate);
         }
         if (isset($assertion->expires)) {
diff --git a/badges/upgradelib.php b/badges/upgradelib.php
new file mode 100644
index 0000000000000..d1acd8ba05b3b
--- /dev/null
+++ b/badges/upgradelib.php
@@ -0,0 +1,65 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Contains upgrade and install functions for badges.
+ *
+ * @package    core_badges
+ * @copyright  2019 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Called on install or upgrade to create default list of backpacks a user can connect to.
+ * Don't use the global defines from badgeslib because this is for install/upgrade.
+ *
+ * @return void
+ */
+function badges_install_default_backpacks() {
+    global $DB;
+
+    $record = new stdClass();
+    $record->backpackweburl = 'https://backpack.openbadges.org';
+    $record->backpackapiurl = 'https://backpack.openbadges.org';
+    $record->apiversion = 1;
+    $record->sortorder = 0;
+    $record->password = '';
+
+    if (!($bp = $DB->get_record('badge_external_backpack', array('backpackapiurl' => $record->backpackapiurl)))) {
+        $bpid = $DB->insert_record('badge_external_backpack', $record);
+    } else {
+        $bpid = $bp->id;
+    }
+    set_config('badges_site_backpack', $bpid);
+
+    // All existing backpacks default to V1.
+    $DB->set_field('badge_backpack', 'externalbackpackid', $bpid);
+
+    $record = new stdClass();
+    $record->backpackapiurl = 'https://api.badgr.io/v2';
+    $record->backpackweburl = 'https://badgr.io';
+    $record->apiversion = 2;
+    $record->sortorder = 1;
+    $record->password = '';
+
+    if (!$DB->record_exists('badge_external_backpack', array('backpackapiurl' => $record->backpackapiurl))) {
+        $DB->insert_record('badge_external_backpack', $record);
+    }
+
+}
+
diff --git a/blocks/badges/db/upgrade.php b/blocks/badges/db/upgrade.php
index 6948646ed2df0..f1f069a661488 100644
--- a/blocks/badges/db/upgrade.php
+++ b/blocks/badges/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/calendar_month/db/upgrade.php b/blocks/calendar_month/db/upgrade.php
index 32051277b3baf..58d654659b249 100644
--- a/blocks/calendar_month/db/upgrade.php
+++ b/blocks/calendar_month/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/calendar_upcoming/db/upgrade.php b/blocks/calendar_upcoming/db/upgrade.php
index 14100c83782ef..69a5774fa02cc 100644
--- a/blocks/calendar_upcoming/db/upgrade.php
+++ b/blocks/calendar_upcoming/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/community/block_community.php b/blocks/community/block_community.php
index fc345caa52115..ab9db50d6b5c0 100644
--- a/blocks/community/block_community.php
+++ b/blocks/community/block_community.php
@@ -48,54 +48,11 @@ function user_can_edit() {
     }
 
     function get_content() {
-        global $CFG, $OUTPUT, $USER;
-
-        $coursecontext = context::instance_by_id($this->instance->parentcontextid);
-
-        if (!has_capability('moodle/community:add', $coursecontext)
-                or $this->content !== NULL) {
-            return $this->content;
-        }
-
         $this->content = new stdClass();
         $this->content->items = array();
         $this->content->icons = array();
         $this->content->footer = '';
-
-        if (!isloggedin()) {
-            return $this->content;
-        }
-
-        $icon = $OUTPUT->pix_icon('i/group', get_string('group'));
-        $addcourseurl = new moodle_url('/blocks/community/communitycourse.php',
-                        array('add' => true, 'courseid' => $this->page->course->id));
-        $searchlink = html_writer::tag('a', $icon . get_string('addcourse', 'block_community'),
-                        array('href' => $addcourseurl->out(false)));
-        $this->content->items[] = $searchlink;
-
-        require_once($CFG->dirroot . '/blocks/community/locallib.php');
-        $communitymanager = new block_community_manager();
-        $courses = $communitymanager->block_community_get_courses($USER->id);
-        if ($courses) {
-            $this->content->items[] = html_writer::empty_tag('hr');
-            $this->content->icons[] = '';
-            $this->content->items[] = get_string('mycommunities', 'block_community');
-            $this->content->icons[] = '';
-            foreach ($courses as $course) {
-                //delete link
-                $deleteicon = $OUTPUT->pix_icon('t/delete', get_string('removecommunitycourse', 'block_community'));
-                $deleteurl = new moodle_url('/blocks/community/communitycourse.php',
-                                array('remove' => true,
-                                    'courseid' => $this->page->course->id,
-                                    'communityid' => $course->id, 'sesskey' => sesskey()));
-                $deleteatag = html_writer::tag('a', $deleteicon, array('href' => $deleteurl));
-
-                $courselink = html_writer::tag('a', $course->coursename,
-                                array('href' => $course->courseurl));
-                $this->content->items[] = $courselink . ' ' . $deleteatag;
-                $this->content->icons[] = '';
-            }
-        }
+        $this->content->items[] = get_string('functionalityremoved', 'error');
 
         return $this->content;
     }
diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php
index 0bdc51e15f01b..1a593de5c9af3 100644
--- a/blocks/community/db/upgrade.php
+++ b/blocks/community/db/upgrade.php
@@ -58,5 +58,8 @@ function xmldb_block_community_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/community/lang/en/block_community.php b/blocks/community/lang/en/block_community.php
index 73e65d4ca46ad..0f7c64b860331 100644
--- a/blocks/community/lang/en/block_community.php
+++ b/blocks/community/lang/en/block_community.php
@@ -64,7 +64,7 @@
 Others are course templates provided for you to download and use on your own Moodle site.';
 $string['enrollable'] = 'courses I can enrol in';
 $string['enrollablecourses'] = 'Enrollable courses';
-$string['errorcourselisting'] = 'An error occurred when retrieving the course listing from the selected hub, please try again later. ({$a})';
+$string['errorcourselisting'] = 'Please note: It is no longer possible to search for community courses on moodle.net. Previously shared courses for download are now available on archive.moodle.net. See <a href="https://docs.moodle.org/en/Sunsetting_moodle.net">Sunsetting moodle.net</a> for further details.';
 $string['errorhublisting'] = 'An error occurred when retrieving the hub listing from Moodle.org, please try again later. ({$a})';
 $string['fileinfo'] = 'Language: {$a->lang} - License: {$a->license} -  Time updated: {$a->timeupdated}';
 $string['hideall'] = 'Hide hubs';
diff --git a/blocks/completionstatus/db/upgrade.php b/blocks/completionstatus/db/upgrade.php
index 8a9ec8966cf84..6d78948074050 100644
--- a/blocks/completionstatus/db/upgrade.php
+++ b/blocks/completionstatus/db/upgrade.php
@@ -60,5 +60,8 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php
index fb0cbaefb3138..f5732e5fce33c 100644
--- a/blocks/course_summary/db/upgrade.php
+++ b/blocks/course_summary/db/upgrade.php
@@ -60,5 +60,8 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php
index 4949b3f3a17b6..62d89a65971f6 100644
--- a/blocks/html/db/upgrade.php
+++ b/blocks/html/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_block_html_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/myoverview/db/upgrade.php b/blocks/myoverview/db/upgrade.php
new file mode 100644
index 0000000000000..702f91c8e4c28
--- /dev/null
+++ b/blocks/myoverview/db/upgrade.php
@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file keeps track of upgrades to the myoverview block
+ *
+ * @since 3.7.3
+ * @package block_myoverview
+ * @copyright 2019 Jake Dallimore <jrhdallimore@gmail.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Upgrade code for the MyOverview block.
+ *
+ * @param int $oldversion
+ */
+function xmldb_block_myoverview_upgrade($oldversion) {
+    global $DB;
+
+    if ($oldversion < 2019052001) {
+        // Remove orphaned course favourites, which weren't being deleted when the course was deleted.
+        $sql = 'SELECT f.id
+                  FROM {favourite} f
+             LEFT JOIN {course} c
+                    ON (c.id = f.itemid)
+                 WHERE f.component = :component
+                   AND f.itemtype = :itemtype
+                   AND c.id IS NULL';
+        $params = ['component' => 'core_course', 'itemtype' => 'courses'];
+
+        if ($records = $DB->get_fieldset_sql($sql, $params)) {
+            $chunks = array_chunk($records, 1000);
+            foreach ($chunks as $chunk) {
+                list($insql, $inparams) = $DB->get_in_or_equal($chunk);
+                $DB->delete_records_select('favourite', "id $insql", $inparams);
+            }
+        }
+
+        upgrade_block_savepoint(true, 2019052001, 'myoverview', false);
+    }
+
+    return true;
+}
diff --git a/blocks/myoverview/lang/en/block_myoverview.php b/blocks/myoverview/lang/en/block_myoverview.php
index 79a0b786dd613..36d7496e9e9c1 100644
--- a/blocks/myoverview/lang/en/block_myoverview.php
+++ b/blocks/myoverview/lang/en/block_myoverview.php
@@ -37,7 +37,7 @@
 $string['aria:favourites'] = 'Show starred courses';
 $string['aria:future'] = 'Show future courses';
 $string['aria:groupingdropdown'] = 'Grouping drop-down menu';
-$string['aria:inprogress'] = 'Show in courses in progress';
+$string['aria:inprogress'] = 'Show courses in progress';
 $string['aria:lastaccessed'] = 'Sort courses by last accessed date';
 $string['aria:list'] = 'Switch to list view';
 $string['aria:title'] = 'Sort courses by course name';
diff --git a/blocks/myoverview/lib.php b/blocks/myoverview/lib.php
index d5bc9e23f197b..933a173b9fc6f 100644
--- a/blocks/myoverview/lib.php
+++ b/blocks/myoverview/lib.php
@@ -121,3 +121,14 @@ function block_myoverview_user_preferences() {
 
     return $preferences;
 }
+
+/**
+ * Pre-delete course hook to cleanup any records with references to the deleted course.
+ *
+ * @param stdClass $course The deleted course
+ */
+function block_myoverview_pre_course_delete(\stdClass $course) {
+    // Removing any starred courses which have been created for users, for this course.
+    $service = \core_favourites\service_factory::get_service_for_component('core_course');
+    $service->delete_favourites_by_type_and_item('courses', $course->id);
+}
diff --git a/blocks/myoverview/templates/view-cards.mustache b/blocks/myoverview/templates/view-cards.mustache
index b940a1e414af2..d3527fff9461c 100644
--- a/blocks/myoverview/templates/view-cards.mustache
+++ b/blocks/myoverview/templates/view-cards.mustache
@@ -29,7 +29,8 @@
                 "fullname": "course 3",
                 "hasprogress": true,
                 "progress": 10,
-                "coursecategory": "Miscellaneous"
+                "coursecategory": "Miscellaneous",
+                "visible": true
             }
         ]
     }
@@ -55,7 +56,7 @@
         <span class="sr-only">
             {{#str}}aria:coursecategory, core_course{{/str}}
         </span>
-        <span class="categoryname">
+        <span class="categoryname text-truncate">
             {{{coursecategory}}}
         </span>
     {{/coursecategory}}
diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache
index ab98fcb1e5422..37992f044f55f 100644
--- a/blocks/myoverview/templates/view-list.mustache
+++ b/blocks/myoverview/templates/view-list.mustache
@@ -29,7 +29,8 @@
                 "fullname": "course 3",
                 "hasprogress": true,
                 "progress": 10,
-                "coursecategory": "Miscellaneous"
+                "coursecategory": "Miscellaneous",
+                "visible": true
             }
         ]
     }
@@ -65,6 +66,11 @@
                         </span>
                         {{{fullname}}}
                     </a>
+                    {{^visible}}
+                        <div class="d-flex flex-wrap">
+                            <span class="tag tag-info">{{#str}} hiddenfromstudents {{/str}}</span>
+                        </div>
+                    {{/visible}}
                 </div>
             </div>
             {{#hasprogress}}
diff --git a/blocks/myoverview/templates/view-summary.mustache b/blocks/myoverview/templates/view-summary.mustache
index a57c69062517e..26bcdcc07d995 100644
--- a/blocks/myoverview/templates/view-summary.mustache
+++ b/blocks/myoverview/templates/view-summary.mustache
@@ -30,7 +30,8 @@
                 "summary": "This course is about assignments",
                 "hasprogress": true,
                 "progress": 10,
-                "coursecategory": "Miscellaneous"
+                "coursecategory": "Miscellaneous",
+                "visible": true
             }
         ]
     }
@@ -75,6 +76,11 @@
                     </a>
                     {{> block_myoverview/course-action-menu }}
                 </div>
+                {{^visible}}
+                    <div class="d-flex flex-wrap">
+                         <span class="tag tag-info">{{#str}} hiddenfromstudents {{/str}}</span>
+                     </div>
+                {{/visible}}
                 <div class="summary">
                     <span class="sr-only">{{#str}}aria:coursesummary, block_myoverview{{/str}}</span>
                     {{{summary}}}
diff --git a/blocks/myoverview/version.php b/blocks/myoverview/version.php
index bc9f98366748d..728053a0a0ab7 100644
--- a/blocks/myoverview/version.php
+++ b/blocks/myoverview/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019052000;         // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2019052001;         // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2019051100;         // Requires this Moodle version.
 $plugin->component = 'block_myoverview'; // Full name of the plugin (used for diagnostics).
diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php
index 97b106317ca71..1022e847e4c18 100644
--- a/blocks/navigation/db/upgrade.php
+++ b/blocks/navigation/db/upgrade.php
@@ -67,5 +67,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/quiz_results/db/upgrade.php b/blocks/quiz_results/db/upgrade.php
index 60b035ecaebaa..055bb61561f52 100644
--- a/blocks/quiz_results/db/upgrade.php
+++ b/blocks/quiz_results/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_quiz_results_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/recent_activity/db/upgrade.php b/blocks/recent_activity/db/upgrade.php
index 77e6f61c86165..1ad6e1aa1c982 100644
--- a/blocks/recent_activity/db/upgrade.php
+++ b/blocks/recent_activity/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_block_recent_activity_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/recentlyaccessedcourses/templates/course-card.mustache b/blocks/recentlyaccessedcourses/templates/course-card.mustache
index 7b98a5eb2034e..064935d87ae59 100644
--- a/blocks/recentlyaccessedcourses/templates/course-card.mustache
+++ b/blocks/recentlyaccessedcourses/templates/course-card.mustache
@@ -40,5 +40,8 @@
         </span>
         <span class="text-truncate">{{{coursecategory}}}</span>
     {{/coursecategory}}
+    {{$divider}}
+        <div class="pl-1 pr-1">|</div>
+    {{/divider}}
     {{$coursename}} <span class="text-truncate">{{{fullname}}}</span> {{/coursename}}
 {{/ core_course/coursecard }}
diff --git a/blocks/recentlyaccesseditems/classes/helper.php b/blocks/recentlyaccesseditems/classes/helper.php
index b7d2b72af6f63..d1ac05b74baad 100644
--- a/blocks/recentlyaccesseditems/classes/helper.php
+++ b/blocks/recentlyaccesseditems/classes/helper.php
@@ -53,11 +53,13 @@ public static function get_recent_items(int $limit = 0) {
             return $recentitems;
         }
 
-        // Determine sort sql clause.
-        $sort = 'timeaccess DESC';
-
         $paramsql = array('userid' => $userid);
-        $records = $DB->get_records('block_recentlyaccesseditems', $paramsql, $sort);
+        $sql = "SELECT rai.*
+                  FROM {block_recentlyaccesseditems} rai
+                  JOIN {course} c ON c.id = rai.courseid
+                 WHERE userid = :userid
+                 ORDER BY rai.timeaccess DESC";
+        $records = $DB->get_records_sql($sql, $paramsql);
         $order = 0;
 
         // Get array of items by course. Use $order index to keep sql sorted results.
diff --git a/blocks/recentlyaccesseditems/db/upgrade.php b/blocks/recentlyaccesseditems/db/upgrade.php
new file mode 100644
index 0000000000000..8da5ad1eb00c7
--- /dev/null
+++ b/blocks/recentlyaccesseditems/db/upgrade.php
@@ -0,0 +1,73 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file keeps track of upgrades to the recentlyaccesseditems block
+ *
+ * Sometimes, changes between versions involve alterations to database structures
+ * and other major things that may break installations.
+ *
+ * The upgrade function in this file will attempt to perform all the necessary
+ * actions to upgrade your older installation to the current version.
+ *
+ * If there's something it cannot do itself, it will tell you what you need to do.
+ *
+ * The commands in here will all be database-neutral, using the methods of
+ * database_manager class
+ *
+ * Please do not forget to use upgrade_set_timeout()
+ * before any action that may take longer time to finish.
+ *
+ * @package block_recentlyaccesseditems
+ * @copyright 2019 Peter Dias
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Upgrade the recentlyaccesseditems db table.
+ *
+ * @param $oldversion
+ * @return bool
+ */
+function xmldb_block_recentlyaccesseditems_upgrade($oldversion, $block) {
+    global $DB;
+
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+    if ($oldversion < 2019052001) {
+        // Query the items to be deleted as a list of IDs. We cannot delete directly from this as a
+        // subquery because MySQL does not support delete with subqueries.
+        $fordeletion = $DB->get_fieldset_sql("
+                SELECT rai.id
+                  FROM {block_recentlyaccesseditems} rai
+             LEFT JOIN {course} c ON c.id = rai.courseid
+             LEFT JOIN {course_modules} cm ON cm.id = rai.cmid
+                 WHERE c.id IS NULL OR cm.id IS NULL");
+
+        // Delete the array in chunks of 500 (Oracle does not support more than 1000 parameters,
+        // let's leave some leeway, there are likely only one chunk anyway).
+        $chunks = array_chunk($fordeletion, 500);
+        foreach ($chunks as $chunk) {
+            $DB->delete_records_list('block_recentlyaccesseditems', 'id', $chunk);
+        }
+
+        upgrade_block_savepoint(true, 2019052001, 'recentlyaccesseditems', false);
+    }
+
+    return true;
+}
diff --git a/blocks/recentlyaccesseditems/lib.php b/blocks/recentlyaccesseditems/lib.php
new file mode 100644
index 0000000000000..eedf29d4b26fe
--- /dev/null
+++ b/blocks/recentlyaccesseditems/lib.php
@@ -0,0 +1,47 @@
+<?php
+// This file is part of Moodle - https://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * The interface library between the core and the subsystem.
+ *
+ * @package     block_recentlyaccesseditems
+ * @copyright   2019 Peter Dias <peter@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Pre-delete course module hook to cleanup any records with references to the deleted module.
+ *
+ * @param stdClass $cm The deleted course module
+ */
+function block_recentlyaccesseditems_pre_course_module_delete($cm) {
+    global $DB;
+
+    $DB->delete_records('block_recentlyaccesseditems', ['cmid' => $cm->id]);
+}
+
+/**
+ * Pre-delete course hook to cleanup any records with references to the deleted course.
+ *
+ * @param stdClass $course The deleted course
+ */
+function block_recentlyaccesseditems_pre_course_delete($course) {
+    global $DB;
+
+    $DB->delete_records('block_recentlyaccesseditems', ['courseid' => $course->id]);
+}
diff --git a/blocks/recentlyaccesseditems/tests/externallib_test.php b/blocks/recentlyaccesseditems/tests/externallib_test.php
index 62de36a2340fb..b6d6b5e94396a 100644
--- a/blocks/recentlyaccesseditems/tests/externallib_test.php
+++ b/blocks/recentlyaccesseditems/tests/externallib_test.php
@@ -103,5 +103,15 @@ public function test_get_recent_items() {
             }
             $this->assertTrue($record->timeaccess < $result[$key - 1]->timeaccess);
         }
+
+        // Delete a course and confirm it's activities don't get returned.
+        delete_course($courses[0], false);
+        $result = \block_recentlyaccesseditems\external::get_recent_items();
+        $this->assertCount((count($forum) + count($chat)) - 2, $result);
+
+        // Delete a single course module should still return.
+        course_delete_module($forum[1]->cmid);
+        $result = \block_recentlyaccesseditems\external::get_recent_items();
+        $this->assertCount((count($forum) + count($chat)) - 3, $result);
     }
 }
\ No newline at end of file
diff --git a/blocks/recentlyaccesseditems/tests/helper_test.php b/blocks/recentlyaccesseditems/tests/helper_test.php
new file mode 100644
index 0000000000000..aed88638bb044
--- /dev/null
+++ b/blocks/recentlyaccesseditems/tests/helper_test.php
@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Block recentlyaccesseditems helper tests.
+ *
+ * @package    block_recentlyaccesseditems
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+use block_recentlyaccesseditems\helper;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Block Recently accessed helper class tests.
+ *
+ * @package    block_recentlyaccesseditems
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class block_recentlyaccesseditems_helper_testcase extends advanced_testcase {
+    /**
+     * Tests that the get recent items method can handle getting records when courses have been deleted.
+     */
+    public function test_get_recent_items() {
+        $this->resetAfterTest();
+        $course = self::getDataGenerator()->create_course();
+        $coursetodelete = self::getDataGenerator()->create_course();
+        $user = self::getDataGenerator()->create_and_enrol($course, 'student');
+        self::getDataGenerator()->enrol_user($user->id, $coursetodelete->id, 'student');
+
+        // Add an activity to each course.
+        $forum = self::getDataGenerator()->create_module('forum', ['course' => $course]);
+        $glossary = self::getDataGenerator()->create_module('glossary', ['course' => $coursetodelete]);
+        self::setUser($user);
+
+        // Get the user to visit the activities.
+        $event1params = ['context' => context_module::instance($forum->cmid), 'objectid' => $forum->id];
+        $event1 = \mod_forum\event\course_module_viewed::create($event1params);
+        $event1->trigger();
+        $event2params = ['context' => context_module::instance($glossary->cmid), 'objectid' => $glossary->id];
+        $event2 = \mod_glossary\event\course_module_viewed::create($event2params);
+        $event2->trigger();
+        $recent1 = helper::get_recent_items();
+        self::assertCount(2, $recent1);
+        $recentlimited = helper::get_recent_items(1);
+        self::assertCount(1, $recentlimited);
+        delete_course($coursetodelete, false);
+
+        // There should be no errors if a course has been deleted.
+        $recent2 = helper::get_recent_items();
+        self::assertCount(1, $recent2);
+    }
+}
diff --git a/blocks/recentlyaccesseditems/tests/privacy_test.php b/blocks/recentlyaccesseditems/tests/privacy_test.php
index 8c5ab6957e487..92152c5605f2a 100644
--- a/blocks/recentlyaccesseditems/tests/privacy_test.php
+++ b/blocks/recentlyaccesseditems/tests/privacy_test.php
@@ -207,6 +207,60 @@ public function test_export_user_data() {
         // Confirm student's data is exported.
         $writer = \core_privacy\local\request\writer::with_context($studentcontext);
         $this->assertTrue($writer->has_any_data());
+
+        delete_course($course, false);
+        $sc = context_user::instance($student->id);
+        $approvedlist = new approved_contextlist($student, $component, [$sc->id]);
+        provider::export_user_data($approvedlist);
+        $writer = \core_privacy\local\request\writer::with_context($sc);
+        $this->assertTrue($writer->has_any_data());
+    }
+
+    /**
+     * Test exporting data for an approved contextlist with a deleted course
+     */
+    public function test_export_user_data_with_deleted_course() {
+        global $DB;
+
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator();
+        $component = 'block_recentlyaccesseditems';
+
+        $student = $generator->create_user();
+        $studentcontext = context_user::instance($student->id);
+
+        // Enrol user in course and add course items.
+        $course = $generator->create_course();
+        $generator->enrol_user($student->id, $course->id, 'student');
+        $forum = $generator->create_module('forum', ['course' => $course]);
+        $chat = $generator->create_module('chat', ['course' => $course]);
+
+        // Generate some recent activity.
+        $this->setUser($student);
+        $event = \mod_forum\event\course_module_viewed::create(['context' => context_module::instance($forum->cmid),
+                'objectid' => $forum->id]);
+        $event->trigger();
+        $event = \mod_chat\event\course_module_viewed::create(['context' => context_module::instance($chat->cmid),
+                'objectid' => $chat->id]);
+        $event->trigger();
+
+        // Confirm data is present.
+        $params = [
+            'courseid' => $course->id,
+            'userid' => $student->id,
+        ];
+
+        $result = $DB->count_records('block_recentlyaccesseditems', $params);
+        $this->assertEquals(2, $result);
+        delete_course($course, false);
+
+        // Export data for student.
+        $approvedlist = new approved_contextlist($student, $component, [$studentcontext->id]);
+        provider::export_user_data($approvedlist);
+
+        // Confirm student's data is exported.
+        $writer = \core_privacy\local\request\writer::with_context($studentcontext);
+        $this->assertFalse($writer->has_any_data());
     }
 
     /**
diff --git a/blocks/recentlyaccesseditems/version.php b/blocks/recentlyaccesseditems/version.php
index c96794f089f7d..d60ba3c52febe 100644
--- a/blocks/recentlyaccesseditems/version.php
+++ b/blocks/recentlyaccesseditems/version.php
@@ -22,6 +22,6 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019052000;            // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2019052001;            // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2019051100;            // Requires this Moodle version.
 $plugin->component = 'block_recentlyaccesseditems'; // Full name of the plugin (used for diagnostics).
diff --git a/blocks/rss_client/db/upgrade.php b/blocks/rss_client/db/upgrade.php
index 878f198c3f947..84dc47033e295 100644
--- a/blocks/rss_client/db/upgrade.php
+++ b/blocks/rss_client/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_block_rss_client_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/rss_client/lang/en/block_rss_client.php b/blocks/rss_client/lang/en/block_rss_client.php
index afc0bab07b6c4..06facda0af264 100644
--- a/blocks/rss_client/lang/en/block_rss_client.php
+++ b/blocks/rss_client/lang/en/block_rss_client.php
@@ -43,7 +43,7 @@
 $string['editnewsfeeds'] = 'Edit news feeds';
 $string['editrssblock'] = 'Edit RSS headline block';
 $string['enableautodiscovery'] = 'Enable auto-discovery of feeds?';
-$string['enableautodiscovery_help'] = 'If enabled, feeds on web pages are found automatically. For example, if http://docs.moodle.org is entered, then http://docs.moodle.org/en/index.php?title=Special:RecentChanges&feed=rss would be found.';
+$string['enableautodiscovery_help'] = 'If enabled, feeds on web pages are found automatically. For example, if https://docs.moodle.org is entered, then https://docs.moodle.org/en/index.php?title=Special:RecentChanges&feed=rss would be found.';
 $string['failedfeed'] = 'Feed failed to download - will retry after {$a}';
 $string['failedfeeds'] = 'One or more RSS feeds have failed';
 $string['feed'] = 'Feed';
diff --git a/blocks/section_links/db/upgrade.php b/blocks/section_links/db/upgrade.php
index 0a8e2b0421b9c..41638f4753ba5 100644
--- a/blocks/section_links/db/upgrade.php
+++ b/blocks/section_links/db/upgrade.php
@@ -61,5 +61,8 @@ function xmldb_block_section_links_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/selfcompletion/db/upgrade.php b/blocks/selfcompletion/db/upgrade.php
index 9b8d87bddb055..92b3268f797c0 100644
--- a/blocks/selfcompletion/db/upgrade.php
+++ b/blocks/selfcompletion/db/upgrade.php
@@ -60,5 +60,8 @@ function xmldb_block_selfcompletion_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php
index 7b8618d76b6ad..f2b732712f1f6 100644
--- a/blocks/settings/db/upgrade.php
+++ b/blocks/settings/db/upgrade.php
@@ -67,5 +67,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/site_main_menu/tests/behat/behat_block_site_main_menu.php b/blocks/site_main_menu/tests/behat/behat_block_site_main_menu.php
index f523116205902..b80713c60c69e 100644
--- a/blocks/site_main_menu/tests/behat/behat_block_site_main_menu.php
+++ b/blocks/site_main_menu/tests/behat/behat_block_site_main_menu.php
@@ -114,12 +114,8 @@ public function i_click_on_in_the_activity_in_site_main_menu_block($element, $se
     protected function get_site_menu_activity_element($element, $selectortype, $activityname) {
         $activitynode = $this->get_site_menu_activity_node($activityname);
 
-        // Transforming to Behat selector/locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-        $exception = new ElementNotFoundException($this->getSession(), '"' . $element . '" "' .
-            $selectortype . '" in "' . $activityname . '" ');
-
-        return $this->find($selector, $locator, $exception, $activitynode);
+        $exception = new ElementNotFoundException($this->getSession(), "'{$element}' '{$selectortype}' in '${activityname}'");
+        return $this->find($selectortype, $element, $exception, $activitynode);
     }
 
     /**
diff --git a/blocks/social_activities/tests/behat/behat_block_social_activities.php b/blocks/social_activities/tests/behat/behat_block_social_activities.php
index 2fe5526d473d8..167b24d51a2c0 100644
--- a/blocks/social_activities/tests/behat/behat_block_social_activities.php
+++ b/blocks/social_activities/tests/behat/behat_block_social_activities.php
@@ -56,7 +56,11 @@ protected function get_social_block_activity_node($activityname) {
     }
 
     /**
-     * Checks that the specified activity's action menu contains an item.
+     * Checks that the specified activity in the social activities block should have the specified editing icon.
+     *
+     * This includes items in the action menu for the item (does not require it to be open)
+     *
+     * You should be in the course page with editing mode turned on.
      *
      * @Then /^"(?P<activity_name_string>(?:[^"]|\\")*)" activity in social activities block should have "(?P<icon_name_string>(?:[^"]|\\")*)" editing icon$/
      * @param string $activityname
@@ -71,7 +75,11 @@ public function activity_in_social_activities_block_should_have_editing_icon($ac
     }
 
     /**
-     * Checks that the specified activity's action menu contains an item.
+     * Checks that the specified activity in the social activities block should not have the specified editing icon.
+     *
+     * This includes items in the action menu for the item (does not require it to be open)
+     *
+     * You should be in the course page with editing mode turned on.
      *
      * @Then /^"(?P<activity_name_string>(?:[^"]|\\")*)" activity in social activities block should not have "(?P<icon_name_string>(?:[^"]|\\")*)" editing icon$/
      * @param string $activityname
@@ -103,7 +111,7 @@ public function i_click_on_in_the_activity_in_social_activities_block($element,
     }
 
     /**
-     * Clicks on the specified element inside the activity container.
+     * Finds the element containing a specific activity in the social activity block.
      *
      * @throws ElementNotFoundException
      * @param string $element
@@ -114,16 +122,12 @@ public function i_click_on_in_the_activity_in_social_activities_block($element,
     protected function get_social_block_activity_element($element, $selectortype, $activityname) {
         $activitynode = $this->get_social_block_activity_node($activityname);
 
-        // Transforming to Behat selector/locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-        $exception = new ElementNotFoundException($this->getSession(), '"' . $element . '" "' .
-            $selectortype . '" in "' . $activityname . '" ');
-
-        return $this->find($selector, $locator, $exception, $activitynode);
+        $exception = new ElementNotFoundException($this->getSession(), "'{$element}' '{$selectortype}' in '${activityname}'");
+        return $this->find($selectortype, $element, $exception, $activitynode);
     }
 
     /**
-     * Checks that the specified activity is hidden.
+     * Checks that the specified activity is hidden in the social activities block.
      *
      * @Then /^"(?P<activity_name_string>(?:[^"]|\\")*)" activity in social activities block should be hidden$/
      * @param string $activityname
@@ -133,7 +137,7 @@ public function activity_in_social_activities_block_should_be_hidden($activityna
     }
 
     /**
-     * Checks that the specified activity is hidden.
+     * Checks that the specified activity is hidden in the social activities block.
      *
      * @Then /^"(?P<activity_name_string>(?:[^"]|\\")*)" activity in social activities block should be available but hidden from course page$/
      * @param string $activityname
@@ -143,7 +147,7 @@ public function activity_in_social_activities_block_should_be_available_but_hidd
     }
 
     /**
-     * Opens an activity actions menu if it is not already opened.
+     * Opens an activity actions menu in the social activities block if it is not already opened.
      *
      * @Given /^I open "(?P<activity_name_string>(?:[^"]|\\")*)" actions menu in social activities block$/
      * @throws DriverException The step is not available when Javascript is disabled
diff --git a/blocks/starredcourses/classes/external.php b/blocks/starredcourses/classes/external.php
index f5cb1c2c04d17..d1ace2cd0f3fd 100644
--- a/blocks/starredcourses/classes/external.php
+++ b/blocks/starredcourses/classes/external.php
@@ -88,13 +88,18 @@ public static function get_starred_courses($limit, $offset) {
             return ($a->timemodified > $b->timemodified) ? -1 : 1;
         });
 
-        $formattedcourses = array_map(function($favourite) use ($renderer) {
+        $formattedcourses = array();
+        foreach ($favourites as $favourite) {
             $course = get_course($favourite->itemid);
             $context = \context_course::instance($favourite->itemid);
-
-            $exporter = new course_summary_exporter($course, ['context' => $context, 'isfavourite' => true]);
-            return $exporter->export($renderer);
-        }, $favourites);
+            $canviewhiddencourses = has_capability('moodle/course:viewhiddencourses', $context);
+
+            if ($course->visible || $canviewhiddencourses) {
+                $exporter = new course_summary_exporter($course, ['context' => $context, 'isfavourite' => true]);
+                $formattedcourse = $exporter->export($renderer);
+                $formattedcourses[] = $formattedcourse;
+            }
+        }
 
         return $formattedcourses;
     }
diff --git a/blocks/timeline/amd/build/event_list.min.js b/blocks/timeline/amd/build/event_list.min.js
index 893a2ac780254..43ae0c6fea054 100644
--- a/blocks/timeline/amd/build/event_list.min.js
+++ b/blocks/timeline/amd/build/event_list.min.js
@@ -1 +1 @@
-define(["jquery","core/notification","core/templates","core/paged_content_factory","core/str","core/user_date","block_timeline/calendar_events_repository"],function(a,b,c,d,e,f,g){var h=86400,i={EMPTY_MESSAGE:'[data-region="empty-message"]',ROOT:'[data-region="event-list-container"]',EVENT_LIST_CONTENT:'[data-region="event-list-content"]',EVENT_LIST_LOADING_PLACEHOLDER:'[data-region="event-list-loading-placeholder"]'},j={EVENT_LIST_CONTENT:"block_timeline/event-list-content"},k={ignoreControlWhileLoading:!0,controlPlacementBottom:!0,ariaLabels:{itemsperpagecomponents:"ariaeventlistpagelimit, block_timeline"}},l=function(a){a.find(i.EVENT_LIST_CONTENT).addClass("hidden"),a.find(i.EMPTY_MESSAGE).removeClass("hidden")},m=function(a){a.find(i.EVENT_LIST_CONTENT).removeClass("hidden"),a.find(i.EMPTY_MESSAGE).addClass("hidden")},n=function(a){a.find(i.EVENT_LIST_CONTENT).empty()},o=function(a,b){var c={},d={eventsbyday:[]};return a.forEach(function(a){var d=f.getUserMidnightForTimestamp(a.timesort,b);c[d]?c[d].push(a):c[d]=[a]}),Object.keys(c).forEach(function(a){var e=c[a];d.eventsbyday.push({past:a<b,dayTimestamp:a,events:e})}),d},p=function(a,b){var d=o(a,b),e=j.EVENT_LIST_CONTENT;return c.render(e,d)},q=function(a,b,c,d,e,f){var i=a+c*h,j=void 0!=d&&a+d*h,k={starttime:i,limit:b};return e&&(k.aftereventid=e),j&&(k.endtime=j),f?(k.courseid=f,g.queryByCourse(k)):g.queryByTime(k)},r=function(a,b,c,d,e,f,g,h){for(var i=a.pageNumber,j=a.limit,k=i;!d.hasOwnProperty(k);)k--;var l=d[k],m=null;return m=e&&e.hasOwnProperty(i)?e[i]:q(c,j+1,g,h,l,f),m.then(function(a){if(!a.events.length)return b.allItemsLoaded(i),[];var c=a.events,d=c.length<=j;return d?b.allItemsLoaded(i):c.pop(),c})},s=function(c,f,g,h,i,j,l,m,n){var o={1:0},q=!1,s=a.extend({},k,n);return e.get_string("ariaeventlistpagelimit","block_timeline",a.isArray(c)?c[0].value:c).then(function(a){return s.ariaLabels.itemsperpage=a,s.ariaLabels.paginationnav=m,a}).then(function(){return d.createWithLimit(c,function(c,d){var e=[];return c.forEach(function(a){var c=a.pageNumber,h=r(a,d,g,o,f,i,j,l).then(function(a){if(a.length){q=!0;var b=a[a.length-1].id;return o[c+1]=b,p(a,g)}return a})["catch"](b.exception);e.push(h)}),a.when.apply(a,e).then(function(){h.resolve(q)})["catch"](function(){h.resolve(q)}),e},s)})},t=function(d,e,f,g,h){d=a(d);var j=a.Deferred(),k=d.find(i.EVENT_LIST_CONTENT),o=d.find(i.EVENT_LIST_LOADING_PLACEHOLDER),p=d.attr("data-course-id"),q=parseInt(d.attr("data-days-offset"),10),r=d.attr("data-days-limit"),t=parseInt(d.attr("data-midnight"),10);return n(d),m(d),o.removeClass("hidden"),void 0!=r&&(r=parseInt(r,10)),s(e,f,t,j,p,q,r,g,h).then(function(b,e){return b=a(b),b.addClass("hidden"),c.replaceNodeContents(k,b,e),j.then(function(a){return b.removeClass("hidden"),o.addClass("hidden"),a||l(d),a})["catch"](function(){return!1}),b})["catch"](b.exception)};return{init:t,rootSelector:i.ROOT}});
\ No newline at end of file
+define(["jquery","core/notification","core/templates","core/paged_content_factory","core/str","core/user_date","block_timeline/calendar_events_repository"],function(a,b,c,d,e,f,g){var h=86400,i={EMPTY_MESSAGE:'[data-region="empty-message"]',ROOT:'[data-region="event-list-container"]',EVENT_LIST_CONTENT:'[data-region="event-list-content"]',EVENT_LIST_LOADING_PLACEHOLDER:'[data-region="event-list-loading-placeholder"]'},j={EVENT_LIST_CONTENT:"block_timeline/event-list-content"},k={ignoreControlWhileLoading:!0,controlPlacementBottom:!0,ariaLabels:{itemsperpagecomponents:"ariaeventlistpagelimit, block_timeline"}},l=function(a){a.find(i.EVENT_LIST_CONTENT).addClass("hidden"),a.find(i.EMPTY_MESSAGE).removeClass("hidden")},m=function(a){a.find(i.EVENT_LIST_CONTENT).removeClass("hidden"),a.find(i.EMPTY_MESSAGE).addClass("hidden")},n=function(a){a.find(i.EVENT_LIST_CONTENT).empty()},o=function(a,b){var c={},d={eventsbyday:[]};return a.forEach(function(a){var d=f.getUserMidnightForTimestamp(a.timesort,b);c[d]?c[d].push(a):c[d]=[a]}),Object.keys(c).forEach(function(a){var e=c[a];d.eventsbyday.push({past:a<b,dayTimestamp:a,events:e})}),d},p=function(a,b){var d=o(a,b),e=j.EVENT_LIST_CONTENT;return c.render(e,d)},q=function(a,b,c,d,e,f){var i=a+c*h,j=void 0!=d&&a+d*h,k={starttime:i,limit:b};return e&&(k.aftereventid=e),j&&(k.endtime=j),f?(k.courseid=f,g.queryByCourse(k)):g.queryByTime(k)},r=function(a,b,c,d,e,g,h,i){for(var j=a.pageNumber,k=a.limit,l=j;!d.hasOwnProperty(l);)l--;var m=d[l],n=null;return n=e&&e.hasOwnProperty(j)?e[j]:q(c,k+1,h,i,m,g),n.then(function(a){if(!a.events.length)return b.allItemsLoaded(j),[];var d=a.events.filter(function(a){if("open"==a.eventtype||"opensubmission"==a.eventtype){var b=f.getUserMidnightForTimestamp(a.timesort,c);return b>c}return!0}),e=d.length<=k;return e?b.allItemsLoaded(j):d.pop(),d})},s=function(c,f,g,h,i,j,l,m,n){var o={1:0},q=!1,s=a.extend({},k,n);return e.get_string("ariaeventlistpagelimit","block_timeline",a.isArray(c)?c[0].value:c).then(function(a){return s.ariaLabels.itemsperpage=a,s.ariaLabels.paginationnav=m,a}).then(function(){return d.createWithLimit(c,function(c,d){var e=[];return c.forEach(function(a){var c=a.pageNumber,h=r(a,d,g,o,f,i,j,l).then(function(a){if(a.length){q=!0;var b=a[a.length-1].id;return o[c+1]=b,p(a,g)}return a})["catch"](b.exception);e.push(h)}),a.when.apply(a,e).then(function(){h.resolve(q)})["catch"](function(){h.resolve(q)}),e},s)})},t=function(d,e,f,g,h){d=a(d);var j=a.Deferred(),k=d.find(i.EVENT_LIST_CONTENT),o=d.find(i.EVENT_LIST_LOADING_PLACEHOLDER),p=d.attr("data-course-id"),q=parseInt(d.attr("data-days-offset"),10),r=d.attr("data-days-limit"),t=parseInt(d.attr("data-midnight"),10);return n(d),m(d),o.removeClass("hidden"),void 0!=r&&(r=parseInt(r,10)),s(e,f,t,j,p,q,r,g,h).then(function(b,e){return b=a(b),b.addClass("hidden"),c.replaceNodeContents(k,b,e),j.then(function(a){return b.removeClass("hidden"),o.addClass("hidden"),a||l(d),a})["catch"](function(){return!1}),b})["catch"](b.exception)};return{init:t,rootSelector:i.ROOT}});
\ No newline at end of file
diff --git a/blocks/timeline/amd/src/event_list.js b/blocks/timeline/amd/src/event_list.js
index 9699ed1c68f20..c7c504e107ac0 100644
--- a/blocks/timeline/amd/src/event_list.js
+++ b/blocks/timeline/amd/src/event_list.js
@@ -265,7 +265,13 @@ function(
                 return [];
             }
 
-            var calendarEvents = result.events;
+            var calendarEvents = result.events.filter(function(event) {
+                if (event.eventtype == "open" || event.eventtype == "opensubmission") {
+                    var dayTimestamp = UserDate.getUserMidnightForTimestamp(event.timesort, midnight);
+                    return dayTimestamp > midnight;
+                }
+                return true;
+            });
             // We expect to receive limit + 1 events back from the server.
             // Any less means there are no more events to load.
             var loadedAll = calendarEvents.length <= limit;
diff --git a/blocks/timeline/templates/event-list-content.mustache b/blocks/timeline/templates/event-list-content.mustache
index b8df729d6d86a..f138e9c57ca42 100644
--- a/blocks/timeline/templates/event-list-content.mustache
+++ b/blocks/timeline/templates/event-list-content.mustache
@@ -65,7 +65,7 @@
 }}
 <div class="border-bottom pb-2">
     {{#eventsbyday}}
-        <h5 class="h6 mt-3 mb-0 {{#past}}text-danger{{/past}}">{{#userdate}} {{dayTimestamp}}, {{#str}} strftimedayshort, core_langconfig {{/str}}  {{/userdate}}</h5>
+        <h5 class="h6 mt-3 mb-0 {{#past}}text-danger{{/past}}">{{#userdate}} {{dayTimestamp}}, {{#str}} strftimedaydate, core_langconfig {{/str}}  {{/userdate}}</h5>
         {{> block_timeline/event-list-items }}
     {{/eventsbyday}}
 </div>
\ No newline at end of file
diff --git a/blocks/timeline/templates/event-list-item.mustache b/blocks/timeline/templates/event-list-item.mustache
index b89e8083160d2..dc98508dcf305 100644
--- a/blocks/timeline/templates/event-list-item.mustache
+++ b/blocks/timeline/templates/event-list-item.mustache
@@ -50,13 +50,16 @@
         </div>
         <div class="w-100 event-name-container text-truncate line-height-3">
             <a href="{{url}}"
-               title="{{name}}"
-               aria-label='{{#str}} ariaeventlistitem, block_timeline, { "name": "{{name}}", "course": "{{course.fullnamedisplay}}", "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/str}}'
-            ><h6 class="event-name text-truncate mb-0">{{{name}}}</h6></a>
-            <small class="text-muted text-truncate mb-0">{{{course.fullnamedisplay}}}</small>
+               title={{#quote}}{{{name}}}{{/quote}}
+               aria-label='{{#str}} ariaeventlistitem, block_timeline, { "name": {{#quote}}{{{name}}}{{/quote}}, "course": {{#quote}}{{{course.fullnamedisplay}}}{{/quote}}, "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/str}}'
+            ><h6 class="event-name text-truncate mb-0">{{#quote}}{{{name}}}{{/quote}}</h6></a>
+            <small class="text-muted text-truncate mb-0">{{#quote}}{{{course.fullnamedisplay}}}{{/quote}}</small>
             {{#action.actionable}}
             <h6 class="mb-0 pt-2">
                 <a href="{{{action.url}}}" aria-label="{{{action.name}}}" title="{{{action.name}}}" class="list-group-item-action">{{{action.name}}}</a>
+                {{#action.showitemcount}}
+                <span class="badge badge-secondary">{{action.itemcount}}</span>
+                {{/action.showitemcount}}
             </h6>
             {{/action.actionable}}
         </div>
diff --git a/blog/classes/privacy/provider.php b/blog/classes/privacy/provider.php
index 4bbc744a1db4d..8ff19c3f03dee 100644
--- a/blog/classes/privacy/provider.php
+++ b/blog/classes/privacy/provider.php
@@ -460,8 +460,7 @@ public static function delete_data_for_user(approved_contextlist $contextlist) {
             $params = array_merge($inparams, ['userid' => $userid]);
             $associds = $DB->get_fieldset_sql($sql, $params);
 
-            list($insql, $inparams) = $DB->get_in_or_equal($associds, SQL_PARAMS_NAMED, 'param', true);
-            $DB->delete_records_select('blog_association', "id $insql", $inparams);
+            $DB->delete_records_list('blog_association', 'id', $associds);
         }
     }
 
diff --git a/blog/rsslib.php b/blog/rsslib.php
index d671d1b52f9ba..37d1968e7026d 100644
--- a/blog/rsslib.php
+++ b/blog/rsslib.php
@@ -83,7 +83,7 @@ function blog_rss_print_link($context, $filtertype, $filterselect = 0, $tagid =
 
     $url = blog_rss_get_url($context->id, $userid, $filtertype, $filterselect, $tagid);
     $rsspix = $OUTPUT->pix_icon('i/rss', get_string('rss'), 'core', array('title' => $tooltiptext));
-    print '<div class="pull-xs-right"><a href="'. $url .'">' . $rsspix . '</a></div>';
+    print '<div class="float-sm-right"><a href="'. $url .'">' . $rsspix . '</a></div>';
 }
 
 /**
diff --git a/blog/tests/privacy_test.php b/blog/tests/privacy_test.php
index 8db5bdd6bd454..700255291da39 100644
--- a/blog/tests/privacy_test.php
+++ b/blog/tests/privacy_test.php
@@ -370,6 +370,37 @@ public function test_delete_data_for_user() {
         $this->assertTrue($DB->record_exists('post', ['courseid' => $c1->id, 'userid' => $u1->id, 'module' => 'notes']));
     }
 
+    /**
+     * Test provider delete_data_for_user with a context that contains no entries
+     *
+     * @return void
+     */
+    public function test_delete_data_for_user_empty_context() {
+        global $DB;
+
+        $user = $this->getDataGenerator()->create_user();
+        $course = $this->getDataGenerator()->create_course();
+        $context = context_course::instance($course->id);
+
+        // Create a blog entry for user, associated with course.
+        $entry = new blog_entry($this->create_post(['userid' => $user->id, 'courseid' => $course->id])->id);
+        $entry->add_association($context->id);
+
+        // Generate list of contexts for user.
+        $contexts = provider::get_contexts_for_userid($user->id);
+        $this->assertContains($context->id, $contexts->get_contextids());
+
+        // Now delete the blog entry.
+        $entry->delete();
+
+        // Try to delete user data using contexts obtained prior to entry deletion.
+        $contextlist = new approved_contextlist($user, 'core_blog', $contexts->get_contextids());
+        provider::delete_data_for_user($contextlist);
+
+        // Sanity check to ensure blog_associations is really empty.
+        $this->assertEmpty($DB->get_records('blog_association', ['contextid' => $context->id]));
+    }
+
     public function test_delete_data_for_all_users_in_context() {
         global $DB;
 
diff --git a/cache/stores/mongodb/MongoDB/LICENSE b/cache/stores/mongodb/MongoDB/LICENSE
new file mode 100644
index 0000000000000..d645695673349
--- /dev/null
+++ b/cache/stores/mongodb/MongoDB/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/cache/stores/mongodb/MongoDB/readme_moodle.txt b/cache/stores/mongodb/MongoDB/readme_moodle.txt
index 456d3fde16492..da6ad07859014 100644
--- a/cache/stores/mongodb/MongoDB/readme_moodle.txt
+++ b/cache/stores/mongodb/MongoDB/readme_moodle.txt
@@ -1,14 +1,15 @@
 MongoDB PHP
 -----------
-
-Downloaded from https://github.com/mongodb/mongo-php-library
-
-Last commit on download: aac8e54009196f6544e50baf9b63dcf0eab3bbdf
-
-This version (1.4) requires PHP mongodb extension >= 1.5
+Download from https://github.com/mongodb/mongo-php-library
 
 Import procedure:
 
 - Copy all the files and folders from the folder mongodb/src in this directory.
 - Copy the license file from the project root.
+- Update thirdpartylibs.xml with the latest version.
+
+2019/03/14
+----------
+Last commit on download: aac8e54009196f6544e50baf9b63dcf0eab3bbdf
 
+This version (1.4.2) requires PHP mongodb extension >= 1.5
diff --git a/cache/stores/mongodb/thirdpartylibs.xml b/cache/stores/mongodb/thirdpartylibs.xml
index bd22d79e9353d..afc8de0e7c483 100644
--- a/cache/stores/mongodb/thirdpartylibs.xml
+++ b/cache/stores/mongodb/thirdpartylibs.xml
@@ -4,7 +4,7 @@
     <location>MongoDB</location>
     <name>MongoDB PHP Library</name>
     <license>Apache</license>
-    <version>1.4</version>
+    <version>1.4.2</version>
     <licenseversion>2.0</licenseversion>
   </library>
 </libraries>
\ No newline at end of file
diff --git a/cache/stores/redis/lib.php b/cache/stores/redis/lib.php
index 83a58892e5bfd..35962002b95ca 100644
--- a/cache/stores/redis/lib.php
+++ b/cache/stores/redis/lib.php
@@ -150,7 +150,8 @@ public function __construct($name, array $configuration = array()) {
      */
     protected function new_redis($server, $prefix = '', $password = '') {
         $redis = new Redis();
-        $port = null;
+        // Check if it isn't a Unix socket to set default port.
+        $port = ($server[0] === '/') ? null : 6379;
         if (strpos($server, ':')) {
             $serverconf = explode(':', $server);
             $server = $serverconf[0];
diff --git a/calendar/amd/build/calendar_filter.min.js b/calendar/amd/build/calendar_filter.min.js
index ddf2010dcef1d..9ce9df0c1b6ab 100644
--- a/calendar/amd/build/calendar_filter.min.js
+++ b/calendar/amd/build/calendar_filter.min.js
@@ -1 +1 @@
-define(["jquery","core_calendar/selectors","core_calendar/events","core/str","core/templates"],function(a,b,c,d,e){var f=function(d){d.on("click",b.eventFilterItem,function(b){var c=a(b.currentTarget);g(c),b.preventDefault()}),a("body").on(c.viewUpdated,function(){var c=d.find(b.eventFilterItem);c.each(function(b,c){if(c=a(c),c.data("eventtype-hidden")){var d=i(c);h(d)}})})},g=function(a){var b=i(a);return b.hidden=!b.hidden,d.get_string("eventtype"+b.eventtype,"calendar").then(function(a){return b.name=a,b}).then(function(a){return e.render("core_calendar/event_filter_key",a)}).then(function(b,c){return e.replaceNode(a,b,c)}).then(function(){h(b)})},h=function(b){M.util.js_pending("month-mini-filterChanged"),a("body").trigger(c.filterChanged,{type:b.eventtype,hidden:b.hidden}),M.util.js_complete("month-mini-filterChanged")},i=function(a){return{eventtype:a.data("eventtype"),hidden:a.data("eventtype-hidden")}};return{init:function(b){b=a(b),f(b)}}});
\ No newline at end of file
+define(["jquery","core_calendar/selectors","core_calendar/events","core/str","core/templates"],function(a,b,c,d,e){var f=function(d){d.on("click",b.eventFilterItem,function(b){var c=a(b.currentTarget);g(c),b.preventDefault()}),a("body").on(c.viewUpdated,function(){var c=d.find(b.eventFilterItem);c.each(function(b,c){if(c=a(c),c.data("eventtype-hidden")){var d=i(c);h(d)}})})},g=function(a){var b=i(a);return b.hidden=!b.hidden,d.get_string("eventtype"+b.eventtype,"calendar").then(function(a){return b.name=a,b.icon=!0,b.key="i/"+b.eventtype+"event",b.component="core",b}).then(function(a){return e.render("core_calendar/event_filter_key",a)}).then(function(b,c){return e.replaceNode(a,b,c)}).then(function(){h(b)})},h=function(b){M.util.js_pending("month-mini-filterChanged"),a("body").trigger(c.filterChanged,{type:b.eventtype,hidden:b.hidden}),M.util.js_complete("month-mini-filterChanged")},i=function(a){return{eventtype:a.data("eventtype"),hidden:a.data("eventtype-hidden")}};return{init:function(b){b=a(b),f(b)}}});
\ No newline at end of file
diff --git a/calendar/amd/src/calendar_filter.js b/calendar/amd/src/calendar_filter.js
index 622dafd890c79..41dd4488e8b65 100644
--- a/calendar/amd/src/calendar_filter.js
+++ b/calendar/amd/src/calendar_filter.js
@@ -67,6 +67,9 @@ function(
         return Str.get_string('eventtype' + data.eventtype, 'calendar')
         .then(function(nameStr) {
             data.name = nameStr;
+            data.icon = true;
+            data.key = 'i/' + data.eventtype + 'event';
+            data.component = 'core';
 
             return data;
         })
diff --git a/calendar/classes/external/event_exporter_base.php b/calendar/classes/external/event_exporter_base.php
index 08d14acf101b2..f761f705bcdc6 100644
--- a/calendar/classes/external/event_exporter_base.php
+++ b/calendar/classes/external/event_exporter_base.php
@@ -275,7 +275,9 @@ protected function get_other_values(renderer_base $output) {
         }
         $timesort = $event->get_times()->get_sort_time()->getTimestamp();
         $iconexporter = new event_icon_exporter($event, ['context' => $context]);
-        $values['normalisedeventtypetext'] = get_string('type' . $values['normalisedeventtype'], 'calendar');
+        $identifier = 'type' . $values['normalisedeventtype'];
+        $stringexists = get_string_manager()->string_exists($identifier, 'calendar');
+        $values['normalisedeventtypetext'] = $stringexists ? get_string($identifier, 'calendar') : '';
 
         $values['icon'] = $iconexporter->export($output);
 
diff --git a/calendar/classes/external/footer_options_exporter.php b/calendar/classes/external/footer_options_exporter.php
index 5d7f198fecbfe..da7b69de58538 100644
--- a/calendar/classes/external/footer_options_exporter.php
+++ b/calendar/classes/external/footer_options_exporter.php
@@ -100,8 +100,6 @@ protected function get_link_params() {
             $params['course'] = $this->calendar->course->id;
         } else if (null !== $this->calendar->categoryid && $this->calendar->categoryid > 0) {
             $params['category'] = $this->calendar->categoryid;
-        } else {
-            $params['course'] = SITEID;
         }
 
         return $params;
diff --git a/calendar/classes/local/event/data_access/event_vault.php b/calendar/classes/local/event/data_access/event_vault.php
index 3d592088d58b1..8a8c20d2f3bb7 100644
--- a/calendar/classes/local/event/data_access/event_vault.php
+++ b/calendar/classes/local/event/data_access/event_vault.php
@@ -100,9 +100,6 @@ public function get_events(
         $ignorehidden = true,
         callable $filter = null
     ) {
-        if ($limitnum < 1 || $limitnum > 200) {
-            throw new limit_invalid_parameter_exception("Limit must be between 1 and 200 (inclusive)");
-        }
 
         $fromquery = function($field, $timefrom, $lastseenmethod, $afterevent, $withduration) {
             if (!$timefrom) {
@@ -186,7 +183,11 @@ public function get_events(
                 }
             }
 
-            $offset += $limitnum;
+            if (!$limitnum) {
+                break;
+            } else {
+                $offset += $limitnum;
+            }
         }
 
         return $events;
diff --git a/calendar/classes/local/event/factories/event_abstract_factory.php b/calendar/classes/local/event/factories/event_abstract_factory.php
index ff697dd581794..b810ff8b5f747 100644
--- a/calendar/classes/local/event/factories/event_abstract_factory.php
+++ b/calendar/classes/local/event/factories/event_abstract_factory.php
@@ -138,7 +138,9 @@ public function create_instance(\stdClass $dbrow) {
             $module = new cm_info_proxy($dbrow->modulename, $dbrow->instance, $dbrow->courseid);
         }
 
-        $category = new coursecat_proxy($dbrow->categoryid);
+        if ($dbrow->categoryid) {
+            $category = new coursecat_proxy($dbrow->categoryid);
+        }
 
         $course = new std_proxy($dbrow->courseid, function($id) {
             return calendar_get_course_cached($this->coursecachereference, $id);
diff --git a/calendar/classes/local/event/forms/eventtype.php b/calendar/classes/local/event/forms/eventtype.php
index b3d582694f12b..d615a50804ba7 100644
--- a/calendar/classes/local/event/forms/eventtype.php
+++ b/calendar/classes/local/event/forms/eventtype.php
@@ -98,7 +98,7 @@ protected function add_event_type_elements($mform, $eventtypes) {
             $mform->hideIf('categoryid', 'eventtype', 'noteq', 'category');
         }
 
-        $showall = $CFG->calendar_adminseesall && !has_capability('moodle/calendar:manageentries', \context_system::instance());
+        $showall = is_siteadmin() && !empty($CFG->calendar_adminseesall);
         if (!empty($eventtypes['course'])) {
             $mform->addElement('course', 'courseid', get_string('course'), ['limittoenrolled' => !$showall]);
             $mform->hideIf('courseid', 'eventtype', 'noteq', 'course');
diff --git a/calendar/classes/local/event/mappers/create_update_form_mapper.php b/calendar/classes/local/event/mappers/create_update_form_mapper.php
index 032d83930b107..e4ef1e80c771a 100644
--- a/calendar/classes/local/event/mappers/create_update_form_mapper.php
+++ b/calendar/classes/local/event/mappers/create_update_form_mapper.php
@@ -70,11 +70,13 @@ public function from_legacy_event_to_data(\calendar_event $legacyevent) {
             'format' => $data->format
         ];
 
-        // We don't want to return the context because it's not a
-        // form value and breaks the validation.
+        // Don't return context or subscription because they're not form values and break validation.
         if (isset($data->context)) {
             unset($data->context);
         }
+        if (isset($data->subscription)) {
+            unset($data->subscription);
+        }
 
         return $data;
     }
diff --git a/calendar/classes/local/event/mappers/event_mapper.php b/calendar/classes/local/event/mappers/event_mapper.php
index 5600ec76bcaf7..dc2ef2cb41696 100644
--- a/calendar/classes/local/event/mappers/event_mapper.php
+++ b/calendar/classes/local/event/mappers/event_mapper.php
@@ -95,6 +95,7 @@ public function from_event_to_legacy_event(event_interface $event) {
 
         // Normalise for the legacy event because it wants zero rather than null.
         $properties->courseid = empty($properties->courseid) ? 0 : $properties->courseid;
+        $properties->categoryid = empty($properties->categoryid) ? 0 : $properties->categoryid;
         $properties->groupid = empty($properties->groupid) ? 0 : $properties->groupid;
         $properties->userid = empty($properties->userid) ? 0 : $properties->userid;
         $properties->modulename = empty($properties->modulename) ? 0 : $properties->modulename;
diff --git a/calendar/export_execute.php b/calendar/export_execute.php
index f87e439e632ff..17b55010e8e6a 100644
--- a/calendar/export_execute.php
+++ b/calendar/export_execute.php
@@ -186,9 +186,9 @@
         die();
     }
 }
-
+$limitnum = 0;
 $events = calendar_get_legacy_events($timestart, $timeend, $users, $groups, array_keys($paramcourses), false, true,
-        $paramcategory);
+        $paramcategory, $limitnum);
 
 $ical = new iCalendar;
 $ical->add_property('method', 'PUBLISH');
diff --git a/calendar/externallib.php b/calendar/externallib.php
index 8d4a3a9398427..c61202a7aec85 100644
--- a/calendar/externallib.php
+++ b/calendar/externallib.php
@@ -676,7 +676,7 @@ public static function create_calendar_events_parameters() {
     }
 
     /**
-     * Delete Calendar events.
+     * Create calendar events.
      *
      * @param array $events A list of events to create.
      * @return array array of events created.
@@ -870,6 +870,11 @@ public static function submit_create_update_form($formdata) {
         self::validate_context($context);
         parse_str($params['formdata'], $data);
 
+        if (WS_SERVER) {
+            // Request via WS, ignore sesskey checks in form library.
+            $USER->ignoresesskey = true;
+        }
+
         $eventtype = isset($data['eventtype']) ? $data['eventtype'] : null;
         $coursekey = ($eventtype == 'group') ? 'groupcourseid' : 'courseid';
         $courseid = (!empty($data[$coursekey])) ? $data[$coursekey] : null;
@@ -1021,8 +1026,8 @@ public static function get_calendar_monthly_view($year, $month, $courseid, $cate
     public static function get_calendar_monthly_view_parameters() {
         return new external_function_parameters(
             [
-                'year' => new external_value(PARAM_INT, 'Month to be viewed', VALUE_REQUIRED),
-                'month' => new external_value(PARAM_INT, 'Year to be viewed', VALUE_REQUIRED),
+                'year' => new external_value(PARAM_INT, 'Year to be viewed', VALUE_REQUIRED),
+                'month' => new external_value(PARAM_INT, 'Month to be viewed', VALUE_REQUIRED),
                 'courseid' => new external_value(PARAM_INT, 'Course being viewed', VALUE_DEFAULT, SITEID, NULL_ALLOWED),
                 'categoryid' => new external_value(PARAM_INT, 'Category being viewed', VALUE_DEFAULT, null, NULL_ALLOWED),
                 'includenavigation' => new external_value(
diff --git a/calendar/lib.php b/calendar/lib.php
index 02c2d971392f5..a9df414b51d15 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -104,6 +104,11 @@
  */
 define('CALENDAR_IMPORT_FROM_URL',  1);
 
+/**
+ * CALENDAR_IMPORT_EVENT_UPDATED_SKIPPED - imported event was skipped
+ */
+define('CALENDAR_IMPORT_EVENT_SKIPPED',  -1);
+
 /**
  * CALENDAR_IMPORT_EVENT_UPDATED - imported event was updated
  */
@@ -2198,8 +2203,8 @@ function calendar_view_event_allowed(calendar_event $event) {
         if (has_capability('moodle/calendar:manageentries', $event->context)) {
             return true;
         }
-        $mycourses = enrol_get_my_courses('id');
-        return isset($mycourses[$event->courseid]);
+
+        return can_access_course(get_course($event->courseid));
     } else if ($event->userid) {
         if ($event->userid != $USER->id) {
             // No-one can ever see another users events.
@@ -2865,11 +2870,23 @@ function calendar_add_icalendar_event($event, $unused = null, $subscriptionid, $
 
     if ($updaterecord = $DB->get_record('event', array('uuid' => $eventrecord->uuid,
         'subscriptionid' => $eventrecord->subscriptionid))) {
-        $eventrecord->id = $updaterecord->id;
-        $return = CALENDAR_IMPORT_EVENT_UPDATED; // Update.
+
+        // Compare iCal event data against the moodle event to see if something has changed.
+        $result = array_diff((array) $eventrecord, (array) $updaterecord);
+
+        // Unset timemodified field because it's always going to be different.
+        unset($result['timemodified']);
+
+        if (count($result)) {
+            $eventrecord->id = $updaterecord->id;
+            $return = CALENDAR_IMPORT_EVENT_UPDATED; // Update.
+        } else {
+            return CALENDAR_IMPORT_EVENT_SKIPPED;
+        }
     } else {
         $return = CALENDAR_IMPORT_EVENT_INSERTED; // Insert.
     }
+
     if ($createdevent = \calendar_event::create($eventrecord, false)) {
         if (!empty($event->properties['RRULE'])) {
             // Repeating events.
@@ -2993,7 +3010,7 @@ function calendar_get_icalendar($url) {
  * Import events from an iCalendar object into a course calendar.
  *
  * @param iCalendar $ical The iCalendar object.
- * @param int $courseid The course ID for the calendar.
+ * @param int $unused Deprecated
  * @param int $subscriptionid The subscription ID.
  * @return string A log of the import progress, including errors.
  */
@@ -3003,18 +3020,13 @@ function calendar_import_icalendar_events($ical, $unused = null, $subscriptionid
     $return = '';
     $eventcount = 0;
     $updatecount = 0;
+    $skippedcount = 0;
 
     // Large calendars take a while...
     if (!CLI_SCRIPT) {
         \core_php_time_limit::raise(300);
     }
 
-    // Mark all events in a subscription with a zero timestamp.
-    if (!empty($subscriptionid)) {
-        $sql = "UPDATE {event} SET timemodified = :time WHERE subscriptionid = :id";
-        $DB->execute($sql, array('time' => 0, 'id' => $subscriptionid));
-    }
-
     // Grab the timezone from the iCalendar file to be used later.
     if (isset($ical->properties['X-WR-TIMEZONE'][0]->value)) {
         $timezone = $ical->properties['X-WR-TIMEZONE'][0]->value;
@@ -3022,8 +3034,9 @@ function calendar_import_icalendar_events($ical, $unused = null, $subscriptionid
         $timezone = 'UTC';
     }
 
-    $return = '';
+    $icaluuids = [];
     foreach ($ical->components['VEVENT'] as $event) {
+        $icaluuids[] = $event->properties['UID'][0]->value;
         $res = calendar_add_icalendar_event($event, null, $subscriptionid, $timezone);
         switch ($res) {
             case CALENDAR_IMPORT_EVENT_UPDATED:
@@ -3032,6 +3045,9 @@ function calendar_import_icalendar_events($ical, $unused = null, $subscriptionid
             case CALENDAR_IMPORT_EVENT_INSERTED:
                 $eventcount++;
                 break;
+            case CALENDAR_IMPORT_EVENT_SKIPPED:
+                $skippedcount++;
+                break;
             case 0:
                 $return .= '<p>' . get_string('erroraddingevent', 'calendar') . ': ';
                 if (empty($event->properties['SUMMARY'])) {
@@ -3044,18 +3060,28 @@ function calendar_import_icalendar_events($ical, $unused = null, $subscriptionid
         }
     }
 
-    $return .= "<p>" . get_string('eventsimported', 'calendar', $eventcount) . "</p> ";
-    $return .= "<p>" . get_string('eventsupdated', 'calendar', $updatecount) . "</p>";
+    $existing = $DB->get_field('event_subscriptions', 'lastupdated', ['id' => $subscriptionid]);
+    if (!empty($existing)) {
+        $eventsuuids = $DB->get_records_menu('event', ['subscriptionid' => $subscriptionid], '', 'id, uuid');
 
-    // Delete remaining zero-marked events since they're not in remote calendar.
-    if (!empty($subscriptionid)) {
-        $deletecount = $DB->count_records('event', array('timemodified' => 0, 'subscriptionid' => $subscriptionid));
-        if (!empty($deletecount)) {
-            $DB->delete_records('event', array('timemodified' => 0, 'subscriptionid' => $subscriptionid));
-            $return .= "<p> " . get_string('eventsdeleted', 'calendar') . ": {$deletecount} </p>\n";
+        $icaleventscount = count($icaluuids);
+        $tobedeleted = [];
+        if (count($eventsuuids) > $icaleventscount) {
+            foreach ($eventsuuids as $eventid => $eventuuid) {
+                if (!in_array($eventuuid, $icaluuids)) {
+                    $tobedeleted[] = $eventid;
+                }
+            }
+            if (!empty($tobedeleted)) {
+                $DB->delete_records_list('event', 'id', $tobedeleted);
+                $return .= "<p> " . get_string('eventsdeleted', 'calendar') . ": " . count($tobedeleted) . "</p> ";
+            }
         }
     }
 
+    $return .= "<p>" . get_string('eventsimported', 'calendar', $eventcount) . "</p> ";
+    $return .= "<p>" . get_string('eventsskipped', 'calendar', $skippedcount) . "</p> ";
+    $return .= "<p>" . get_string('eventsupdated', 'calendar', $updatecount) . "</p>";
     return $return;
 }
 
@@ -3237,10 +3263,12 @@ function core_calendar_user_preferences() {
  *                              or events in progress/already started selected as well
  * @param boolean $ignorehidden whether to select only visible events or all events
  * @param array $categories array of category ids and/or objects.
+ * @param int $limitnum Number of events to fetch or zero to fetch all.
+ *
  * @return array $events of selected events or an empty array if there aren't any (or there was an error)
  */
 function calendar_get_legacy_events($tstart, $tend, $users, $groups, $courses,
-        $withduration = true, $ignorehidden = true, $categories = []) {
+        $withduration = true, $ignorehidden = true, $categories = [], $limitnum = 0) {
     // Normalise the users, groups and courses parameters so that they are compliant with \core_calendar\local\api::get_events().
     // Existing functions that were using the old calendar_get_events() were passing a mixture of array, int, boolean for these
     // parameters, but with the new API method, only null and arrays are accepted.
@@ -3277,7 +3305,7 @@ function calendar_get_legacy_events($tstart, $tend, $users, $groups, $courses,
         null,
         null,
         null,
-        40,
+        $limitnum,
         null,
         $userparam,
         $groupparam,
@@ -3314,7 +3342,7 @@ function calendar_get_view(\calendar_information $calendar, $view, $includenavig
     $calendardate = $type->timestamp_to_date_array($calendar->time);
 
     $date = new \DateTime('now', core_date::get_user_timezone_object(99));
-    $eventlimit = 200;
+    $eventlimit = 0;
 
     if ($view === 'day') {
         $tstart = $type->convert_to_timestamp($calendardate['year'], $calendardate['mon'], $calendardate['mday']);
@@ -3500,7 +3528,7 @@ function calendar_output_fragment_event_form($args) {
         $eventtypes = calendar_get_allowed_event_types($courseid);
 
         // If the user is on course context and is allowed to add course events set the event type default to course.
-        if ($courseid != SITEID && !empty($eventtypes['course'])) {
+        if (!empty($courseid) && !empty($eventtypes['course'])) {
             $data['eventtype'] = 'course';
             $data['courseid'] = $courseid;
             $data['groupcourseid'] = $courseid;
@@ -3641,6 +3669,9 @@ function calendar_get_filter_types() {
         return [
             'eventtype' => $type,
             'name' => get_string("eventtype{$type}", "calendar"),
+            'icon' => true,
+            'key' => 'i/'.$type.'event',
+            'component' => 'core'
         ];
     }, $types);
 }
@@ -3682,23 +3713,8 @@ function calendar_get_allowed_event_types(int $courseid = null) {
 
     if (!empty($courseid) && $courseid != SITEID) {
         $context = \context_course::instance($courseid);
-        $groups = groups_get_all_groups($courseid);
-
         $types['user'] = has_capability('moodle/calendar:manageownentries', $context);
-
-        if (has_capability('moodle/calendar:manageentries', $context) || !empty($CFG->calendar_adminseesall)) {
-            $types['course'] = true;
-
-            $types['group'] = (!empty($groups) && has_capability('moodle/site:accessallgroups', $context))
-                || array_filter($groups, function($group) use ($USER) {
-                    return groups_is_member($group->id);
-                });
-        } else if (has_capability('moodle/calendar:managegroupentries', $context)) {
-            $types['group'] = (!empty($groups) && has_capability('moodle/site:accessallgroups', $context))
-                || array_filter($groups, function($group) use ($USER) {
-                    return groups_is_member($group->id);
-                });
-        }
+        calendar_internal_update_course_and_group_permission($courseid, $context, $types);
     }
 
     if (has_capability('moodle/calendar:manageentries', \context_course::instance(SITEID))) {
@@ -3783,23 +3799,7 @@ function calendar_get_allowed_event_types(int $courseid = null) {
                 context_helper::preload_from_record($coursewithgroup);
                 $context = context_course::instance($coursewithgroup->id);
 
-                if (has_capability('moodle/calendar:manageentries', $context)) {
-                    // The user has access to manage calendar entries for the whole course.
-                    // This includes groups if they have the accessallgroups capability.
-                    $types['course'] = true;
-                    if (has_capability('moodle/site:accessallgroups', $context)) {
-                        // The user also has access to all groups so they can add calendar entries to any group.
-                        // The manageentries capability overrides the managegroupentries capability.
-                        $types['group'] = true;
-                        break;
-                    }
-
-                    if (empty($types['group']) && has_capability('moodle/calendar:managegroupentries', $context)) {
-                        // The user has the managegroupentries capability.
-                        // If they have access to _any_ group, then they can create calendar entries within that group.
-                        $types['group'] = !empty(groups_get_all_groups($coursewithgroup->id, $USER->id));
-                    }
-                }
+                calendar_internal_update_course_and_group_permission($coursewithgroup->id, $context, $types);
 
                 // Okay, course and group event types are allowed, no need to keep the loop iteration.
                 if ($types['course'] == true && $types['group'] == true) {
@@ -3833,3 +3833,43 @@ function calendar_get_allowed_event_types(int $courseid = null) {
 
     return $types;
 }
+
+/**
+ * Given a course id, and context, updates the permission types array to add the 'course' or 'group'
+ * permission if it is relevant for that course.
+ *
+ * For efficiency, if they already have 'course' or 'group' then it skips checks.
+ *
+ * Do not call this function directly, it is only for use by calendar_get_allowed_event_types().
+ *
+ * @param int $courseid Course id
+ * @param context $context Context for that course
+ * @param array $types Current permissions
+ */
+function calendar_internal_update_course_and_group_permission(int $courseid, context $context, array &$types) {
+    if (!$types['course']) {
+        // If they have manageentries permission on the course, then they can update this course.
+        if (has_capability('moodle/calendar:manageentries', $context)) {
+            $types['course'] = true;
+        }
+    }
+    // To update group events they must have EITHER manageentries OR managegroupentries.
+    if (!$types['group'] && (has_capability('moodle/calendar:manageentries', $context) ||
+            has_capability('moodle/calendar:managegroupentries', $context))) {
+        // And they also need for a group to exist on the course.
+        $groups = groups_get_all_groups($courseid);
+        if (!empty($groups)) {
+            // And either accessallgroups, or belong to one of the groups.
+            if (has_capability('moodle/site:accessallgroups', $context)) {
+                $types['group'] = true;
+            } else {
+                foreach ($groups as $group) {
+                    if (groups_is_member($group->id)) {
+                        $types['group'] = true;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/calendar/managesubscriptions.php b/calendar/managesubscriptions.php
index 4837733629e37..9c6af0adacc47 100644
--- a/calendar/managesubscriptions.php
+++ b/calendar/managesubscriptions.php
@@ -127,8 +127,13 @@
 $params = [];
 
 $usedefaultfilters = true;
-if (!empty($courseid) && $courseid == SITEID && !empty($types['site'])) {
+
+if (!empty($types['site'])) {
     $searches[] = "(eventtype = 'site')";
+    $usedefaultfilters = false;
+}
+
+if (!empty($types['user'])) {
     $searches[] = "(eventtype = 'user' AND userid = :userid)";
     $params['userid'] = $USER->id;
     $usedefaultfilters = false;
@@ -140,9 +145,14 @@
     $usedefaultfilters = false;
 }
 
-if (!empty($categoryid) && !empty($types['category'])) {
-    $searches[] = "(eventtype = 'category' AND categoryid = :categoryid)";
-    $params += ['categoryid' => $categoryid];
+if (!empty($types['category'])) {
+    if (!empty($categoryid)) {
+        $searches[] = "(eventtype = 'category' AND categoryid = :categoryid)";
+        $params += ['categoryid' => $categoryid];
+    } else {
+        $searches[] = "(eventtype = 'category')";
+    }
+
     $usedefaultfilters = false;
 }
 
diff --git a/calendar/renderer.php b/calendar/renderer.php
index a71b5fa5b520c..c84c8fcef0a62 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -161,7 +161,7 @@ public function event(calendar_event $event, $showactions=true) {
                 $deletelink = null;
             }
 
-            $commands  = html_writer::start_tag('div', array('class' => 'commands pull-xs-right'));
+            $commands  = html_writer::start_tag('div', array('class' => 'commands float-sm-right'));
             $commands .= html_writer::start_tag('a', array('href' => $editlink));
             $str = get_string('tt_editevent', 'calendar');
             $commands .= $this->output->pix_icon('t/edit', $str);
@@ -205,9 +205,9 @@ public function event(calendar_event $event, $showactions=true) {
             $output .= html_writer::tag('div', $event->courselink);
         }
         if (!empty($event->time)) {
-            $output .= html_writer::tag('span', $event->time, array('class' => 'date pull-xs-right mr-1'));
+            $output .= html_writer::tag('span', $event->time, array('class' => 'date float-sm-right mr-1'));
         } else {
-            $attrs = array('class' => 'date pull-xs-right mr-1');
+            $attrs = array('class' => 'date float-sm-right mr-1');
             $output .= html_writer::tag('span', calendar_time_representation($event->timestart), $attrs);
         }
 
diff --git a/calendar/templates/day_detailed.mustache b/calendar/templates/day_detailed.mustache
index fde6b2f44170d..2cb495040c33e 100644
--- a/calendar/templates/day_detailed.mustache
+++ b/calendar/templates/day_detailed.mustache
@@ -46,5 +46,9 @@
     {{> core_calendar/header}}
     {{> core_calendar/day_navigation }}
     {{> core/overlay_loading}}
-    {{> core_calendar/event_list }}
+    {{< core_calendar/event_list }}
+        {{$noeventsmessage}}
+            {{#str}} daywithnoevents, core_calendar {{/str}}
+        {{/noeventsmessage}}
+    {{/core_calendar/event_list}}
 </div>
diff --git a/calendar/templates/event_details.mustache b/calendar/templates/event_details.mustache
index 86fcda4cc9b53..1a1516fef7d37 100644
--- a/calendar/templates/event_details.mustache
+++ b/calendar/templates/event_details.mustache
@@ -59,10 +59,12 @@
     <div class="col-xs-1">{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}</div>
     <div class="col-xs-11">{{{formattedtime}}}</div>
 </div>
-<div class="row mt-1">
-    <div class="col-xs-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>
-    <div class="col-xs-11">{{normalisedeventtypetext}}</div>
-</div>
+{{#normalisedeventtypetext}}
+    <div class="row mt-1">
+        <div class="col-xs-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>
+        <div class="col-xs-11">{{normalisedeventtypetext}}</div>
+    </div>
+{{/normalisedeventtypetext}}
 {{#description}}
     <div class="row mt-1">
         <div class="col-xs-1">{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}</div>
diff --git a/calendar/templates/event_icon.mustache b/calendar/templates/event_icon.mustache
index fb88bd6c6eab1..ea61b32cf9326 100644
--- a/calendar/templates/event_icon.mustache
+++ b/calendar/templates/event_icon.mustache
@@ -37,5 +37,5 @@
     {{#pix}} icon, {{modulename}} {{/pix}}
 {{/modulename}}
 {{^modulename}}
-    {{#pix}} i/{{eventtype}}event, core {{/pix}}
+    {{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}
 {{/modulename}}
diff --git a/calendar/templates/event_list.mustache b/calendar/templates/event_list.mustache
index ae276ae20478a..63e4ca91709c6 100644
--- a/calendar/templates/event_list.mustache
+++ b/calendar/templates/event_list.mustache
@@ -37,7 +37,7 @@
     {{/events}}
     {{^events}}
         <span class="calendar-information calendar-no-results">
-            {{#str}}daywithnoevents, calendar{{/str}}
+            {{$noeventsmessage}}{{/noeventsmessage}}
         </span>
     {{/events}}
 </div>
\ No newline at end of file
diff --git a/calendar/templates/month_mini.mustache b/calendar/templates/month_mini.mustache
index b1aa06f1b1409..cb3e22974c0c3 100644
--- a/calendar/templates/month_mini.mustache
+++ b/calendar/templates/month_mini.mustache
@@ -136,12 +136,7 @@
                                 {{$content}}
                                     {{#events}}
                                         <div data-popover-eventtype-{{normalisedeventtype}}="1">
-                                            {{#modulename}}
-                                                {{#pix}} icon, {{modulename}} {{/pix}}
-                                            {{/modulename}}
-                                            {{^modulename}}
-                                                {{#pix}} i/{{eventtype}}event, core {{/pix}}
-                                            {{/modulename}}
+                                            {{> core_calendar/event_icon}}
                                             {{{popupname}}}
                                         </div>
                                     {{/events}}
diff --git a/calendar/templates/upcoming_detailed.mustache b/calendar/templates/upcoming_detailed.mustache
index a1b070b790810..af33d99e4cbbb 100644
--- a/calendar/templates/upcoming_detailed.mustache
+++ b/calendar/templates/upcoming_detailed.mustache
@@ -34,5 +34,9 @@
 <div class="calendarwrapper" data-view="upcoming" data-context-id="{{defaulteventcontext}}" data-courseid="{{courseid}}">
     {{> core_calendar/header}}
     {{> core/overlay_loading}}
-    {{> core_calendar/event_list }}
+    {{< core_calendar/event_list }}
+        {{$noeventsmessage}}
+            {{#str}} noupcomingevents, core_calendar {{/str}}
+        {{/noeventsmessage}}
+    {{/core_calendar/event_list}}
 </div>
diff --git a/calendar/tests/behat/behat_calendar.php b/calendar/tests/behat/behat_calendar.php
index 0bd835cc66606..1c6cb4ccb3066 100644
--- a/calendar/tests/behat/behat_calendar.php
+++ b/calendar/tests/behat/behat_calendar.php
@@ -124,4 +124,16 @@ public function i_view_the_calendar_for($month, $year) {
         $this->getSession()->visit($this->locate_path('/calendar/view.php?view=month&course=1&time='.$time));
 
     }
+
+    /**
+     * Navigate to site calendar.
+     *
+     * @Given /^I am viewing site calendar$/
+     * @throws coding_exception
+     * @return void
+     */
+    public function i_am_viewing_site_calendar() {
+        $url = new moodle_url('/calendar/view.php', ['view' => 'month']);
+        $this->getSession()->visit($this->locate_path($url->out_as_local_url(false)));
+    }
 }
diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index cb681d0d53245..5f1ffaf50438f 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -14,6 +14,8 @@ Feature: Perform basic calendar functionality
     And the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1 | topics |
+      | Course 2 | C2 | topics |
+      | Course 3 | C3 | topics |
     And the following "course enrolments" exist:
       | user | course | role |
       | student1 | C1 | student |
@@ -177,3 +179,62 @@ Feature: Perform basic calendar functionality
     And I set the field "Type of event" to "Course"
     When I click on "Save" "button"
     And I should see "Select a course" in the "Course" "form_row"
+
+  @javascript
+  Scenario: Default event type selection in the event form
+    Given I log in as "teacher1"
+    When I am viewing site calendar
+    And I click on "New event" "button"
+    Then the field "Type of event" matches value "User"
+    And I am on "Course 1" course homepage
+    And I follow "This month"
+    When I click on "New event" "button"
+    Then the field "Type of event" matches value "Course"
+
+  @javascript
+  Scenario: Admin can only see all courses if calendar_adminseesall setting is enabled.
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage
+    And I enrol "admin" user as "Teacher"
+    And I am viewing site calendar
+    And I click on "New event" "button"
+    And I set the field "Type of event" to "Course"
+    When I open the autocomplete suggestions list
+    Then I should see "Course 1" in the ".form-autocomplete-suggestions" "css_element"
+    And I should not see "Course 2" in the ".form-autocomplete-suggestions" "css_element"
+    And I should not see "Course 3" in the ".form-autocomplete-suggestions" "css_element"
+    And I click on "Close" "button"
+    And I am on site homepage
+    And I navigate to "Appearance > Calendar" in site administration
+    And I set the field "Admins see all" to "1"
+    And I press "Save changes"
+    And I am viewing site calendar
+    And I click on "New event" "button"
+    And I set the field "Type of event" to "Course"
+    When I open the autocomplete suggestions list
+    Then I should see "Course 1" in the ".form-autocomplete-suggestions" "css_element"
+    And I should see "Course 2" in the ".form-autocomplete-suggestions" "css_element"
+    And I should see "Course 3" in the ".form-autocomplete-suggestions" "css_element"
+
+  @javascript
+  Scenario: Students can only see user event type by default.
+    Given I log in as "student1"
+    And I am viewing site calendar
+    When I click on "New event" "button"
+    Then I should see "User" in the "div#fitem_id_staticeventtype" "css_element"
+    And I am on "Course 1" course homepage
+    And I follow "This month"
+    When I click on "New event" "button"
+    Then I should see "User" in the "div#fitem_id_staticeventtype" "css_element"
+    And I click on "Close" "button"
+    And I log out
+    Given I log in as "admin"
+    And I navigate to "Appearance > Calendar" in site administration
+    And I set the field "Admins see all" to "1"
+    And I press "Save changes"
+    And I log out
+    Given I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "This month"
+    When I click on "New event" "button"
+    Then I should see "User" in the "div#fitem_id_staticeventtype" "css_element"
diff --git a/calendar/tests/behat/calendar_import.feature b/calendar/tests/behat/calendar_import.feature
index a2c47cd5af2b8..2ad027a7b7b9b 100644
--- a/calendar/tests/behat/calendar_import.feature
+++ b/calendar/tests/behat/calendar_import.feature
@@ -47,3 +47,30 @@ Feature: Import and edit calendar events
     And I view the calendar for "2" "2017"
     And I should not see "Event on 2-25-2017"
     And I should not see "Event on 2-20-2017"
+
+  Scenario: Import events using different event types.
+    Given I log in as "admin"
+    And I view the calendar for "1" "2016"
+    And I press "Manage subscriptions"
+    And I set the following fields to these values:
+      | Calendar name  | Test Import |
+      | Import from    | Calendar file (.ics) |
+      | Type of event  | User |
+    And I upload "calendar/tests/fixtures/import.ics" file to "Calendar file (.ics)" filemanager
+    And I press "Add"
+    And I should see "User events"
+    And I set the following fields to these values:
+      | Calendar name  | Test Import |
+      | Import from    | Calendar file (.ics) |
+      | Type of event  | Category             |
+      | Category       | Miscellaneous   |
+    And I upload "calendar/tests/fixtures/import.ics" file to "Calendar file (.ics)" filemanager
+    And I press "Add"
+    And I should see "Category events"
+    And I set the following fields to these values:
+      | Calendar name  | Test Import |
+      | Import from    | Calendar file (.ics) |
+      | Type of event  | Site             |
+    And I upload "calendar/tests/fixtures/import.ics" file to "Calendar file (.ics)" filemanager
+    And I press "Add"
+    And I should see "Site events"
diff --git a/calendar/tests/lib_test.php b/calendar/tests/lib_test.php
index 35809ec18b7c5..94a3cb4c9f4d0 100644
--- a/calendar/tests/lib_test.php
+++ b/calendar/tests/lib_test.php
@@ -227,6 +227,24 @@ public function test_add_subscription() {
         calendar_import_icalendar_events($ical, null, $sub->id);
         $count = $DB->count_records('event', array('subscriptionid' => $sub->id));
         $this->assertEquals($count, 1);
+
+        // Test for ICS file with repeated events.
+        $subscription = new stdClass();
+        $subscription->name = 'Repeated events';
+        $subscription->importfrom = CALENDAR_IMPORT_FROM_FILE;
+        $subscription->eventtype = 'site';
+        $id = calendar_add_subscription($subscription);
+        $calendar = file_get_contents($CFG->dirroot . '/lib/tests/fixtures/repeated_events.ics');
+        $ical = new iCalendar();
+        $ical->unserialize($calendar);
+        $this->assertEquals($ical->parser_errors, []);
+
+        $sub = calendar_get_subscription($id);
+        $output = calendar_import_icalendar_events($ical, null, $sub->id);
+        $this->assertStringNotContainsString('Events deleted: 17', $output);
+        $this->assertStringContainsString('Events imported: 1', $output);
+        $this->assertStringContainsString('Events skipped: 0', $output);
+        $this->assertStringContainsString('Events updated: 0', $output);
     }
 
     /**
@@ -546,6 +564,10 @@ public function test_calendar_get_allowed_event_types_course() {
 
         $this->setUser($user);
 
+        // In general for all courses, they don't have the ability to add course events yet.
+        $types = calendar_get_allowed_event_types();
+        $this->assertFalse($types['course']);
+
         assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context1, true);
         assign_capability('moodle/calendar:manageentries', CAP_PROHIBIT, $roleid, $context2, true);
 
@@ -554,12 +576,20 @@ public function test_calendar_get_allowed_event_types_course() {
         $types = calendar_get_allowed_event_types($course1->id);
         $this->assertTrue($types['course']);
 
+        // If calling function without specified course,  there is still a course where they have it.
+        $types = calendar_get_allowed_event_types();
+        $this->assertTrue($types['course']);
+
         assign_capability('moodle/calendar:manageentries', CAP_PROHIBIT, $roleid, $context1, true);
 
         // The user only now has the correct capability in both course 1 and 2 so we
         // expect both to be in the results.
         $types = calendar_get_allowed_event_types($course3->id);
         $this->assertFalse($types['course']);
+
+        // They now do not have permission in any course.
+        $types = calendar_get_allowed_event_types();
+        $this->assertFalse($types['course']);
     }
 
     public function test_calendar_get_allowed_event_types_group_no_acces_to_diff_groups() {
@@ -582,6 +612,11 @@ public function test_calendar_get_allowed_event_types_group_no_acces_to_diff_gro
         $types = calendar_get_allowed_event_types($course->id);
         $this->assertTrue($types['course']);
         $this->assertFalse($types['group']);
+
+        // Same result applies when not providing a specific course as they are only on one course.
+        $types = calendar_get_allowed_event_types();
+        $this->assertTrue($types['course']);
+        $this->assertFalse($types['group']);
     }
 
     public function test_calendar_get_allowed_event_types_group_no_groups() {
@@ -598,6 +633,12 @@ public function test_calendar_get_allowed_event_types_group_no_groups() {
         // no groups so we shouldn't see a group type.
         $types = calendar_get_allowed_event_types($course->id);
         $this->assertTrue($types['course']);
+        $this->assertFalse($types['group']);
+
+        // Same result applies when not providing a specific course as they are only on one course.
+        $types = calendar_get_allowed_event_types();
+        $this->assertTrue($types['course']);
+        $this->assertFalse($types['group']);
     }
 
     public function test_calendar_get_allowed_event_types_group_access_all_groups() {
@@ -623,7 +664,12 @@ public function test_calendar_get_allowed_event_types_group_access_all_groups()
         // the accessallgroups capability.
         $types = calendar_get_allowed_event_types($course1->id);
         $this->assertTrue($types['group']);
+
+        // Same result applies when not providing a specific course as they are only on one course.
+        $types = calendar_get_allowed_event_types();
+        $this->assertTrue($types['group']);
     }
+
     public function test_calendar_get_allowed_event_types_group_no_access_all_groups() {
         $generator = $this->getDataGenerator();
         $user = $generator->create_user();
@@ -642,10 +688,87 @@ public function test_calendar_get_allowed_event_types_group_no_access_all_groups
         // groups that they are not a member of.
         $types = calendar_get_allowed_event_types($course->id);
         $this->assertFalse($types['group']);
+
+        // Same result applies when not providing a specific course as they are only on one course.
+        $types = calendar_get_allowed_event_types();
+        $this->assertFalse($types['group']);
+
         assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context, true);
         assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $roleid, $context, true);
         $types = calendar_get_allowed_event_types($course->id);
         $this->assertTrue($types['group']);
+
+        // Same result applies when not providing a specific course as they are only on one course.
+        $types = calendar_get_allowed_event_types();
+        $this->assertTrue($types['group']);
+    }
+
+    public function test_calendar_get_allowed_event_types_group_cap_no_groups() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course = $generator->create_course();
+        $context = context_course::instance($course->id);
+        $roleid = $generator->create_role();
+        $group = $generator->create_group(['courseid' => $course->id]);
+        $generator->enrol_user($user->id, $course->id, 'student');
+        $generator->role_assign($roleid, $user->id, $context->id);
+        assign_capability('moodle/calendar:managegroupentries', CAP_ALLOW, $roleid, $context, true);
+
+        $this->setUser($user);
+        $types = calendar_get_allowed_event_types($course->id);
+        $this->assertFalse($types['course']);
+        $this->assertFalse($types['group']);
+
+        // Check without specifying a course (same result as user only has one course).
+        $types = calendar_get_allowed_event_types();
+        $this->assertFalse($types['course']);
+        $this->assertFalse($types['group']);
+    }
+
+    public function test_calendar_get_allowed_event_types_group_cap_has_group() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course = $generator->create_course();
+        $context = context_course::instance($course->id);
+        $roleid = $generator->create_role();
+        $group = $generator->create_group(['courseid' => $course->id]);
+        $generator->enrol_user($user->id, $course->id, 'student');
+        $generator->role_assign($roleid, $user->id, $context->id);
+        groups_add_member($group, $user);
+        assign_capability('moodle/calendar:managegroupentries', CAP_ALLOW, $roleid, $context, true);
+
+        $this->setUser($user);
+        $types = calendar_get_allowed_event_types($course->id);
+        $this->assertFalse($types['course']);
+        $this->assertTrue($types['group']);
+
+        // Check without specifying a course (same result as user only has one course).
+        $types = calendar_get_allowed_event_types();
+        $this->assertFalse($types['course']);
+        $this->assertTrue($types['group']);
+    }
+
+    public function test_calendar_get_allowed_event_types_group_cap_access_all_groups() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course = $generator->create_course();
+        $context = context_course::instance($course->id);
+        $roleid = $generator->create_role();
+        $group = $generator->create_group(['courseid' => $course->id]);
+        $generator->enrol_user($user->id, $course->id, 'student');
+        $generator->role_assign($roleid, $user->id, $context->id);
+        assign_capability('moodle/calendar:managegroupentries', CAP_ALLOW, $roleid, $context, true);
+        assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $roleid, $context, true);
+
+        $this->setUser($user);
+        $types = calendar_get_allowed_event_types($course->id);
+        $this->assertFalse($types['course']);
+        $this->assertTrue($types['group']);
+
+        // Check without specifying a course (same result as user only has one course).
+        $types = calendar_get_allowed_event_types();
+        $this->assertFalse($types['course']);
+        $this->assertTrue($types['group']);
     }
 
     /**
@@ -772,4 +895,72 @@ public function test_calendar_set_filters_logged_in_another_user() {
         $this->assertEquals(array($coursegroups[$courses[0]->id][1]->id), $groupids);
         $this->assertEquals($users[1]->id, $userid);
     }
+
+    /**
+     *  Test for calendar_view_event_allowed for course event types.
+     */
+    public function test_calendar_view_event_allowed_course_event() {
+        global $USER;
+
+        $this->setAdminUser();
+
+        $generator = $this->getDataGenerator();
+
+        // A student in a course.
+        $student = $generator->create_user();
+        // Some user not enrolled in any course.
+        $someuser = $generator->create_user();
+
+        // A course with manual enrolments.
+        $manualcourse = $generator->create_course();
+
+        // Enrol the student to the manual enrolment course.
+        $generator->enrol_user($student->id, $manualcourse->id);
+
+        // A course that allows guest access.
+        $guestcourse = $generator->create_course(
+            (object)[
+                'shortname' => 'guestcourse',
+                'enrol_guest_status_0' => ENROL_INSTANCE_ENABLED,
+                'enrol_guest_password_0' => ''
+            ]);
+
+        $manualevent = (object)[
+            'name' => 'Manual course event',
+            'description' => '',
+            'format' => 1,
+            'categoryid' => 0,
+            'courseid' => $manualcourse->id,
+            'groupid' => 0,
+            'userid' => $USER->id,
+            'modulename' => 0,
+            'instance' => 0,
+            'eventtype' => 'course',
+            'timestart' => time(),
+            'timeduration' => 86400,
+            'visible' => 1
+        ];
+        $caleventmanual = calendar_event::create($manualevent, false);
+
+        // Create a course event for the course with guest access.
+        $guestevent = clone $manualevent;
+        $guestevent->name = 'Guest course event';
+        $guestevent->courseid = $guestcourse->id;
+        $caleventguest = calendar_event::create($guestevent, false);
+
+        // Viewing as admin.
+        $this->assertTrue(calendar_view_event_allowed($caleventmanual));
+        $this->assertTrue(calendar_view_event_allowed($caleventguest));
+
+        // Viewing as someone enrolled in a course.
+        $this->setUser($student);
+        $this->assertTrue(calendar_view_event_allowed($caleventmanual));
+
+        // Viewing as someone not enrolled in any course.
+        $this->setUser($someuser);
+        // Viewing as someone not enrolled in a course without guest access on.
+        $this->assertFalse(calendar_view_event_allowed($caleventmanual));
+        // Viewing as someone not enrolled in a course with guest access on.
+        $this->assertTrue(calendar_view_event_allowed($caleventguest));
+    }
 }
diff --git a/calendar/view.php b/calendar/view.php
index 96f39f649e928..dea7508ae5d07 100644
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -52,11 +52,23 @@
 $categoryid = optional_param('category', null, PARAM_INT);
 $courseid = optional_param('course', SITEID, PARAM_INT);
 $view = optional_param('view', 'upcoming', PARAM_ALPHA);
+$day = optional_param('cal_d', 0, PARAM_INT);
+$mon = optional_param('cal_m', 0, PARAM_INT);
+$year = optional_param('cal_y', 0, PARAM_INT);
 $time = optional_param('time', 0, PARAM_INT);
 $lookahead = optional_param('lookahead', null, PARAM_INT);
 
 $url = new moodle_url('/calendar/view.php');
 
+// If a day, month and year were passed then convert it to a timestamp. If these were passed
+// then we can assume the day, month and year are passed as Gregorian, as no where in core
+// should we be passing these values rather than the time. This is done for BC.
+if (!empty($day) && !empty($mon) && !empty($year)) {
+    if (checkdate($mon, $day, $year)) {
+        $time = make_timestamp($year, $mon, $day);
+    }
+}
+
 if (empty($time)) {
     $time = time();
 }
diff --git a/comment/lib.php b/comment/lib.php
index f8e9f23e4bd18..94c2e92bb1dde 100644
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -564,7 +564,7 @@ public function get_comments($page = '') {
                        c.commentarea = :commentarea AND
                        c.itemid = :itemid AND
                        $componentwhere
-              ORDER BY c.timecreated DESC";
+              ORDER BY c.timecreated DESC, c.id DESC";
         $params['contextid'] = $this->contextid;
         $params['commentarea'] = $this->commentarea;
         $params['itemid'] = $this->itemid;
diff --git a/comment/tests/externallib_test.php b/comment/tests/externallib_test.php
index c6a7433812052..4d81801722964 100644
--- a/comment/tests/externallib_test.php
+++ b/comment/tests/externallib_test.php
@@ -96,17 +96,18 @@ public function test_get_comments() {
 
         // We need to add the comments manually, the comment API uses the global OUTPUT and this is going to make the WS to fail.
         $newcmt = new stdClass;
+        $timecreated = time();
         $newcmt->contextid    = $context->id;
         $newcmt->commentarea  = 'database_entry';
         $newcmt->itemid       = $recordid;
         $newcmt->content      = 'New comment';
         $newcmt->format       = 0;
         $newcmt->userid       = $user->id;
-        $newcmt->timecreated  = time();
+        $newcmt->timecreated  = $timecreated;
         $cmtid1 = $DB->insert_record('comments', $newcmt);
 
         $newcmt->content  = 'New comment 2';
-        $newcmt->timecreated  = time() + 1;
+        $newcmt->timecreated  = $timecreated;
         $cmtid2 = $DB->insert_record('comments', $newcmt);
 
         $contextlevel = 'module';
diff --git a/competency/classes/api.php b/competency/classes/api.php
index ffcda6b7fedb8..f231958d4454b 100644
--- a/competency/classes/api.php
+++ b/competency/classes/api.php
@@ -1231,7 +1231,7 @@ public static function list_course_module_competencies($cmorid) {
         $result = array();
 
         // TODO We could improve the performance of this into one single query.
-        $coursemodulecompetencies = course_competency::list_course_module_competencies($cm->id);
+        $coursemodulecompetencies = course_module_competency::list_course_module_competencies($cm->id);
         $competencies = course_module_competency::list_competencies($cm->id);
 
         // Build the return values.
@@ -4777,6 +4777,40 @@ public static function hook_cohort_deleted(\stdClass $cohort) {
         $DB->delete_records(template_cohort::TABLE, array('cohortid' => $cohort->id));
     }
 
+    /**
+     * Action to perform when a user is deleted.
+     *
+     * @param int $userid The user id.
+     */
+    public static function hook_user_deleted($userid) {
+        global $DB;
+
+        $usercompetencies = $DB->get_records(user_competency::TABLE, ['userid' => $userid], '', 'id');
+        foreach ($usercompetencies as $usercomp) {
+            $DB->delete_records(evidence::TABLE, ['usercompetencyid' => $usercomp->id]);
+        }
+
+        $DB->delete_records(user_competency::TABLE, ['userid' => $userid]);
+        $DB->delete_records(user_competency_course::TABLE, ['userid' => $userid]);
+        $DB->delete_records(user_competency_plan::TABLE, ['userid' => $userid]);
+
+        // Delete any associated files.
+        $fs = get_file_storage();
+        $context = context_user::instance($userid);
+        $userevidences = $DB->get_records(user_evidence::TABLE, ['userid' => $userid], '', 'id');
+        foreach ($userevidences as $userevidence) {
+            $DB->delete_records(user_evidence_competency::TABLE, ['userevidenceid' => $userevidence->id]);
+            $DB->delete_records(user_evidence::TABLE, ['id' => $userevidence->id]);
+            $fs->delete_area_files($context->id, 'core_competency', 'userevidence', $userevidence->id);
+        }
+
+        $userplans = $DB->get_records(plan::TABLE, ['userid' => $userid], '', 'id');
+        foreach ($userplans as $userplan) {
+            $DB->delete_records(plan_competency::TABLE, ['planid' => $userplan->id]);
+            $DB->delete_records(plan::TABLE, ['id' => $userplan->id]);
+        }
+    }
+
     /**
      * Manually grade a user competency.
      *
diff --git a/competency/tests/api_test.php b/competency/tests/api_test.php
index 3ecf3e9942daf..ffe15e344a23a 100644
--- a/competency/tests/api_test.php
+++ b/competency/tests/api_test.php
@@ -2757,6 +2757,16 @@ public function test_list_course_modules_using_competency() {
         $result = api::list_course_module_competencies_in_course_module($cm->id);
         $this->assertEquals($result[0]->get('competencyid'), $c->get('id'));
         $this->assertEquals($result[1]->get('competencyid'), $c2->get('id'));
+
+        // Now get the course competency and coursemodule competency together.
+        $result = api::list_course_module_competencies($cm->id);
+        // Now we should have an array and each element of the array should have a competency and
+        // a coursemodulecompetency.
+        foreach ($result as $instance) {
+            $cmc = $instance['coursemodulecompetency'];
+            $c = $instance['competency'];
+            $this->assertEquals($cmc->get('competencyid'), $c->get('id'));
+        }
     }
 
     /**
diff --git a/competency/tests/hooks_test.php b/competency/tests/hooks_test.php
index e8be7c41a9a12..c1890eac6f04c 100644
--- a/competency/tests/hooks_test.php
+++ b/competency/tests/hooks_test.php
@@ -207,4 +207,47 @@ public function test_hook_cohort_deleted() {
         $this->assertEquals(1, \core_competency\template_cohort::count_records(array('templateid' => $t1->get('id'))));
         $this->assertEquals(0, \core_competency\template_cohort::count_records(array('templateid' => $t2->get('id'))));
     }
+
+    public function test_hook_user_deleted() {
+        $this->resetAfterTest();
+        $dg = $this->getDataGenerator();
+        $ccg = $dg->get_plugin_generator('core_competency');
+
+        $u1 = $dg->create_user();
+
+        $framework = $ccg->create_framework();
+        $comp1 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]);
+        $comp2 = $ccg->create_competency(['competencyframeworkid' => $framework->get('id')]);
+
+        $c1 = $dg->create_course();
+        $cc1a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id]);
+        $cc1b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id]);
+        $assign1a = $dg->create_module('assign', ['course' => $c1]);
+        $assign1b = $dg->create_module('assign', ['course' => $c1]);
+        $cmc1a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1a->cmid]);
+        $cmc1b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1b->cmid]);
+        $ucc1a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c1->id,
+            'userid' => $u1->id]);
+        $ucc1b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c1->id,
+            'userid' => $u1->id]);
+
+        $c2 = $dg->create_course();
+        $cc2a = $ccg->create_course_competency(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id]);
+        $cc2b = $ccg->create_course_competency(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id]);
+        $assign2a = $dg->create_module('assign', ['course' => $c2]);
+        $assign2b = $dg->create_module('assign', ['course' => $c2]);
+        $cmc2a = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2a->cmid]);
+        $cmc2b = $ccg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign2b->cmid]);
+        $ucc2a = $ccg->create_user_competency_course(['competencyid' => $comp1->get('id'), 'courseid' => $c2->id,
+            'userid' => $u1->id]);
+        $ucc2b = $ccg->create_user_competency_course(['competencyid' => $comp2->get('id'), 'courseid' => $c2->id,
+            'userid' => $u1->id]);
+
+        reset_course_userdata((object) ['id' => $c1->id, 'reset_competency_ratings' => true]);
+
+        delete_user($u1);
+
+        // Assert the records don't exist anymore.
+        $this->assertEquals(0, user_competency_course::count_records(['courseid' => $c1->id, 'userid' => $u1->id]));
+    }
 }
diff --git a/composer.json b/composer.json
index 6dc963d3ddce5..a42f7e63e8c2a 100644
--- a/composer.json
+++ b/composer.json
@@ -4,10 +4,17 @@
     "description": "Moodle - the world's open source learning platform",
     "type": "project",
     "homepage": "https://moodle.org",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/moodlehq/php-webdriver.git"
+        }
+    ],
     "require-dev": {
         "phpunit/phpunit": "7.5.*",
         "phpunit/dbunit": "4.0.*",
-        "moodlehq/behat-extension": "3.37.0",
-        "mikey179/vfsstream": "^1.6"
+        "moodlehq/behat-extension": "3.37.3",
+        "mikey179/vfsstream": "^1.6",
+        "instaclick/php-webdriver": "dev-local as 1.x-dev"
     }
 }
diff --git a/composer.lock b/composer.lock
index 948ff212bcddb..b36087ddb2b9c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,46 +4,42 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3517a4473544055cd8523bb076cad8f6",
+    "content-hash": "ee640e103837d18775219772bd0bfb92",
     "packages": [],
     "packages-dev": [
         {
             "name": "behat/behat",
-            "version": "v3.3.1",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Behat.git",
-                "reference": "44a58c1480d6144b2dc2c2bf02b9cef73c83840d"
+                "reference": "e4bce688be0c2029dc1700e46058d86428c63cab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Behat/zipball/44a58c1480d6144b2dc2c2bf02b9cef73c83840d",
-                "reference": "44a58c1480d6144b2dc2c2bf02b9cef73c83840d",
+                "url": "https://api.github.com/repos/Behat/Behat/zipball/e4bce688be0c2029dc1700e46058d86428c63cab",
+                "reference": "e4bce688be0c2029dc1700e46058d86428c63cab",
                 "shasum": ""
             },
             "require": {
-                "behat/gherkin": "^4.4.4",
+                "behat/gherkin": "^4.5.1",
                 "behat/transliterator": "^1.2",
-                "container-interop/container-interop": "^1.1",
+                "container-interop/container-interop": "^1.2",
                 "ext-mbstring": "*",
                 "php": ">=5.3.3",
+                "psr/container": "^1.0",
                 "symfony/class-loader": "~2.1||~3.0",
-                "symfony/config": "~2.3||~3.0",
-                "symfony/console": "~2.5||~3.0",
-                "symfony/dependency-injection": "~2.1||~3.0",
-                "symfony/event-dispatcher": "~2.1||~3.0",
-                "symfony/translation": "~2.3||~3.0",
-                "symfony/yaml": "~2.1||~3.0"
+                "symfony/config": "~2.3||~3.0||~4.0",
+                "symfony/console": "~2.7.40||^2.8.33||~3.3.15||^3.4.3||^4.0.3",
+                "symfony/dependency-injection": "~2.1||~3.0||~4.0",
+                "symfony/event-dispatcher": "~2.1||~3.0||~4.0",
+                "symfony/translation": "~2.3||~3.0||~4.0",
+                "symfony/yaml": "~2.1||~3.0||~4.0"
             },
             "require-dev": {
                 "herrera-io/box": "~1.6.1",
-                "phpunit/phpunit": "~4.5",
-                "symfony/process": "~2.5|~3.0"
-            },
-            "suggest": {
-                "behat/mink-extension": "for integration with Mink testing framework",
-                "behat/symfony2-extension": "for integration with Symfony2 web framework",
-                "behat/yii-extension": "for integration with Yii web framework"
+                "phpunit/phpunit": "^4.8.36|^6.3",
+                "symfony/process": "~2.5|~3.0|~4.0"
             },
             "bin": [
                 "bin/behat"
@@ -51,7 +47,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev"
+                    "dev-master": "3.5.x-dev"
                 }
             },
             "autoload": {
@@ -87,7 +83,7 @@
                 "symfony",
                 "testing"
             ],
-            "time": "2017-05-15T16:49:16+00:00"
+            "time": "2018-08-10T18:56:51+00:00"
         },
         {
             "name": "behat/gherkin",
@@ -625,27 +621,28 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
                 "shasum": ""
             },
             "require": {
+                "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
             },
             "suggest": {
                 "psr/log": "Required for using the Log middleware"
@@ -657,12 +654,12 @@
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -686,7 +683,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "time": "2019-10-23T15:58:00+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -741,33 +738,37 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.5.2",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "9f83dded91781a01c63574e387eaa769be769115"
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
-                "reference": "9f83dded91781a01c63574e387eaa769be769115",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
                 "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5"
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
             },
             "provide": {
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
+                "ext-zlib": "*",
                 "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
             },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -804,20 +805,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2018-12-04T20:46:45+00:00"
+            "time": "2019-07-01T23:21:34+00:00"
         },
         {
             "name": "instaclick/php-webdriver",
-            "version": "1.4.5",
+            "version": "dev-local",
             "source": {
                 "type": "git",
-                "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "6fa959452e774dcaed543faad3a9d1a37d803327"
+                "url": "https://github.com/moodlehq/php-webdriver.git",
+                "reference": "3df827208ec104a9716aa8c30741e330da620c1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/6fa959452e774dcaed543faad3a9d1a37d803327",
-                "reference": "6fa959452e774dcaed543faad3a9d1a37d803327",
+                "url": "https://api.github.com/repos/moodlehq/php-webdriver/zipball/3df827208ec104a9716aa8c30741e330da620c1e",
+                "reference": "3df827208ec104a9716aa8c30741e330da620c1e",
                 "shasum": ""
             },
             "require": {
@@ -839,7 +840,6 @@
                     "WebDriver": "lib/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "Apache-2.0"
             ],
@@ -863,27 +863,30 @@
                 "webdriver",
                 "webtest"
             ],
-            "time": "2017-06-30T04:02:48+00:00"
+            "support": {
+                "source": "https://github.com/moodlehq/php-webdriver/tree/local"
+            },
+            "time": "2019-08-14T02:10:24+00:00"
         },
         {
-            "name": "mikey179/vfsStream",
-            "version": "v1.6.6",
+            "name": "mikey179/vfsstream",
+            "version": "v1.6.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
+                "reference": "2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
-                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb",
+                "reference": "2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.5"
+                "phpunit/phpunit": "^4.5|^5.0"
             },
             "type": "library",
             "extra": {
@@ -909,30 +912,29 @@
             ],
             "description": "Virtual file system to mock the real file system in unit tests.",
             "homepage": "http://vfs.bovigo.org/",
-            "time": "2019-04-08T13:54:32+00:00"
+            "time": "2019-08-01T01:38:37+00:00"
         },
         {
             "name": "moodlehq/behat-extension",
-            "version": "v3.37.0",
+            "version": "v3.37.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/moodlehq/moodle-behat-extension.git",
-                "reference": "ba8c4b8b323e05f7af128604f3f3dc60c953135a"
+                "reference": "c4b69596142fa297ba049e13f04f3b158dcc94e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/ba8c4b8b323e05f7af128604f3f3dc60c953135a",
-                "reference": "ba8c4b8b323e05f7af128604f3f3dc60c953135a",
+                "url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/c4b69596142fa297ba049e13f04f3b158dcc94e6",
+                "reference": "c4b69596142fa297ba049e13f04f3b158dcc94e6",
                 "shasum": ""
             },
             "require": {
-                "behat/behat": "3.3.*",
+                "behat/behat": "3.5.*",
                 "behat/mink": "~1.7",
                 "behat/mink-extension": "~2.2",
                 "behat/mink-goutte-driver": "~1.2",
                 "behat/mink-selenium2-driver": "~1.3",
-                "guzzlehttp/guzzle": "^6.3",
-                "php": ">=5.4.4",
+                "php": ">=7.1.0",
                 "symfony/process": "2.8.*"
             },
             "type": "library",
@@ -959,20 +961,20 @@
                 "Behat",
                 "moodle"
             ],
-            "time": "2018-02-04T18:04:02+00:00"
+            "time": "2019-10-28T11:41:43+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.1",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
                 "shasum": ""
             },
             "require": {
@@ -1007,7 +1009,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2019-04-07T13:18:21+00:00"
+            "time": "2019-08-09T12:45:53+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1113,35 +1115,33 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "~6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1163,30 +1163,30 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "time": "2018-08-07T13:53:10+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.1",
+            "version": "4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
+                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
+                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
+                "doctrine/instantiator": "^1.0.5",
                 "mockery/mockery": "^1.0",
                 "phpunit/phpunit": "^6.4"
             },
@@ -1214,41 +1214,40 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-04-30T17:48:53+00:00"
+            "time": "2019-09-12T14:27:41+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.1",
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
+                "ext-tokenizer": "^7.1",
+                "mockery/mockery": "~1",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1261,26 +1260,27 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-07-14T14:27:02+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "time": "2019-08-22T18:11:29+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
+                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
                 "sebastian/comparator": "^1.1|^2.0|^3.0",
                 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
@@ -1295,8 +1295,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1324,7 +1324,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-08-05T17:53:17+00:00"
+            "time": "2019-10-03T11:07:50+00:00"
         },
         {
             "name": "phpunit/dbunit",
@@ -1535,16 +1535,16 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "2.1.1",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059"
+                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059",
-                "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
+                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
                 "shasum": ""
             },
             "require": {
@@ -1580,20 +1580,20 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2019-02-20T10:12:59+00:00"
+            "time": "2019-06-07T04:22:29+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "3.0.1",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
-                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
                 "shasum": ""
             },
             "require": {
@@ -1606,7 +1606,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -1629,20 +1629,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2018-10-30T05:52:18+00:00"
+            "time": "2019-09-17T06:23:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.9",
+            "version": "7.5.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160"
+                "reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160",
-                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4c92a15296e58191a4cd74cff3b34fc8e374174a",
+                "reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a",
                 "shasum": ""
             },
             "require": {
@@ -1713,7 +1713,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-04-19T15:50:46+00:00"
+            "time": "2019-10-28T10:37:36+00:00"
         },
         {
             "name": "psr/container",
@@ -1816,16 +1816,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
+                "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
                 "shasum": ""
             },
             "require": {
@@ -1834,7 +1834,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -1859,28 +1859,28 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "time": "2019-10-25T08:06:51+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
-            "version": "2.0.5",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3"
+                "php": ">=5.6"
             },
             "require-dev": {
-                "phpunit/phpunit": "~3.7.0",
-                "satooshi/php-coveralls": ">=1.0"
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
             },
             "type": "library",
             "autoload": {
@@ -1899,7 +1899,7 @@
                 }
             ],
             "description": "A polyfill for getallheaders.",
-            "time": "2016-02-11T07:05:27+00:00"
+            "time": "2019-03-08T08:55:37+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -2121,16 +2121,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.0",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
                 "shasum": ""
             },
             "require": {
@@ -2157,6 +2157,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -2165,17 +2169,13 @@
                     "name": "Volker Dusch",
                     "email": "github@wallbash.com"
                 },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
@@ -2184,7 +2184,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-04-03T13:19:02+00:00"
+            "time": "2019-09-14T09:02:43+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -2469,16 +2469,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.2.8",
+            "version": "v4.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "c09c18cca96d7067152f78956faf55346c338283"
+                "reference": "78b7611c45039e8ce81698be319851529bf040b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c09c18cca96d7067152f78956faf55346c338283",
-                "reference": "c09c18cca96d7067152f78956faf55346c338283",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/78b7611c45039e8ce81698be319851529bf040b1",
+                "reference": "78b7611c45039e8ce81698be319851529bf040b1",
                 "shasum": ""
             },
             "require": {
@@ -2487,6 +2487,8 @@
             },
             "require-dev": {
                 "symfony/css-selector": "~3.4|~4.0",
+                "symfony/http-client": "^4.3",
+                "symfony/mime": "^4.3",
                 "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
@@ -2495,7 +2497,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -2522,20 +2524,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2019-04-07T09:56:43+00:00"
+            "time": "2019-09-10T11:25:17+00:00"
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.4.27",
+            "version": "v3.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "4459eef5298dedfb69f771186a580062b8516497"
+                "reference": "e212b06996819a2bce026a63da03b7182d05a690"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/4459eef5298dedfb69f771186a580062b8516497",
-                "reference": "4459eef5298dedfb69f771186a580062b8516497",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/e212b06996819a2bce026a63da03b7182d05a690",
+                "reference": "e212b06996819a2bce026a63da03b7182d05a690",
                 "shasum": ""
             },
             "require": {
@@ -2578,36 +2580,36 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T09:39:14+00:00"
+            "time": "2019-08-20T13:31:17+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.27",
+            "version": "v4.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "177a276c01575253c95cefe0866e3d1b57637fe0"
+                "reference": "0acb26407a9e1a64a275142f0ae5e36436342720"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/177a276c01575253c95cefe0866e3d1b57637fe0",
-                "reference": "177a276c01575253c95cefe0866e3d1b57637fe0",
+                "url": "https://api.github.com/repos/symfony/config/zipball/0acb26407a9e1a64a275142f0ae5e36436342720",
+                "reference": "0acb26407a9e1a64a275142f0ae5e36436342720",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/filesystem": "~2.8|~3.0|~4.0",
+                "php": "^7.1.3",
+                "symfony/filesystem": "~3.4|~4.0",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3",
-                "symfony/finder": "<3.3"
+                "symfony/finder": "<3.4"
             },
             "require-dev": {
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/event-dispatcher": "~3.3|~4.0",
-                "symfony/finder": "~3.3|~4.0",
-                "symfony/yaml": "~3.0|~4.0"
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
+                "symfony/finder": "~3.4|~4.0",
+                "symfony/messenger": "~4.1",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/yaml": "To use the yaml reference dumper"
@@ -2615,7 +2617,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -2642,7 +2644,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-23T15:06:07+00:00"
+            "time": "2019-09-19T15:51:53+00:00"
         },
         {
             "name": "symfony/console",
@@ -2714,16 +2716,16 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.27",
+            "version": "v3.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf"
+                "reference": "f819f71ae3ba6f396b4c015bd5895de7d2f1f85f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/8ca29297c29b64fb3a1a135e71cb25f67f9fdccf",
-                "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f819f71ae3ba6f396b4c015bd5895de7d2f1f85f",
+                "reference": "f819f71ae3ba6f396b4c015bd5895de7d2f1f85f",
                 "shasum": ""
             },
             "require": {
@@ -2748,14 +2750,14 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
                 },
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
@@ -2763,20 +2765,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T09:39:14+00:00"
+            "time": "2019-10-01T11:57:37+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.27",
+            "version": "v3.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9"
+                "reference": "b3e7ce815d82196435d16dc458023f8fb6b36ceb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/681afbb26488903c5ac15e63734f1d8ac430c9b9",
-                "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/b3e7ce815d82196435d16dc458023f8fb6b36ceb",
+                "reference": "b3e7ce815d82196435d16dc458023f8fb6b36ceb",
                 "shasum": ""
             },
             "require": {
@@ -2819,7 +2821,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2019-04-11T09:48:14+00:00"
+            "time": "2019-09-19T15:32:51+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -2893,16 +2895,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.2.8",
+            "version": "v4.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb"
+                "reference": "e9f7b4d19d69b133bd638eeddcdc757723b4211f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb",
-                "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e9f7b4d19d69b133bd638eeddcdc757723b4211f",
+                "reference": "e9f7b4d19d69b133bd638eeddcdc757723b4211f",
                 "shasum": ""
             },
             "require": {
@@ -2910,7 +2912,11 @@
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
+            "conflict": {
+                "masterminds/html5": "<2.6"
+            },
             "require-dev": {
+                "masterminds/html5": "^2.6",
                 "symfony/css-selector": "~3.4|~4.0"
             },
             "suggest": {
@@ -2919,7 +2925,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -2946,20 +2952,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-23T15:17:42+00:00"
+            "time": "2019-09-28T21:25:05+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.27",
+            "version": "v3.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff"
+                "reference": "3e922c4c3430b9de624e8a285dada5e61e230959"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a088aafcefb4eef2520a290ed82e4374092a6dff",
-                "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3e922c4c3430b9de624e8a285dada5e61e230959",
+                "reference": "3e922c4c3430b9de624e8a285dada5e61e230959",
                 "shasum": ""
             },
             "require": {
@@ -3009,20 +3015,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2019-04-02T08:51:52+00:00"
+            "time": "2019-08-23T08:05:57+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.2.8",
+            "version": "v4.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
+                "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
-                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263",
+                "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263",
                 "shasum": ""
             },
             "require": {
@@ -3032,7 +3038,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -3059,20 +3065,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-07T11:40:08+00:00"
+            "time": "2019-08-20T14:07:54+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "82ebae02209c21113908c229e9883c419720738a"
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-                "reference": "82ebae02209c21113908c229e9883c419720738a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
                 "shasum": ""
             },
             "require": {
@@ -3084,7 +3090,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                 }
             },
             "autoload": {
@@ -3100,13 +3106,13 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                 {
                     "name": "Gert de Pagter",
                     "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -3117,20 +3123,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "time": "2019-08-06T08:03:45+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
+                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
                 "shasum": ""
             },
             "require": {
@@ -3142,7 +3148,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                 }
             },
             "autoload": {
@@ -3176,7 +3182,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "time": "2019-08-06T08:03:45+00:00"
         },
         {
             "name": "symfony/process",
@@ -3349,16 +3355,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
-                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
                 "shasum": ""
             },
             "require": {
@@ -3385,20 +3391,20 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-04-04T09:56:43+00:00"
+            "time": "2019-06-13T22:48:21+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
                 "shasum": ""
             },
             "require": {
@@ -3406,8 +3412,7 @@
                 "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
             },
             "type": "library",
             "extra": {
@@ -3436,12 +3441,21 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-12-25T11:19:39+00:00"
+            "time": "2019-08-24T08:43:50+00:00"
+        }
+    ],
+    "aliases": [
+        {
+            "alias": "1.x-dev",
+            "alias_normalized": "1.9999999.9999999.9999999-dev",
+            "version": "dev-local",
+            "package": "instaclick/php-webdriver"
         }
     ],
-    "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "instaclick/php-webdriver": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
diff --git a/config-dist.php b/config-dist.php
index 5f4258a3b1644..5a9df8d92b32c 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -543,7 +543,7 @@
 //
 // Location for lock files used by the File locking factory. This must exist
 // on a shared file system that supports locking.
-//      $CFG->lock_file_root = $CFG->dataroot . '/lock';
+//      $CFG->file_lock_root = $CFG->dataroot . '/lock';
 //
 //
 // Alternative task logging.
@@ -834,6 +834,10 @@
 // Example:
 //   $CFG->behat_faildump_path = '/my/path/to/save/failure/dumps';
 //
+// You can make behat pause upon failure to help you diagnose and debug problems with your tests.
+//
+//   $CFG->behat_pause_on_fail = true;
+//
 // You can specify db, selenium wd_host etc. for behat parallel run by setting following variable.
 // Example:
 //   $CFG->behat_parallel_run = array (
diff --git a/course/amd/build/repository.min.js b/course/amd/build/repository.min.js
index 5ea972f7cb2e7..f4d899c121371 100644
--- a/course/amd/build/repository.min.js
+++ b/course/amd/build/repository.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax"],function(a,b){var c=function(a,c,d,e){var f={classification:a};"undefined"!=typeof c&&(f.limit=c),"undefined"!=typeof d&&(f.offset=d),"undefined"!=typeof e&&(f.sort=e);var g={methodname:"core_course_get_enrolled_courses_by_timeline_classification",args:f};return b.call([g])[0]},d=function(a,c,d,e){var f={};"undefined"!=typeof a&&(f.limit=c),"undefined"!=typeof c&&(f.limit=c),"undefined"!=typeof d&&(f.offset=d),"undefined"!=typeof e&&(f.sort=e);var g={methodname:"core_course_get_recent_courses",args:f};return b.call([g])[0]};return{getEnrolledCoursesByTimelineClassification:c,getLastAccessedCourses:d}});
\ No newline at end of file
+define(["jquery","core/ajax"],function(a,b){var c=function(a,c,d,e){var f={classification:a};"undefined"!=typeof c&&(f.limit=c),"undefined"!=typeof d&&(f.offset=d),"undefined"!=typeof e&&(f.sort=e);var g={methodname:"core_course_get_enrolled_courses_by_timeline_classification",args:f};return b.call([g])[0]},d=function(a,c,d,e){var f={};"undefined"!=typeof a&&(f.userid=a),"undefined"!=typeof c&&(f.limit=c),"undefined"!=typeof d&&(f.offset=d),"undefined"!=typeof e&&(f.sort=e);var g={methodname:"core_course_get_recent_courses",args:f};return b.call([g])[0]};return{getEnrolledCoursesByTimelineClassification:c,getLastAccessedCourses:d}});
\ No newline at end of file
diff --git a/course/amd/src/repository.js b/course/amd/src/repository.js
index 98b67d5a24df1..6340eab31b125 100644
--- a/course/amd/src/repository.js
+++ b/course/amd/src/repository.js
@@ -71,7 +71,7 @@ define(['jquery', 'core/ajax'], function($, Ajax) {
         var args = {};
 
         if (typeof userid !== 'undefined') {
-            args.limit = limit;
+            args.userid = userid;
         }
 
         if (typeof limit !== 'undefined') {
diff --git a/course/classes/analytics/indicator/activities_due.php b/course/classes/analytics/indicator/activities_due.php
index 425785173bce5..b87da32734f71 100644
--- a/course/classes/analytics/indicator/activities_due.php
+++ b/course/classes/analytics/indicator/activities_due.php
@@ -68,8 +68,10 @@ public static function required_sample_data() {
      */
     protected function calculate_sample($sampleid, $sampleorigin, $starttime = false, $endtime = false) {
 
+        $user = $this->retrieve('user', $sampleid);
+
         $actionevents = \core_calendar_external::get_calendar_action_events_by_timesort($starttime, $endtime, 0, 1,
-            true, $sampleid);
+            true, $user->id);
 
         if ($actionevents->events) {
 
diff --git a/course/classes/analytics/target/course_enrolments.php b/course/classes/analytics/target/course_enrolments.php
index e97112a4172bc..f5321928e5b83 100644
--- a/course/classes/analytics/target/course_enrolments.php
+++ b/course/classes/analytics/target/course_enrolments.php
@@ -74,6 +74,10 @@ public function is_valid_analysable(\core_analytics\analysable $course, $fortrai
             return get_string('coursenotyetstarted', 'course');
         }
 
+        if (!$fortraining && !$course->get_course_data()->visible) {
+            return get_string('hiddenfromstudents');
+        }
+
         if (!$this->students = $course->get_students()) {
             return get_string('nocoursestudents', 'course');
         }
@@ -122,6 +126,8 @@ public function is_valid_analysable(\core_analytics\analysable $course, $fortrai
      */
     public function is_valid_sample($sampleid, \core_analytics\analysable $course, $fortraining = true) {
 
+        $now = time();
+
         $userenrol = $this->retrieve('user_enrolments', $sampleid);
         if ($userenrol->timeend && $course->get_start() > $userenrol->timeend) {
             // Discard enrolments which time end is prior to the course start. This should get rid of
@@ -139,9 +145,22 @@ public function is_valid_sample($sampleid, \core_analytics\analysable $course, $
             return false;
         }
 
-        if (($userenrol->timestart && $userenrol->timestart > $course->get_end()) ||
-                (!$userenrol->timestart && $userenrol->timecreated > $course->get_end())) {
-            // Discard user enrolments that starts after the analysable official end.
+        if ($course->get_end()) {
+            if (($userenrol->timestart && $userenrol->timestart > $course->get_end()) ||
+                    (!$userenrol->timestart && $userenrol->timecreated > $course->get_end())) {
+                // Discard user enrolments that starts after the analysable official end.
+                return false;
+            }
+
+        }
+
+        if ($now < $userenrol->timestart && $userenrol->timestart) {
+            // Discard enrolments whose start date is after now (no need to check timecreated > $now :P).
+            return false;
+        }
+
+        if (!$fortraining && $userenrol->timeend && $userenrol->timeend < $now) {
+            // We don't want to generate predictions for finished enrolments.
             return false;
         }
 
diff --git a/course/classes/category.php b/course/classes/category.php
index 251c460823ef1..b6aef77814532 100644
--- a/course/classes/category.php
+++ b/course/classes/category.php
@@ -717,13 +717,49 @@ public function get_db_record() {
      * @return mixed
      */
     protected static function get_tree($id) {
-        global $DB;
         $coursecattreecache = cache::make('core', 'coursecattree');
         $rv = $coursecattreecache->get($id);
         if ($rv !== false) {
             return $rv;
         }
+        // Might need to rebuild the tree. Put a lock in place to ensure other requests don't try and do this in parallel.
+        $lockfactory = \core\lock\lock_config::get_lock_factory('core_coursecattree');
+        $lock = $lockfactory->get_lock('core_coursecattree_cache',
+                course_modinfo::COURSE_CACHE_LOCK_WAIT, course_modinfo::COURSE_CACHE_LOCK_EXPIRY);
+        if ($lock === false) {
+            // Couldn't get a lock to rebuild the tree.
+            return [];
+        }
+        $rv = $coursecattreecache->get($id);
+        if ($rv !== false) {
+            // Tree was built while we were waiting for the lock.
+            $lock->release();
+            return $rv;
+        }
         // Re-build the tree.
+        try {
+            $all = self::rebuild_coursecattree_cache_contents();
+            $coursecattreecache->set_many($all);
+        } finally {
+            $lock->release();
+        }
+        if (array_key_exists($id, $all)) {
+            return $all[$id];
+        }
+        // Requested non-existing category.
+        return array();
+    }
+
+    /**
+     * Rebuild the course category tree as an array, including an extra "countall" field.
+     *
+     * @return array
+     * @throws coding_exception
+     * @throws dml_exception
+     * @throws moodle_exception
+     */
+    private static function rebuild_coursecattree_cache_contents() : array {
+        global $DB;
         $sql = "SELECT cc.id, cc.parent, cc.visible
                 FROM {course_categories} cc
                 ORDER BY cc.sortorder";
@@ -760,12 +796,7 @@ protected static function get_tree($id) {
         }
         // We must add countall to all in case it was the requested ID.
         $all['countall'] = $count;
-        $coursecattreecache->set_many($all);
-        if (array_key_exists($id, $all)) {
-            return $all[$id];
-        }
-        // Requested non-existing category.
-        return array();
+        return $all;
     }
 
     /**
diff --git a/course/classes/customfield/course_handler.php b/course/classes/customfield/course_handler.php
index d7badc85bf768..dede44dcbb960 100644
--- a/course/classes/customfield/course_handler.php
+++ b/course/classes/customfield/course_handler.php
@@ -68,6 +68,17 @@ public static function create(int $itemid = 0) : \core_customfield\handler {
         return self::$singleton;
     }
 
+    /**
+     * Run reset code after unit tests to reset the singleton usage.
+     */
+    public static function reset_caches(): void {
+        if (!PHPUNIT_TEST) {
+            throw new \coding_exception('This feature is only intended for use in unit tests');
+        }
+
+        static::$singleton = null;
+    }
+
     /**
      * The current user can configure custom fields on this component.
      *
diff --git a/course/classes/external/course_summary_exporter.php b/course/classes/external/course_summary_exporter.php
index 566af235f793e..65471f7298d34 100644
--- a/course/classes/external/course_summary_exporter.php
+++ b/course/classes/external/course_summary_exporter.php
@@ -105,6 +105,9 @@ public static function define_properties() {
             ),
             'enddate' => array(
                 'type' => PARAM_INT,
+            ),
+            'visible' => array(
+                'type' => PARAM_BOOL,
             )
         );
     }
diff --git a/course/edit.php b/course/edit.php
index 81626d8f87ae3..87c277a161a75 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -166,6 +166,8 @@
 
         if (!empty($CFG->creatornewroleid) and !is_viewing($context, NULL, 'moodle/role:assign') and !is_enrolled($context, NULL, 'moodle/role:assign')) {
             // Deal with course creators - enrol them internally with default role.
+            // Note: This does not respect capabilities, the creator will be assigned the default role.
+            // This is an expected behaviour. See MDL-66683 for further details.
             enrol_try_internal_enrol($course->id, $USER->id, $CFG->creatornewroleid);
         }
 
diff --git a/course/editsection.php b/course/editsection.php
index b04440bf8fe11..04ece14bf12b5 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -84,7 +84,14 @@
     }
 }
 
-$editoroptions = array('context'=>$context ,'maxfiles' => EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>false, 'noclean'=>true);
+$editoroptions = array(
+    'context'   => $context,
+    'maxfiles'  => EDITOR_UNLIMITED_FILES,
+    'maxbytes'  => $CFG->maxbytes,
+    'trusttext' => false,
+    'noclean'   => true,
+    'subdirs'   => true
+);
 
 $courseformat = course_get_format($course);
 $defaultsectionname = $courseformat->get_default_section_name($section);
diff --git a/course/externallib.php b/course/externallib.php
index bd4426082a516..23123acf9b470 100644
--- a/course/externallib.php
+++ b/course/externallib.php
@@ -3716,7 +3716,7 @@ public static function get_module($id, $sectionreturn = null) {
     }
 
     /**
-     * Return structure for edit_module()
+     * Return structure for get_module()
      *
      * @since Moodle 3.3
      * @return external_description
diff --git a/course/format/renderer.php b/course/format/renderer.php
index 2f94041f73484..b033633a73f56 100644
--- a/course/format/renderer.php
+++ b/course/format/renderer.php
@@ -488,11 +488,6 @@ protected function section_activity_summary($section, $course, $mods) {
         foreach ($modinfo->sections[$section->section] as $cmid) {
             $thismod = $modinfo->cms[$cmid];
 
-            if ($thismod->modname == 'label') {
-                // Labels are special (not interesting for students)!
-                continue;
-            }
-
             if ($thismod->uservisible) {
                 if (isset($sectionmods[$thismod->modname])) {
                     $sectionmods[$thismod->modname]['name'] = $thismod->modplural;
@@ -519,7 +514,7 @@ protected function section_activity_summary($section, $course, $mods) {
 
         // Output section activities summary:
         $o = '';
-        $o.= html_writer::start_tag('div', array('class' => 'section-summary-activities mdl-right'));
+        $o.= html_writer::start_tag('div', array('class' => 'section-summary-activities pr-2 mdl-right'));
         foreach ($sectionmods as $mod) {
             $o.= html_writer::start_tag('span', array('class' => 'activity-count'));
             $o.= $mod['name'].': '.$mod['count'];
@@ -533,7 +528,7 @@ protected function section_activity_summary($section, $course, $mods) {
             $a->complete = $complete;
             $a->total = $total;
 
-            $o.= html_writer::start_tag('div', array('class' => 'section-summary-activities mdl-right'));
+            $o.= html_writer::start_tag('div', array('class' => 'section-summary-activities pr-2 mdl-right'));
             $o.= html_writer::tag('span', get_string('progresstotal', 'completion', $a), array('class' => 'activity-count'));
             $o.= html_writer::end_tag('div');
         }
diff --git a/course/format/singleactivity/lib.php b/course/format/singleactivity/lib.php
index 50fa91a7f20a9..5db9dea89ea63 100644
--- a/course/format/singleactivity/lib.php
+++ b/course/format/singleactivity/lib.php
@@ -36,6 +36,9 @@ class format_singleactivity extends format_base {
     /** @var cm_info the current activity. Use get_activity() to retrieve it. */
     private $activity = false;
 
+    /** @var int The category ID guessed from the form data. */
+    private $categoryid = false;
+
     /**
      * The URL to use for the specified course
      *
@@ -145,6 +148,30 @@ public function get_default_blocks() {
      */
     public function course_format_options($foreditform = false) {
         static $courseformatoptions = false;
+
+        $fetchtypes = $courseformatoptions === false;
+        $fetchtypes = $fetchtypes || ($foreditform && !isset($courseformatoptions['activitytype']['label']));
+
+        if ($fetchtypes) {
+            $availabletypes = $this->get_supported_activities();
+            if ($this->course) {
+                // The course exists. Test against the course.
+                $testcontext = context_course::instance($this->course->id);
+            } else if ($this->categoryid) {
+                // The course does not exist yet, but we have a category ID that we can test against.
+                $testcontext = context_coursecat::instance($this->categoryid);
+            } else {
+                // The course does not exist, and we somehow do not have a category. Test capabilities against the system context.
+                $testcontext = context_system::instance();
+            }
+            foreach (array_keys($availabletypes) as $activity) {
+                $capability = "mod/{$activity}:addinstance";
+                if (!has_capability($capability, $testcontext)) {
+                    unset($availabletypes[$activity]);
+                }
+            }
+        }
+
         if ($courseformatoptions === false) {
             $config = get_config('format_singleactivity');
             $courseformatoptions = array(
@@ -153,9 +180,13 @@ public function course_format_options($foreditform = false) {
                     'type' => PARAM_TEXT,
                 ),
             );
+
+            if (!empty($availabletypes) && !isset($availabletypes[$config->activitytype])) {
+                $courseformatoptions['activitytype']['default'] = array_keys($availabletypes)[0];
+            }
         }
+
         if ($foreditform && !isset($courseformatoptions['activitytype']['label'])) {
-            $availabletypes = $this->get_supported_activities();
             $courseformatoptionsedit = array(
                 'activitytype' => array(
                     'label' => new lang_string('activitytype', 'format_singleactivity'),
@@ -183,6 +214,11 @@ public function course_format_options($foreditform = false) {
      */
     public function create_edit_form_elements(&$mform, $forsection = false) {
         global $PAGE;
+
+        if (!$this->course && $submitvalues = $mform->getSubmitValues()) {
+            $this->categoryid = $submitvalues['category'];
+        }
+
         $elements = parent::create_edit_form_elements($mform, $forsection);
         if (!$forsection && ($course = $PAGE->course) && !empty($course->format) &&
                 $course->format !== 'site' && $course->format !== 'singleactivity') {
diff --git a/course/format/singleactivity/tests/behat/create_course.feature b/course/format/singleactivity/tests/behat/create_course.feature
new file mode 100644
index 0000000000000..6eee07ff1cf6c
--- /dev/null
+++ b/course/format/singleactivity/tests/behat/create_course.feature
@@ -0,0 +1,38 @@
+@format @format_singleactivity
+Feature: Courses can be created in Single Activity mode
+  In order to create a single activity course
+  As a manager
+  I need to create courses and set default values on them
+
+  Scenario: Create a course as a custom course creator
+    Given the following "users" exist:
+      | username  | firstname | lastname | email          |
+      | kevin  | Kevin   | the        | kevin@example.com |
+    And the following "roles" exist:
+      | shortname | name    | archetype |
+      | creator   | Creator |           |
+    And the following "system role assigns" exist:
+      | user   | role    | contextlevel |
+      | kevin  | creator | System       |
+    And I log in as "admin"
+    And I set the following system permissions of "Creator" role:
+      | capability | permission |
+      | moodle/course:create | Allow |
+      | moodle/course:update | Allow |
+      | moodle/course:manageactivities | Allow |
+      | moodle/course:viewparticipants | Allow |
+      | moodle/role:assign | Allow |
+      | mod/quiz:addinstance | Allow |
+    And I log out
+    And I log in as "kevin"
+    And I am on site homepage
+    When I press "Add a new course"
+    And I set the following fields to these values:
+      | Course full name  | My first course |
+      | Course short name | myfirstcourse |
+      | Format | Single activity format |
+    And I press "Update format"
+    Then I should see "Quiz" in the "Type of activity" "field"
+    And I should not see "Forum" in the "Type of activity" "field"
+    And I press "Save and display"
+    And I should see "Adding a new Quiz"
diff --git a/course/format/social/format.php b/course/format/social/format.php
index bde9709102155..44cf6ca12ab4a 100644
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -50,7 +50,7 @@
         $streditsummary  = get_string('editsummary');
         $introcontent .= html_writer::start_div('editinglink');
         $introcontent .= html_writer::link(
-            new moodle_url('/modedit.php', [
+            new moodle_url('/course/modedit.php', [
                 'update' => $coursemodule->id,
                 'sesskey' => sesskey(),
             ]),
diff --git a/course/format/topics/db/upgrade.php b/course/format/topics/db/upgrade.php
index 055a902bca658..6dc38410cc8aa 100644
--- a/course/format/topics/db/upgrade.php
+++ b/course/format/topics/db/upgrade.php
@@ -65,5 +65,8 @@ function xmldb_format_topics_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/course/format/weeks/db/upgrade.php b/course/format/weeks/db/upgrade.php
index bbb141f28c58d..0309ac8001418 100644
--- a/course/format/weeks/db/upgrade.php
+++ b/course/format/weeks/db/upgrade.php
@@ -101,5 +101,8 @@ function xmldb_format_weeks_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/course/lib.php b/course/lib.php
index 25af452c7fab7..1094eb8aa4440 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1144,7 +1144,9 @@ function course_delete_module($cmid, $async = false) {
     }
 
     // Delete activity context questions and question categories.
-    question_delete_activity($cm);
+    $showinfo = !defined('AJAX_SCRIPT') || AJAX_SCRIPT == '0';
+
+    question_delete_activity($cm, $showinfo);
 
     // Call the delete_instance function, if it returns false throw an exception.
     if (!$deleteinstancefunction($cm->instance)) {
@@ -1289,16 +1291,36 @@ function course_module_flag_for_async_deletion($cmid) {
  * Checks whether the given course has any course modules scheduled for adhoc deletion.
  *
  * @param int $courseid the id of the course.
+ * @param bool $onlygradable whether to check only gradable modules or all modules.
  * @return bool true if the course contains any modules pending deletion, false otherwise.
  */
-function course_modules_pending_deletion($courseid) {
+function course_modules_pending_deletion($courseid, bool $onlygradable = false) : bool {
     if (empty($courseid)) {
         return false;
     }
+
+    if ($onlygradable) {
+        // Fetch modules with grade items.
+        if (!$coursegradeitems = grade_item::fetch_all(['itemtype' => 'mod', 'courseid' => $courseid])) {
+            // Return early when there is none.
+            return false;
+        }
+    }
+
     $modinfo = get_fast_modinfo($courseid);
     foreach ($modinfo->get_cms() as $module) {
         if ($module->deletioninprogress == '1') {
-            return true;
+            if ($onlygradable) {
+                // Check if the module being deleted is in the list of course modules with grade items.
+                foreach ($coursegradeitems as $coursegradeitem) {
+                    if ($coursegradeitem->itemmodule == $module->modname && $coursegradeitem->iteminstance == $module->instance) {
+                        // The module being deleted is within the gradable  modules.
+                        return true;
+                    }
+                }
+            } else {
+                return true;
+            }
         }
     }
     return false;
@@ -2182,6 +2204,7 @@ function move_courses($courseids, $categoryid) {
     foreach ($dbcourses as $dbcourse) {
         $course = new stdClass();
         $course->id = $dbcourse->id;
+        $course->timemodified = time();
         $course->category  = $category->id;
         $course->sortorder = $category->sortorder + MAX_COURSES_IN_CATEGORY - $i++;
         if ($category->visible == 0) {
@@ -3994,7 +4017,6 @@ function course_get_user_administration_options($course, $context) {
         $options->outcomes = !empty($CFG->enableoutcomes) && has_capability('moodle/course:update', $context);
         $options->badges = !empty($CFG->enablebadges);
         $options->import = has_capability('moodle/restore:restoretargetimport', $context);
-        $options->publish = !empty($CFG->enablecoursepublishing) && has_capability('moodle/course:publish', $context);
         $options->reset = has_capability('moodle/course:reset', $context);
         $options->roles = has_capability('moodle/role:switchroles', $context);
     } else {
@@ -4571,7 +4593,7 @@ function course_get_recent_courses(int $userid = null, int $limit = 0, int $offs
     }
 
     $basefields = array('id', 'idnumber', 'summary', 'summaryformat', 'startdate', 'enddate', 'category',
-            'shortname', 'fullname', 'timeaccess', 'component');
+            'shortname', 'fullname', 'timeaccess', 'component', 'visible');
 
     $sort = trim($sort);
     if (empty($sort)) {
diff --git a/course/management.php b/course/management.php
index 27784d152afdc..ad74a3e2f3b3d 100644
--- a/course/management.php
+++ b/course/management.php
@@ -69,8 +69,11 @@
     $course = null;
     $courseid = null;
     $topchildren = core_course_category::top()->get_children();
+    if (empty($topchildren)) {
+        throw new moodle_exception('cannotviewcategory', 'error');
+    }
     $category = reset($topchildren);
-    $categoryid = $category ? $category->id : 0;
+    $categoryid = $category->id;
     $context = context_coursecat::instance($category->id);
     $url->param('categoryid', $category->id);
 }
@@ -313,7 +316,8 @@
                         $notificationsfail[] = get_string('movecategoryownparent', 'error', $cattomove->get_formatted_name());
                         continue;
                     }
-                    if (strpos($movetocat->path, $cattomove->path) === 0) {
+                    // Don't allow user to move selected category into one of it's own sub-categories.
+                    if (strpos($movetocat->path, $cattomove->path . '/') === 0) {
                         $notificationsfail[] = get_string('movecategoryparentconflict', 'error', $cattomove->get_formatted_name());
                         continue;
                     }
diff --git a/course/publish/backup.php b/course/publish/backup.php
deleted file mode 100644
index f9f9d7a7ab005..0000000000000
--- a/course/publish/backup.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// Moodle is free software: you can redistribute it and/or modify        //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// Moodle is distributed in the hope that it will be useful,             //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * This page display the publication backup form
- *
- * @package    course
- * @subpackage publish
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- */
-
-define('NO_OUTPUT_BUFFERING', true);
-
-require_once('../../config.php');
-require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
-require_once($CFG->dirroot . '/backup/moodle2/backup_plan_builder.class.php');
-require_once($CFG->libdir . '/filelib.php');
-
-
-//retrieve initial page parameters
-$id = required_param('id', PARAM_INT);
-$hubcourseid = required_param('hubcourseid', PARAM_INT);
-
-//some permissions and parameters checking
-$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
-require_login($course);
-
-$context = context_course::instance($course->id);
-if (empty($CFG->enablecoursepublishing) || !has_capability('moodle/course:publish', $context) || !confirm_sesskey()) {
-    throw new moodle_exception('nopermission');
-}
-
-//page settings
-$PAGE->set_url('/course/publish/backup.php');
-$PAGE->set_pagelayout('incourse');
-$PAGE->set_title(get_string('course') . ': ' . $course->fullname);
-$PAGE->set_heading($course->fullname);
-
-//BEGIN backup processing
-$backupid = optional_param('backup', false, PARAM_ALPHANUM);
-if (!($bc = backup_ui::load_controller($backupid))) {
-    $bc = new backup_controller(backup::TYPE_1COURSE, $id, backup::FORMAT_MOODLE,
-                    backup::INTERACTIVE_YES, backup::MODE_HUB, $USER->id);
-}
-$backup = new backup_ui($bc,
-        array('id' => $id, 'hubcourseid' => $hubcourseid, 'huburl' => HUB_MOODLEORGHUBURL, 'hubname' => 'Moodle.net'));
-$backup->process();
-if ($backup->get_stage() == backup_ui::STAGE_FINAL) {
-    $backup->execute();
-} else {
-    $backup->save_controller();
-}
-
-if ($backup->get_stage() !== backup_ui::STAGE_COMPLETE) {
-    $renderer = $PAGE->get_renderer('core', 'backup');
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('publishcourseon', 'hub', 'Moodle.net'), 3, 'main');
-    if ($backup->enforce_changed_dependencies()) {
-        debugging('Your settings have been altered due to unmet dependencies', DEBUG_DEVELOPER);
-    }
-    echo $renderer->progress_bar($backup->get_progress_bar());
-    echo $backup->display($renderer);
-    echo $OUTPUT->footer();
-    die();
-}
-
-//$backupfile = $backup->get_stage_results();
-$backupfile = $bc->get_results();
-$backupfile = $backupfile['backup_destination'];
-//END backup processing
-
-//display the sending file page
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('sendingcourse', 'hub'), 3, 'main');
-$renderer = $PAGE->get_renderer('core', 'course');
-echo $renderer->sendingbackupinfo($backupfile);
-if (ob_get_level()) {
-    ob_flush();
-}
-flush();
-
-//send backup file to the hub
-\core\hub\publication::upload_course_backup($hubcourseid, $backupfile);
-
-//delete the temp backup file from user_tohub aera
-$backupfile->delete();
-$bc->destroy();
-
-//Output sending success
-echo $renderer->sentbackupinfo($id, HUB_MOODLEORGHUBURL, 'Moodle.net');
-
-echo $OUTPUT->footer();
diff --git a/course/publish/forms.php b/course/publish/forms.php
deleted file mode 100644
index 288475e0aae0b..0000000000000
--- a/course/publish/forms.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// Moodle is free software: you can redistribute it and/or modify        //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// Moodle is distributed in the hope that it will be useful,             //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * @package    course
- * @subpackage publish
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * The forms used for course publication
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-debugging('Support for alternative hubs has been removed from Moodle in 3.4. For communication with moodle.net ' .
-    'see lib/classes/hub/ .', DEBUG_DEVELOPER);
diff --git a/course/publish/index.php b/course/publish/index.php
deleted file mode 100644
index 7bff4732681ff..0000000000000
--- a/course/publish/index.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/*
- * @package    course
- * @subpackage publish
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * The user selects if he wants to publish the course on Moodle.org hub or
- * on a specific hub. The site must be registered on a hub to be able to
- * publish a course on it.
-*/
-
-require('../../config.php');
-
-$courseid = required_param('id', PARAM_INT); // Course id.
-$publicationid = optional_param('publicationid', 0, PARAM_INT); // Id of course publication to unpublish.
-
-require_login($courseid);
-$shortname = format_string($COURSE->shortname);
-
-$PAGE->set_url('/course/publish/index.php', array('id' => $courseid));
-$PAGE->set_pagelayout('incourse');
-$PAGE->set_title(get_string('publish', 'core_hub') . ': ' . $COURSE->fullname);
-$PAGE->set_heading($COURSE->fullname);
-
-$context = context_course::instance($courseid);
-if (empty($CFG->enablecoursepublishing) || !has_capability('moodle/course:publish', $context)) {
-    throw new moodle_exception('nopermission');
-}
-
-// If the site is not registered display an error page.
-if (!\core\hub\registration::is_registered()) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('publishcourseon', 'hub', 'Moodle.net'), 3, 'main');
-    echo $OUTPUT->box(get_string('notregisteredonhub', 'hub'));
-    if (has_capability('moodle/site:config', context_system::instance())) {
-        echo $OUTPUT->single_button(new moodle_url('/admin/registration/index.php'), get_string('register', 'admin'));
-    }
-    echo $OUTPUT->footer();
-    die();
-}
-
-// When hub listing status is requested update statuses of all published courses.
-$updatestatusid = optional_param('updatestatusid', false, PARAM_INT);
-if (!empty($updatestatusid) && confirm_sesskey()) {
-    if (core\hub\publication::get_publication($updatestatusid, $courseid)) {
-        core\hub\publication::request_status_update();
-        redirect($PAGE->url);
-    }
-}
-
-$renderer = $PAGE->get_renderer('core', 'course');
-
-// Unpublish course.
-if ($publication = \core\hub\publication::get_publication($publicationid, $courseid)) {
-    $confirm = optional_param('confirm', 0, PARAM_BOOL);
-    if ($confirm && confirm_sesskey()) {
-        \core\hub\publication::unpublish($publication);
-    } else {
-        // Display confirmation page for unpublishing.
-        $publication = \core\hub\publication::get_publication($publicationid, $courseid, MUST_EXIST);
-        $publication->courseshortname = format_string($COURSE->shortname);
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('unpublishcourse', 'hub', $shortname), 3, 'main');
-        echo $renderer->confirmunpublishing($publication);
-        echo $OUTPUT->footer();
-        die();
-    }
-}
-
-// List current publications and "Publish" buttons.
-echo $OUTPUT->header();
-
-echo $OUTPUT->heading(get_string('publishcourse', 'hub', $shortname), 3, 'main');
-echo $renderer->publicationselector($courseid);
-
-$publications = \core\hub\publication::get_course_publications($courseid);
-if (!empty($publications)) {
-    echo $OUTPUT->heading(get_string('publishedon', 'hub'), 3, 'main');
-    echo $renderer->registeredonhublisting($courseid, $publications);
-}
-
-echo $OUTPUT->footer();
diff --git a/course/publish/metadata.php b/course/publish/metadata.php
deleted file mode 100644
index 3042864d8b6ab..0000000000000
--- a/course/publish/metadata.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// This file is part of Moodle - http://moodle.org/                      //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//                                                                       //
-// Moodle is free software: you can redistribute it and/or modify        //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation, either version 3 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// Moodle is distributed in the hope that it will be useful,             //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details.                          //
-//                                                                       //
-// You should have received a copy of the GNU General Public License     //
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.       //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/*
- * @package    course
- * @subpackage publish
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * This page display the publication metadata form
- */
-
-require_once('../../config.php');
-require_once($CFG->libdir . '/filelib.php');
-
-
-//check user access capability to this page
-$id = required_param('id', PARAM_INT);
-
-$course = $DB->get_record('course', array('id' => $id), '*', MUST_EXIST);
-require_login($course);
-
-//page settings
-$PAGE->set_url('/course/publish/metadata.php', array('id' => $course->id));
-$PAGE->set_pagelayout('incourse');
-$PAGE->set_title(get_string('course') . ': ' . $course->fullname);
-$PAGE->set_heading($course->fullname);
-
-$context = context_course::instance($course->id);
-if (empty($CFG->enablecoursepublishing) || !has_capability('moodle/course:publish', $context)) {
-    throw new moodle_exception('nopermission');
-}
-
-// Retrieve hub name and hub url.
-require_sesskey();
-
-// Set the publication form.
-$advertise = optional_param('advertise', false, PARAM_BOOL);
-$publicationid = optional_param('publicationid', false, PARAM_INT);
-$formparams = array('course' => $course, 'advertise' => $advertise);
-if ($publicationid) {
-    $publication = \core\hub\publication::get_publication($publicationid, $course->id, MUST_EXIST);
-    $formparams['publication'] = $publication;
-    $advertise = $formparams['advertise'] = $publication->enrollable;
-}
-$share = !$advertise;
-$coursepublicationform = new \core\hub\course_publication_form('', $formparams);
-$fromform = $coursepublicationform->get_data();
-
-if (!empty($fromform)) {
-
-    // Retrieve the course information.
-    $courseinfo = new stdClass();
-    $courseinfo->fullname = $fromform->name;
-    $courseinfo->shortname = $fromform->courseshortname;
-    $courseinfo->description = $fromform->description;
-    $courseinfo->language = $fromform->language;
-    $courseinfo->publishername = $fromform->publishername;
-    $courseinfo->publisheremail = $fromform->publisheremail;
-    $courseinfo->contributornames = $fromform->contributornames;
-    $courseinfo->coverage = $fromform->coverage;
-    $courseinfo->creatorname = $fromform->creatorname;
-    $courseinfo->licenceshortname = $fromform->licence;
-    $courseinfo->subject = $fromform->subject;
-    $courseinfo->audience = $fromform->audience;
-    $courseinfo->educationallevel = $fromform->educationallevel;
-    $creatornotes = $fromform->creatornotes;
-    $courseinfo->creatornotes = $creatornotes['text'];
-    $courseinfo->creatornotesformat = $creatornotes['format'];
-    $courseinfo->sitecourseid = $id;
-    if (!empty($fromform->deletescreenshots)) {
-        $courseinfo->deletescreenshots = $fromform->deletescreenshots;
-    }
-    if ($share) {
-        $courseinfo->demourl = $fromform->demourl;
-        $courseinfo->enrollable = false;
-    } else {
-        $courseinfo->courseurl = $fromform->courseurl;
-        $courseinfo->enrollable = true;
-    }
-
-    // Retrieve the outcomes of this course.
-    require_once($CFG->libdir . '/grade/grade_outcome.php');
-    $outcomes = grade_outcome::fetch_all_available($id);
-    if (!empty($outcomes)) {
-        foreach ($outcomes as $outcome) {
-            $sentoutcome = new stdClass();
-            $sentoutcome->fullname = $outcome->fullname;
-            $courseinfo->outcomes[] = $sentoutcome;
-        }
-    }
-
-    // Retrieve the content information from the course.
-    $coursecontext = context_course::instance($course->id);
-    $courseblocks = \core\hub\publication::get_block_instances_by_context($coursecontext->id);
-
-    if (!empty($courseblocks)) {
-        $blockname = '';
-        foreach ($courseblocks as $courseblock) {
-            if ($courseblock->blockname != $blockname) {
-                if (!empty($blockname)) {
-                    $courseinfo->contents[] = $content;
-                }
-
-                $blockname = $courseblock->blockname;
-                $content = new stdClass();
-                $content->moduletype = 'block';
-                $content->modulename = $courseblock->blockname;
-                $content->contentcount = 1;
-            } else {
-                $content->contentcount = $content->contentcount + 1;
-            }
-        }
-        $courseinfo->contents[] = $content;
-    }
-
-    $activities = get_fast_modinfo($course, $USER->id);
-    foreach ($activities->instances as $activityname => $activitydetails) {
-        $content = new stdClass();
-        $content->moduletype = 'activity';
-        $content->modulename = $activityname;
-        $content->contentcount = count($activities->instances[$activityname]);
-        $courseinfo->contents[] = $content;
-    }
-
-    // Save into screenshots field the references to the screenshot content hash
-    // (it will be like a unique id from the hub perspective).
-    if (!empty($fromform->deletescreenshots) or $share) {
-        $courseinfo->screenshots = 0;
-    } else {
-        $courseinfo->screenshots = $fromform->existingscreenshotnumber;
-    }
-    $files = [];
-    if (!empty($fromform->screenshots)) {
-        $fs = get_file_storage();
-        $files = $fs->get_area_files(context_user::instance($USER->id)->id, 'user', 'draft', $fromform->screenshots,
-            'filepath, filename', false);
-        $files = array_filter($files, function(stored_file $file) {
-            return $file->is_valid_image();
-        });
-        $courseinfo->screenshots += count($files);
-    }
-
-    // PUBLISH ACTION.
-    $hubcourseid = \core\hub\publication::publish_course($courseinfo, $files);
-
-    // Redirect to the backup process page.
-    if ($share) {
-        $params = array('sesskey' => sesskey(), 'id' => $id, 'hubcourseid' => $hubcourseid);
-        $backupprocessurl = new moodle_url("/course/publish/backup.php", $params);
-        redirect($backupprocessurl);
-    } else {
-        // Redirect to the index publis page.
-        redirect(new moodle_url('/course/publish/index.php', ['id' => $id]),
-            get_string('coursepublished', 'hub', 'Moodle.net'), null, \core\output\notification::NOTIFY_SUCCESS);
-    }
-}
-
-// OUTPUT SECTION.
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('publishcourseon', 'hub', 'Moodle.net'), 3, 'main');
-
-// Display hub information (logo, name, description).
-$renderer = $PAGE->get_renderer('core', 'course');
-if ($hubinfo = \core\hub\registration::get_moodlenet_info()) {
-    echo $renderer->hubinfo($hubinfo);
-}
-
-// Display metadata form.
-$coursepublicationform->display();
-echo $OUTPUT->footer();
diff --git a/course/renderer.php b/course/renderer.php
index 9d1439c7ad8bc..30c865b19d0f4 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -2105,128 +2105,6 @@ public function render_activity_navigation(\core_course\output\activity_navigati
         return $this->output->render_from_template('core_course/activity_navigation', $data);
     }
 
-    /**
-     * Display the selector to advertise or publish a course
-     * @param int $courseid
-     */
-    public function publicationselector($courseid) {
-        $text = '';
-
-        $advertiseurl = new moodle_url("/course/publish/metadata.php",
-            array('sesskey' => sesskey(), 'id' => $courseid, 'advertise' => true));
-        $advertisebutton = new single_button($advertiseurl, get_string('advertise', 'hub'));
-        $text .= $this->output->render($advertisebutton);
-        $text .= html_writer::tag('div', get_string('advertisepublication_help', 'hub'),
-            array('class' => 'publishhelp'));
-
-        $text .= html_writer::empty_tag('br');  // TODO Delete.
-
-        $uploadurl = new moodle_url("/course/publish/metadata.php",
-            array('sesskey' => sesskey(), 'id' => $courseid, 'share' => true));
-        $uploadbutton = new single_button($uploadurl, get_string('share', 'hub'));
-        $text .= $this->output->render($uploadbutton);
-        $text .= html_writer::tag('div', get_string('sharepublication_help', 'hub'),
-            array('class' => 'publishhelp'));
-
-        return $text;
-    }
-
-    /**
-     * Display the listing of hub where a course is registered on
-     * @param int $courseid
-     * @param array $publications
-     */
-    public function registeredonhublisting($courseid, $publications) {
-        global $CFG;
-        $table = new html_table();
-        $table->head = array(get_string('type', 'hub'),
-            get_string('date'), get_string('status', 'hub'), get_string('operation', 'hub'));
-        $table->size = array('20%', '30%', '%20', '%25');
-
-        $brtag = html_writer::empty_tag('br');
-
-        foreach ($publications as $publication) {
-
-            $params = array('id' => $publication->courseid, 'publicationid' => $publication->id);
-            $cancelurl = new moodle_url("/course/publish/index.php", $params);
-            $cancelbutton = new single_button($cancelurl, get_string('removefromhub', 'hub'));
-            $cancelbutton->class = 'centeredbutton';
-            $cancelbuttonhtml = $this->output->render($cancelbutton);
-
-            if ($publication->enrollable) {
-                $params = array('sesskey' => sesskey(), 'id' => $publication->courseid, 'publicationid' => $publication->id);
-                $updateurl = new moodle_url("/course/publish/metadata.php", $params);
-                $updatebutton = new single_button($updateurl, get_string('update', 'hub'));
-                $updatebutton->class = 'centeredbutton';
-                $updatebuttonhtml = $this->output->render($updatebutton);
-
-                $operations = $updatebuttonhtml . $brtag . $cancelbuttonhtml;
-            } else {
-                $operations = $cancelbuttonhtml;
-            }
-
-            // If the publication check time if bigger than May 2010, it has been checked.
-            if ($publication->timechecked > 1273127954) {
-                if ($publication->status == 0) {
-                    $status = get_string('statusunpublished', 'hub');
-                } else {
-                    $status = get_string('statuspublished', 'hub');
-                    if (!empty($publication->link)) {
-                        $status = html_writer::link($publication->link, $status);
-                    }
-                }
-
-                $status .= $brtag . html_writer::tag('a', get_string('updatestatus', 'hub'),
-                        array('href' => $CFG->wwwroot . '/course/publish/index.php?id='
-                            . $courseid . "&updatestatusid=" . $publication->id
-                            . "&sesskey=" . sesskey())) .
-                    $brtag . get_string('lasttimechecked', 'hub') . ": "
-                    . format_time(time() - $publication->timechecked);
-            } else {
-                $status = get_string('neverchecked', 'hub') . $brtag
-                    . html_writer::tag('a', get_string('updatestatus', 'hub'),
-                        array('href' => $CFG->wwwroot . '/course/publish/index.php?id='
-                            . $courseid . "&updatestatusid=" . $publication->id
-                            . "&sesskey=" . sesskey()));
-            }
-            // Add button cells.
-            $cells = array($publication->enrollable ?
-                get_string('advertised', 'hub') : get_string('shared', 'hub'),
-                userdate($publication->timepublished,
-                    get_string('strftimedatetimeshort')), $status, $operations);
-            $row = new html_table_row($cells);
-            $table->data[] = $row;
-        }
-
-        $contenthtml = html_writer::table($table);
-
-        return $contenthtml;
-    }
-
-    /**
-     * Display unpublishing confirmation page
-     * @param stdClass $publication
-     *      $publication->courseshortname
-     *      $publication->courseid
-     *      $publication->hubname
-     *      $publication->huburl
-     *      $publication->id
-     */
-    public function confirmunpublishing($publication) {
-        $optionsyes = array('sesskey' => sesskey(), 'id' => $publication->courseid,
-            'hubcourseid' => $publication->hubcourseid,
-            'cancel' => true, 'publicationid' => $publication->id, 'confirm' => true);
-        $optionsno = array('sesskey' => sesskey(), 'id' => $publication->courseid);
-        $publication->hubname = html_writer::tag('a', 'Moodle.net',
-            array('href' => HUB_MOODLEORGHUBURL));
-        $formcontinue = new single_button(new moodle_url("/course/publish/index.php",
-            $optionsyes), get_string('unpublish', 'hub'), 'post');
-        $formcancel = new single_button(new moodle_url("/course/publish/index.php",
-            $optionsno), get_string('cancel'), 'get');
-        return $this->output->confirm(get_string('unpublishconfirmation', 'hub', $publication),
-            $formcontinue, $formcancel);
-    }
-
     /**
      * Display waiting information about backup size during uploading backup process
      * @param object $backupfile the backup stored_file
@@ -2240,23 +2118,6 @@ public function sendingbackupinfo($backupfile) {
         return $html;
     }
 
-    /**
-     * Display upload successfull message and a button to the publish index page
-     * @param int $id the course id
-     * @return $html string
-     */
-    public function sentbackupinfo($id) {
-        $html = html_writer::tag('div', get_string('sent', 'hub'),
-            array('class' => 'courseuploadtextinfo'));
-        $publishindexurl = new moodle_url('/course/publish/index.php',
-            array('sesskey' => sesskey(), 'id' => $id,
-                'published' => true));
-        $continue = $this->output->render(
-            new single_button($publishindexurl, get_string('continue')));
-        $html .= html_writer::tag('div', $continue, array('class' => 'sharecoursecontinue'));
-        return $html;
-    }
-
     /**
      * Hub information (logo - name - description - link)
      * @param object $hubinfo
diff --git a/course/templates/activity_navigation.mustache b/course/templates/activity_navigation.mustache
index c3583e1900f03..3b2af237a6d83 100644
--- a/course/templates/activity_navigation.mustache
+++ b/course/templates/activity_navigation.mustache
@@ -64,7 +64,7 @@
         }
     }
 }}
-<div class="mt-2 mb-1 activity-navigation">
+<div class="mt-5 mb-1 activity-navigation">
 {{< core/columns-1to1to1}}
     {{$column1}}
         <div class="float-left">
diff --git a/course/templates/coursecard.mustache b/course/templates/coursecard.mustache
index 1aba15c597fd7..74300b9fb6c9a 100644
--- a/course/templates/coursecard.mustache
+++ b/course/templates/coursecard.mustache
@@ -28,7 +28,8 @@
                 "courseimage": "https://moodlesite/pluginfile/123/course/overviewfiles/123.jpg",
                 "fullname": "course 3",
                 "hasprogress": true,
-                "progress": 10
+                "progress": 10,
+                "visible": true
             }
         ]
     }
@@ -43,8 +44,8 @@
     </a>
     <div class="card-body pr-1 course-info-container" id="course-info-container-{{id}}-{{uniqid}}">
         <div class="d-flex align-items-start">
-            <div>
-                <div class="text-muted muted d-flex w-100 mb-1 text-truncate flex-wrap">
+            <div class="w-100 text-truncate">
+                <div class="text-muted muted d-flex mb-1 flex-wrap">
                     {{$coursecategory}}{{/coursecategory}}
                     {{#showshortname}}
                     {{$divider}}{{/divider}}
@@ -56,13 +57,18 @@
                     </div>
                     {{/showshortname}}
                 </div>
-                <a href="{{viewurl}}" class="coursename mr-2 text-truncate">
+                <a href="{{viewurl}}" class="coursename mr-2">
                     {{> core_course/favouriteicon }}
                     <span class="sr-only">
                             {{#str}}aria:coursename, core_course{{/str}}
                         </span>
                     {{$coursename}}{{/coursename}}
                 </a>
+                {{^visible}}
+                    <div class="d-flex flex-wrap">
+                        <span class="tag tag-info">{{#str}} hiddenfromstudents {{/str}}</span>
+                    </div>
+                {{/visible}}
             </div>
             {{$menu}}{{/menu}}
         </div>
diff --git a/course/tests/behat/app_course_completion.feature b/course/tests/behat/app_course_completion.feature
deleted file mode 100644
index f0c30baa969d1..0000000000000
--- a/course/tests/behat/app_course_completion.feature
+++ /dev/null
@@ -1,36 +0,0 @@
-@core @core_course @app @javascript
-Feature: Check course completion feature.
-  In order to track the progress of the course on mobile device
-  As a student
-  I need to be able to update the activity completion status.
-
-  Background:
-    Given the following "users" exist:
-      | username | firstname | lastname | email                |
-      | student1 | Student   | 1        | student1@example.com |
-    And the following "courses" exist:
-      | fullname | shortname | category | enablecompletion |
-      | Course 1 | C1        | 0        | 1                |
-    And the following "course enrolments" exist:
-      | user     | course | role    |
-      | student1 | C1     | student |
-
-  Scenario: Complete the activity manually by clicking at the completion checkbox.
-    Given the following "activities" exist:
-      | activity | name         | course | idnumber | completion | completionview |
-      | forum    | First forum  | C1     | forum1   | 1          | 0              |
-      | forum    | Second forum | C1     | forum2   | 1          | 0              |
-    When I enter the app
-    And I log in as "student1"
-    And I press "Course 1" near "Recently accessed courses" in the app
-    # Set activities as completed.
-    And I should see "0%"
-    And I press "Not completed: First forum. Select to mark as complete." in the app
-    And I should see "50%"
-    And I press "Not completed: Second forum. Select to mark as complete." in the app
-    And I should see "100%"
-    # Set activities as not completed.
-    And I press "Completed: First forum. Select to mark as not complete." in the app
-    And I should see "50%"
-    And I press "Completed: Second forum. Select to mark as not complete." in the app
-    And I should see "0%"
diff --git a/course/tests/behat/app_courselist.feature b/course/tests/behat/app_courselist.feature
deleted file mode 100644
index ea68c0542eb95..0000000000000
--- a/course/tests/behat/app_courselist.feature
+++ /dev/null
@@ -1,120 +0,0 @@
-@core @core_course @app @javascript
-Feature: Test course list shown on app start tab
-  In order to select a course
-  As a student
-  I need to see the correct list of courses
-
-  Background:
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1        |
-      | Course 2 | C2        |
-    And the following "users" exist:
-      | username |
-      | student1 |
-      | student2 |
-    And the following "course enrolments" exist:
-      | user     | course | role    |
-      | student1 | C1     | student |
-      | student2 | C1     | student |
-      | student2 | C2     | student |
-
-  Scenario: Student is registered on one course
-    When I enter the app
-    And I log in as "student1"
-    Then I should see "Course 1"
-    And I should not see "Course 2"
-
-  Scenario: Student is registered on two courses (shortnames not displayed)
-    When I enter the app
-    And I log in as "student2"
-    Then I should see "Course 1"
-    And I should see "Course 2"
-    And I should not see "C1"
-    And I should not see "C2"
-
-  Scenario: Student is registered on two courses (shortnames displayed)
-    Given the following config values are set as admin:
-      | courselistshortnames | 1 |
-    When I enter the app
-    And I log in as "student2"
-    Then I should see "Course 1"
-    And I should see "Course 2"
-    And I should see "C1"
-    And I should see "C2"
-
-  Scenario: Student uses course list to enter course, then leaves it again
-    When I enter the app
-    And I log in as "student2"
-    And I press "Course 2" near "Course overview" in the app
-    Then the header should be "Course 2" in the app
-    And I press the back button in the app
-    Then the header should be "Acceptance test site" in the app
-
-  Scenario: Student uses filter feature to reduce course list
-    Given the following config values are set as admin:
-      | courselistshortnames | 1 |
-    And the following "courses" exist:
-      | fullname | shortname |
-      | Frog 3   | C3        |
-      | Frog 4   | C4        |
-      | Course 5 | C5        |
-      | Toad 6   | C6        |
-    And the following "course enrolments" exist:
-      | user     | course | role    |
-      | student2 | C3     | student |
-      | student2 | C4     | student |
-      | student2 | C5     | student |
-      | student2 | C6     | student |
-    # Create bogus courses so that the main ones aren't shown in the 'recently accessed' part.
-    # Because these come later in alphabetical order, they may not be displayed in the lower part
-    # which is OK.
-    And the following "courses" exist:
-      | fullname | shortname |
-      | Zogus 1  | Z1        |
-      | Zogus 2  | Z2        |
-      | Zogus 3  | Z3        |
-      | Zogus 4  | Z4        |
-      | Zogus 5  | Z5        |
-      | Zogus 6  | Z6        |
-      | Zogus 7  | Z7        |
-      | Zogus 8  | Z8        |
-      | Zogus 9  | Z9        |
-      | Zogus 10 | Z10       |
-    And the following "course enrolments" exist:
-      | user     | course | role    |
-      | student2 | Z1     | student |
-      | student2 | Z2     | student |
-      | student2 | Z3     | student |
-      | student2 | Z4     | student |
-      | student2 | Z5     | student |
-      | student2 | Z6     | student |
-      | student2 | Z7     | student |
-      | student2 | Z8     | student |
-      | student2 | Z9     | student |
-      | student2 | Z10    | student |
-    When I enter the app
-    And I log in as "student2"
-    Then I should see "C1"
-    And I should see "C2"
-    And I should see "C3"
-    And I should see "C4"
-    And I should see "C5"
-    And I should see "C6"
-    And I press "more" near "Course overview" in the app
-    And I press "Filter my courses" in the app
-    And I set the field "Filter my courses" to "fr" in the app
-    Then I should not see "C1"
-    And I should not see "C2"
-    And I should see "C3"
-    And I should see "C4"
-    And I should not see "C5"
-    And I should not see "C6"
-    And I press "more" near "Course overview" in the app
-    And I press "Filter my courses" in the app
-    Then I should see "C1"
-    And I should see "C2"
-    And I should see "C3"
-    And I should see "C4"
-    And I should see "C5"
-    And I should see "C6"
diff --git a/course/tests/behat/behat_course.php b/course/tests/behat/behat_course.php
index 35465843b41a2..16fa6e3e3ad39 100644
--- a/course/tests/behat/behat_course.php
+++ b/course/tests/behat/behat_course.php
@@ -1144,11 +1144,8 @@ public function i_click_on_in_the_activity($element, $selectortype, $activitynam
     protected function get_activity_element($element, $selectortype, $activityname) {
         $activitynode = $this->get_activity_node($activityname);
 
-        // Transforming to Behat selector/locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-        $exception = new ElementNotFoundException($this->getSession(), '"' . $element . '" "' . $selectortype . '" in "' . $activityname . '" ');
-
-        return $this->find($selector, $locator, $exception, $activitynode);
+        $exception = new ElementNotFoundException($this->getSession(), "'{$element}' '{$selectortype}' in '${activityname}'");
+        return $this->find($selectortype, $element, $exception, $activitynode);
     }
 
     /**
diff --git a/course/tests/behat/course_creation.feature b/course/tests/behat/course_creation.feature
index 2596eb281de38..859afcc8e0773 100644
--- a/course/tests/behat/course_creation.feature
+++ b/course/tests/behat/course_creation.feature
@@ -68,3 +68,31 @@ Feature: Managers can create courses
       | id_enddate_day | 24 |
       | id_enddate_month | October |
       | id_enddate_year | 2016 |
+
+  Scenario: Create a course as a custom course creator
+    Given the following "users" exist:
+      | username  | firstname | lastname | email          |
+      | kevin  | Kevin   | the        | kevin@example.com |
+    And the following "roles" exist:
+      | shortname | name    | archetype |
+      | creator   | Creator |           |
+    And the following "system role assigns" exist:
+      | user   | role    | contextlevel |
+      | kevin  | creator | System       |
+    And I log in as "admin"
+    And I set the following system permissions of "Creator" role:
+      | capability | permission |
+      | moodle/course:create | Allow |
+      | moodle/course:manageactivities | Allow |
+      | moodle/course:viewparticipants | Allow |
+    And I log out
+    And I log in as "kevin"
+    And I am on site homepage
+    When I press "Add a new course"
+    And I set the following fields to these values:
+      | Course full name  | My first course |
+      | Course short name | myfirstcourse |
+    And I press "Save and display"
+    And I follow "Participants"
+    Then I should see "Kevin the"
+    And I should see "Teacher"
diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php
index 26197f01b8e0c..5e70ddff4b80b 100644
--- a/course/tests/courselib_test.php
+++ b/course/tests/courselib_test.php
@@ -3193,7 +3193,6 @@ public function test_course_get_user_administration_options_for_managers() {
         $this->assertFalse($adminoptions->outcomes);
         $this->assertTrue($adminoptions->badges);
         $this->assertTrue($adminoptions->import);
-        $this->assertFalse($adminoptions->publish);
         $this->assertTrue($adminoptions->reset);
         $this->assertTrue($adminoptions->roles);
     }
@@ -3225,7 +3224,6 @@ public function test_course_get_user_administration_options_for_students() {
         $this->assertFalse($adminoptions->outcomes);
         $this->assertTrue($adminoptions->badges);
         $this->assertFalse($adminoptions->import);
-        $this->assertFalse($adminoptions->publish);
         $this->assertFalse($adminoptions->reset);
         $this->assertFalse($adminoptions->roles);
 
@@ -5021,6 +5019,7 @@ public function test_core_course_core_calendar_get_valid_event_timestart_range_w
      * Test the course_get_recent_courses function.
      */
     public function test_course_get_recent_courses() {
+        global $DB;
 
         $this->resetAfterTest();
         $generator = $this->getDataGenerator();
@@ -5043,9 +5042,15 @@ public function test_course_get_recent_courses() {
         // No course accessed.
         $this->assertCount(0, $result);
 
+        $time = time();
         foreach ($courses as $course) {
             $context = context_course::instance($course->id);
             course_view($context);
+            $DB->set_field('user_lastaccess', 'timeaccess', $time, [
+                'userid' => $student->id,
+                'courseid' => $course->id,
+                ]);
+            $time++;
         }
 
         // Every course accessed.
@@ -5056,10 +5061,10 @@ public function test_course_get_recent_courses() {
         $result = course_get_recent_courses($student->id, 2);
         $this->assertCount(2, $result);
 
-        // Every course accessed, with limit and offset. Should return only the last created course ($course[2]).
+        // Every course accessed, with limit and offset should return the first course.
         $result = course_get_recent_courses($student->id, 3, 2);
         $this->assertCount(1, $result);
-        $this->assertArrayHasKey($courses[2]->id, $result);
+        $this->assertArrayHasKey($courses[0]->id, $result);
 
         // Every course accessed, order by shortname DESC. The last create course ($course[2]) should have the greater shortname.
         $result = course_get_recent_courses($student->id, 0, 0, 'shortname DESC');
@@ -5085,4 +5090,50 @@ public function test_course_get_recent_courses() {
         $this->assertCount(3, $result);
         $this->assertArrayNotHasKey($courses[0]->id, $result);
     }
+
+    /**
+     * Data provider for test_course_modules_pending_deletion.
+     *
+     * @return array An array of arrays contain test data
+     */
+    public function provider_course_modules_pending_deletion() {
+        return [
+            'Non-gradable activity, check all'              => [['forum'], 0, false, true],
+            'Gradable activity, check all'                  => [['assign'], 0, false, true],
+            'Non-gradable activity, check gradables'        => [['forum'], 0, true, false],
+            'Gradable activity, check gradables'            => [['assign'], 0, true, true],
+            'Non-gradable within multiple, check all'       => [['quiz', 'forum', 'assign'], 1, false, true],
+            'Non-gradable within multiple, check gradables' => [['quiz', 'forum', 'assign'], 1, true, false],
+            'Gradable within multiple, check all'           => [['quiz', 'forum', 'assign'], 2, false, true],
+            'Gradable within multiple, check gradables'     => [['quiz', 'forum', 'assign'], 2, true, true],
+        ];
+    }
+
+    /**
+     * Tests the function course_modules_pending_deletion.
+     *
+     * @param string[] $modules A complete list aff all available modules before deletion
+     * @param int $indextodelete The index of the module in the $modules array that we want to test with
+     * @param bool $gradable The value to pass to the gradable argument of the course_modules_pending_deletion function
+     * @param bool $expected The expected result
+     * @dataProvider provider_course_modules_pending_deletion
+     */
+    public function test_course_modules_pending_deletion(array $modules, int $indextodelete, bool $gradable, bool $expected) {
+        $this->resetAfterTest();
+
+        // Ensure recyclebin is enabled.
+        set_config('coursebinenable', true, 'tool_recyclebin');
+
+        // Create course and modules.
+        $generator = $this->getDataGenerator();
+        $course = $generator->create_course();
+
+        $moduleinstances = [];
+        foreach ($modules as $module) {
+            $moduleinstances[] = $generator->create_module($module, array('course' => $course->id));
+        }
+
+        course_delete_module($moduleinstances[$indextodelete]->cmid, true); // Try to delete the instance asynchronously.
+        $this->assertEquals($expected, course_modules_pending_deletion($course->id, $gradable));
+    }
 }
diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php
index ac06afab57c99..bc6560d4d8ded 100644
--- a/course/tests/externallib_test.php
+++ b/course/tests/externallib_test.php
@@ -958,7 +958,6 @@ public function test_get_course_contents() {
         foreach ($sections[2]['modules'] as $module) {
             if ($module['id'] == $urlcm->id and $module['modname'] == 'url') {
                 $this->assertContains('width=100,height=100', $module['onclick']);
-                $this->assertContains('moodle.org', $module['customdata']);
                 $testexecuted = $testexecuted + 1;
             }
         }
@@ -2334,12 +2333,11 @@ public function test_get_user_administration_options() {
                 $this->assertFalse($adminoptions->outcomes);
                 $this->assertFalse($adminoptions->badges);
                 $this->assertFalse($adminoptions->import);
-                $this->assertFalse($adminoptions->publish);
                 $this->assertFalse($adminoptions->reset);
                 $this->assertFalse($adminoptions->roles);
                 $this->assertFalse($adminoptions->editcompletion);
             } else {
-                $this->assertCount(15, $course['options']);
+                $this->assertCount(14, $course['options']);
                 $this->assertFalse($adminoptions->update);
                 $this->assertFalse($adminoptions->filters);
                 $this->assertFalse($adminoptions->reports);
@@ -2351,7 +2349,6 @@ public function test_get_user_administration_options() {
                 $this->assertFalse($adminoptions->outcomes);
                 $this->assertTrue($adminoptions->badges);
                 $this->assertFalse($adminoptions->import);
-                $this->assertFalse($adminoptions->publish);
                 $this->assertFalse($adminoptions->reset);
                 $this->assertFalse($adminoptions->roles);
                 $this->assertFalse($adminoptions->editcompletion);
diff --git a/course/tests/indicators_test.php b/course/tests/indicators_test.php
index 1749a13a57645..3ad47f95e891e 100644
--- a/course/tests/indicators_test.php
+++ b/course/tests/indicators_test.php
@@ -28,6 +28,7 @@
 global $CFG;
 require_once(__DIR__ . '/../../lib/completionlib.php');
 require_once(__DIR__ . '/../../completion/criteria/completion_criteria_self.php');
+require_once(__DIR__ . '/../../analytics/tests/fixtures/test_target_course_users.php');
 
 /**
  * Unit tests for core_course indicators.
@@ -313,4 +314,30 @@ public function test_potential_social() {
         // Page social is level 1 (the lower level).
         $this->assertEquals($indicator::get_min_value(), $values[$cm2->id][0]);
     }
+
+    /**
+     * test_activities_due
+     *
+     * @return void
+     */
+    public function test_activities_due() {
+        global $DB;
+
+        $this->resetAfterTest(true);
+        $this->setAdminuser();
+
+        $course1 = $this->getDataGenerator()->create_course();
+        $user1 = $this->getDataGenerator()->create_user();
+        $this->getDataGenerator()->enrol_user($user1->id, $course1->id, 'student');
+
+        $target = \core_analytics\manager::get_target('test_target_course_users');
+        $indicators = array('\core_course\analytics\indicator\activities_due');
+        foreach ($indicators as $key => $indicator) {
+            $indicators[$key] = \core_analytics\manager::get_indicator($indicator);
+        }
+
+        $model = \core_analytics\model::create($target, $indicators);
+        $model->enable('\core\analytics\time_splitting\single_range');
+        $model->train();
+    }
 }
diff --git a/course/tests/restore_test.php b/course/tests/restore_test.php
index 470e03b13daa0..4f659902ffb50 100644
--- a/course/tests/restore_test.php
+++ b/course/tests/restore_test.php
@@ -131,6 +131,157 @@ protected function restore_to_new_course($backupid, $userid = 2) {
         return $this->restore_course($backupid, 0, $userid);
     }
 
+    /**
+     * Restore a course.
+     *
+     * @param int $backupid The backup ID.
+     * @param int $courseid The course ID to restore in, or 0.
+     * @param int $userid The ID of the user performing the restore.
+     * @param int $target THe target of the restore.
+     *
+     * @return stdClass The updated course object.
+     */
+    protected function async_restore_course($backupid, $courseid, $userid, $target) {
+        global $DB;
+
+        if (!$courseid) {
+            $target = backup::TARGET_NEW_COURSE;
+            $categoryid = $DB->get_field_sql("SELECT MIN(id) FROM {course_categories}");
+            $courseid = restore_dbops::create_new_course('Tmp', 'tmp', $categoryid);
+        }
+
+        $rc = new restore_controller($backupid, $courseid, backup::INTERACTIVE_NO, backup::MODE_ASYNC, $userid, $target);
+        $target == backup::TARGET_NEW_COURSE ?: $rc->get_plan()->get_setting('overwrite_conf')->set_value(true);
+        $this->assertTrue($rc->execute_precheck());
+
+        $restoreid = $rc->get_restoreid();
+        $rc->destroy();
+
+        // Create the adhoc task.
+        $asynctask = new \core\task\asynchronous_restore_task();
+        $asynctask->set_blocking(false);
+        $asynctask->set_custom_data(array('backupid' => $restoreid));
+        \core\task\manager::queue_adhoc_task($asynctask);
+
+        // We are expecting trace output during this test.
+        $this->expectOutputRegex("/$restoreid/");
+
+        // Execute adhoc task.
+        $now = time();
+        $task = \core\task\manager::get_next_adhoc_task($now);
+        $this->assertInstanceOf('\\core\\task\\asynchronous_restore_task', $task);
+        $task->execute();
+        \core\task\manager::adhoc_task_complete($task);
+
+        $course = $DB->get_record('course', array('id' => $rc->get_courseid()));
+
+        return $course;
+    }
+
+    /**
+     * Restore a course to an existing course.
+     *
+     * @param int $backupid The backup ID.
+     * @param int $courseid The course ID to restore in.
+     * @param int $userid The ID of the user performing the restore.
+     * @param int $target The type of restore we are performing.
+     * @return stdClass The updated course object.
+     */
+    protected function async_restore_to_existing_course($backupid, $courseid,
+        $userid = 2, $target = backup::TARGET_CURRENT_ADDING) {
+        return $this->async_restore_course($backupid, $courseid, $userid, $target);
+    }
+
+    /**
+     * Restore a course to a new course.
+     *
+     * @param int $backupid The backup ID.
+     * @param int $userid The ID of the user performing the restore.
+     * @return stdClass The new course object.
+     */
+    protected function async_restore_to_new_course($backupid, $userid = 2) {
+        return $this->async_restore_course($backupid, 0, $userid, 0);
+    }
+
+    public function test_async_restore_existing_idnumber_in_new_course() {
+        $this->resetAfterTest();
+
+        $dg = $this->getDataGenerator();
+        $c1 = $dg->create_course(['idnumber' => 'ABC']);
+        $backupid = $this->backup_course($c1->id);
+        $c2 = $this->async_restore_to_new_course($backupid);
+
+        // The ID number is set empty.
+        $this->assertEquals('', $c2->idnumber);
+    }
+
+    public function test_async_restore_course_info_in_existing_course() {
+        global $DB;
+        $this->resetAfterTest();
+        $dg = $this->getDataGenerator();
+
+        $this->assertEquals(1, get_config('restore', 'restore_merge_course_shortname'));
+        $this->assertEquals(1, get_config('restore', 'restore_merge_course_fullname'));
+        $this->assertEquals(1, get_config('restore', 'restore_merge_course_startdate'));
+
+        $startdate = mktime(12, 0, 0, 7, 1, 2016); // 01-Jul-2016.
+
+        // Create two courses with different start dates,in each course create a chat that opens 1 week after the course start date.
+        $c1 = $dg->create_course(['shortname' => 'SN', 'fullname' => 'FN', 'summary' => 'DESC', 'summaryformat' => FORMAT_MOODLE,
+            'startdate' => $startdate]);
+        $chat1 = $dg->create_module('chat', ['name' => 'First', 'course' => $c1->id, 'chattime' => $c1->startdate + 1 * WEEKSECS]);
+        $c2 = $dg->create_course(['shortname' => 'A', 'fullname' => 'B', 'summary' => 'C', 'summaryformat' => FORMAT_PLAIN,
+            'startdate' => $startdate + 2 * WEEKSECS]);
+        $chat2 = $dg->create_module('chat', ['name' => 'Second', 'course' => $c2->id, 'chattime' => $c2->startdate + 1 * WEEKSECS]);
+        $backupid = $this->backup_course($c1->id);
+
+        // The information is restored but adapted because names are already taken.
+        $c2 = $this->async_restore_to_existing_course($backupid, $c2->id);
+        $this->assertEquals('SN_1', $c2->shortname);
+        $this->assertEquals('FN copy 1', $c2->fullname);
+        $this->assertEquals('DESC', $c2->summary);
+        $this->assertEquals(FORMAT_MOODLE, $c2->summaryformat);
+        $this->assertEquals($startdate, $c2->startdate);
+
+        // Now course c2 has two chats - one ('Second') was already there and one ('First') was restored from the backup.
+        // Their dates are exactly the same as they were in the original modules.
+        $restoredchat1 = $DB->get_record('chat', ['name' => 'First', 'course' => $c2->id]);
+        $restoredchat2 = $DB->get_record('chat', ['name' => 'Second', 'course' => $c2->id]);
+        $this->assertEquals($chat1->chattime, $restoredchat1->chattime);
+        $this->assertEquals($chat2->chattime, $restoredchat2->chattime);
+    }
+
+    public function test_async_restore_course_info_in_existing_course_delete_first() {
+        global $DB;
+        $this->resetAfterTest();
+        $dg = $this->getDataGenerator();
+
+        $this->assertEquals(1, get_config('restore', 'restore_merge_course_shortname'));
+        $this->assertEquals(1, get_config('restore', 'restore_merge_course_fullname'));
+        $this->assertEquals(1, get_config('restore', 'restore_merge_course_startdate'));
+
+        $startdate = mktime(12, 0, 0, 7, 1, 2016); // 01-Jul-2016.
+
+        // Create two courses with different start dates,in each course create a chat that opens 1 week after the course start date.
+        $c1 = $dg->create_course(['shortname' => 'SN', 'fullname' => 'FN', 'summary' => 'DESC', 'summaryformat' => FORMAT_MOODLE,
+            'startdate' => $startdate]);
+        $chat1 = $dg->create_module('chat', ['name' => 'First', 'course' => $c1->id, 'chattime' => $c1->startdate + 1 * WEEKSECS]);
+        $c2 = $dg->create_course(['shortname' => 'A', 'fullname' => 'B', 'summary' => 'C', 'summaryformat' => FORMAT_PLAIN,
+            'startdate' => $startdate + 2 * WEEKSECS]);
+        $chat2 = $dg->create_module('chat', ['name' => 'Second', 'course' => $c2->id, 'chattime' => $c2->startdate + 1 * WEEKSECS]);
+        $backupid = $this->backup_course($c1->id);
+
+        // The information is restored and the existing course settings is modified.
+        $c2 = $this->async_restore_to_existing_course($backupid, $c2->id, 2, backup::TARGET_CURRENT_DELETING);
+        $this->assertEquals(FORMAT_MOODLE, $c2->summaryformat);
+
+        // Now course2 should have a new forum with the original forum deleted.
+        $restoredchat1 = $DB->get_record('chat', ['name' => 'First', 'course' => $c2->id]);
+        $restoredchat2 = $DB->get_record('chat', ['name' => 'Second', 'course' => $c2->id]);
+        $this->assertEquals($chat1->chattime, $restoredchat1->chattime);
+        $this->assertEmpty($restoredchat2);
+    }
+
     public function test_restore_existing_idnumber_in_new_course() {
         $this->resetAfterTest();
 
diff --git a/customfield/field/checkbox/classes/data_controller.php b/customfield/field/checkbox/classes/data_controller.php
index 881e515ad4c21..4d080d7c449c9 100644
--- a/customfield/field/checkbox/classes/data_controller.php
+++ b/customfield/field/checkbox/classes/data_controller.php
@@ -55,8 +55,8 @@ public function instance_form_definition(\MoodleQuickForm $mform) {
         $field = $this->get_field();
         $config = $field->get('configdata');
         $elementname = $this->get_form_element_name();
-        // TODO MDL-65506 element 'advcheckbox' does not support 'required' rule. If checkbox is required (i.e. "agree to terms")
-        // then use 'checkbox' form element.
+        // If checkbox is required (i.e. "agree to terms") then use 'checkbox' form element.
+        // The advcheckbox element cannot be used for required fields because advcheckbox elements always provide a value.
         $isrequired = $field->get_configdata_property('required');
         $mform->addElement($isrequired ? 'checkbox' : 'advcheckbox', $elementname, $this->get_field()->get_formatted_name());
         $mform->setDefault($elementname, $config['checkbydefault']);
diff --git a/customfield/field/text/lang/en/customfield_text.php b/customfield/field/text/lang/en/customfield_text.php
index de273bf7bb30c..e878d29215caa 100644
--- a/customfield/field/text/lang/en/customfield_text.php
+++ b/customfield/field/text/lang/en/customfield_text.php
@@ -31,7 +31,7 @@
 $string['errorconfigmaxlen'] = 'The maximum number of characters allowed must be between 1 and 1333.';
 $string['errormaxlength'] = 'The maximum number of characters allowed in this field is {$a}.';
 $string['islink'] = 'Link field';
-$string['islink_help'] = 'To transform the text into a link, enter a URL containing $$ as a placeholder, where $$ will be replaced with the text. For example, to transform a Twitter ID to a link, enter http://twitter.com/$$.';
+$string['islink_help'] = 'To transform the text into a link, enter a URL containing $$ as a placeholder, where $$ will be replaced with the text. For example, to transform a Twitter ID to a link, enter https://twitter.com/$$.';
 $string['ispassword'] = 'Password field';
 $string['linktarget'] = 'Link target';
 $string['maxlength'] = 'Maximum number of characters';
diff --git a/customfield/tests/api_test.php b/customfield/tests/api_test.php
index 45d50d1712e72..e76d410e05b91 100644
--- a/customfield/tests/api_test.php
+++ b/customfield/tests/api_test.php
@@ -38,17 +38,11 @@
 class core_customfield_api_testcase extends advanced_testcase {
 
     /**
-     * Tests set up.
-     */
-    public function setUp() {
-        $this->resetAfterTest();
-    }
-
-    /**
-     * Get generator
+     * Get generator.
+     *
      * @return core_customfield_generator
      */
-    protected function get_generator() : core_customfield_generator {
+    protected function get_generator(): core_customfield_generator {
         return $this->getDataGenerator()->get_plugin_generator('core_customfield');
     }
 
@@ -57,7 +51,7 @@ protected function get_generator() : core_customfield_generator {
      *
      * @param array $expected
      * @param array $array array of objects with "get($property)" method
-     * @param sring $propertyname
+     * @param string $propertyname
      */
     protected function assert_property_in_array($expected, $array, $propertyname) {
         $this->assertEquals($expected, array_values(array_map(function($a) use ($propertyname) {
@@ -72,6 +66,8 @@ protected function assert_property_in_array($expected, $array, $propertyname) {
      * in the interface using drag-drop.
      */
     public function test_move_category() {
+        $this->resetAfterTest();
+
         // Create the categories.
         $params = ['component' => 'core_course', 'area' => 'course', 'itemid' => 0];
         $id0 = $this->get_generator()->create_category($params)->get('id');
@@ -121,6 +117,8 @@ public function test_move_category() {
      * Tests for \core_customfield\api::get_categories_with_fields() behaviour.
      */
     public function test_get_categories_with_fields() {
+        $this->resetAfterTest();
+
         // Create the categories.
         $options = [
             'component' => 'core_course',
@@ -155,6 +153,8 @@ public function test_get_categories_with_fields() {
      * Test for functions api::save_category() and rename_category)
      */
     public function test_save_category() {
+        $this->resetAfterTest();
+
         $params = ['component' => 'core_course', 'area' => 'course', 'itemid' => 0, 'name' => 'Cat1',
             'contextid' => context_system::instance()->id];
         $c1 = category_controller::create(0, (object)$params);
@@ -188,6 +188,8 @@ public function test_save_category() {
      * Test for function handler::create_category
      */
     public function test_create_category() {
+        $this->resetAfterTest();
+
         $handler = \core_course\customfield\course_handler::create();
         $c1id = $handler->create_category();
         $c1 = $handler->get_categories_with_fields()[$c1id];
@@ -210,6 +212,8 @@ public function test_create_category() {
      * Tests for \core_customfield\api::delete_category() behaviour.
      */
     public function test_delete_category_with_fields() {
+        $this->resetAfterTest();
+
         global $DB;
         // Create two categories with fields and data.
         $options = [
diff --git a/customfield/tests/category_controller_test.php b/customfield/tests/category_controller_test.php
index 656bc5bc79da4..04ce151e65e68 100644
--- a/customfield/tests/category_controller_test.php
+++ b/customfield/tests/category_controller_test.php
@@ -37,21 +37,20 @@
 class core_customfield_category_controller_testcase extends advanced_testcase {
 
     /**
-     * Tests set up.
-     */
-    public function setUp() {
-        $this->resetAfterTest();
-    }
-
-    /**
-     * Get generator
+     * Get generator.
+     *
      * @return core_customfield_generator
      */
-    protected function get_generator() : core_customfield_generator {
+    protected function get_generator(): core_customfield_generator {
         return $this->getDataGenerator()->get_plugin_generator('core_customfield');
     }
 
+    /**
+     * Test for the field_controller::__construct function.
+     */
     public function test_constructor() {
+        $this->resetAfterTest();
+
         $c = category_controller::create(0, (object)['component' => 'core_course', 'area' => 'course', 'itemid' => 0]);
         $handler = $c->get_handler();
         $this->assertTrue($c instanceof category_controller);
@@ -75,6 +74,8 @@ public function test_constructor() {
      */
     public function test_constructor_errors() {
         global $DB;
+        $this->resetAfterTest();
+
         $cat = $this->get_generator()->create_category();
         $catrecord = $cat->to_record();
 
@@ -173,6 +174,7 @@ public function test_constructor_errors() {
      * \core_customfield\category_controller::get()
      */
     public function test_create_category() {
+        $this->resetAfterTest();
 
         // Create the category.
         $lpg = $this->get_generator();
@@ -201,6 +203,8 @@ public function test_create_category() {
      * Tests for \core_customfield\category_controller::set() behaviour.
      */
     public function test_rename_category() {
+        $this->resetAfterTest();
+
         // Create the category.
         $params = ['component' => 'core_course', 'area' => 'course', 'itemid' => 0, 'name' => 'Cat1',
             'contextid' => context_system::instance()->id];
@@ -224,6 +228,8 @@ public function test_rename_category() {
      * Tests for \core_customfield\category_controller::delete() behaviour.
      */
     public function test_delete_category() {
+        $this->resetAfterTest();
+
         // Create the category.
         $lpg = $this->get_generator();
         $category0 = $lpg->create_category();
diff --git a/customfield/tests/data_controller_test.php b/customfield/tests/data_controller_test.php
index ac5b4056a07b8..d125c5c9c2168 100644
--- a/customfield/tests/data_controller_test.php
+++ b/customfield/tests/data_controller_test.php
@@ -35,17 +35,11 @@
 class core_customfield_data_controller_testcase extends advanced_testcase {
 
     /**
-     * Tests set up.
-     */
-    public function setUp() {
-        $this->resetAfterTest();
-    }
-
-    /**
-     * Get generator
+     * Get generator.
+     *
      * @return core_customfield_generator
      */
-    protected function get_generator() : core_customfield_generator {
+    protected function get_generator(): core_customfield_generator {
         return $this->getDataGenerator()->get_plugin_generator('core_customfield');
     }
 
@@ -54,6 +48,8 @@ protected function get_generator() : core_customfield_generator {
      */
     public function test_constructor() {
         global $DB;
+        $this->resetAfterTest();
+
         // Create a course, fields category and fields.
         $course = $this->getDataGenerator()->create_course();
         $category0 = $this->get_generator()->create_category(['name' => 'aaaa']);
@@ -122,6 +118,8 @@ public function test_constructor() {
      */
     public function test_constructor_errors() {
         global $DB;
+        $this->resetAfterTest();
+
         // Create a category, field and data.
         $category = $this->get_generator()->create_category();
         $field = $this->get_generator()->create_field(['categoryid' => $category->get('id')]);
@@ -180,4 +178,4 @@ public function test_constructor_errors() {
             $this->assertEquals(moodle_exception::class, get_class($e));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/customfield/tests/field_controller_test.php b/customfield/tests/field_controller_test.php
index b7044695be918..a642919e2624a 100644
--- a/customfield/tests/field_controller_test.php
+++ b/customfield/tests/field_controller_test.php
@@ -39,17 +39,11 @@
 class core_customfield_field_controller_testcase extends advanced_testcase {
 
     /**
-     * Tests set up.
-     */
-    public function setUp() {
-        $this->resetAfterTest();
-    }
-
-    /**
-     * Get generator
+     * Get generator.
+     *
      * @return core_customfield_generator
      */
-    protected function get_generator() : core_customfield_generator {
+    protected function get_generator(): core_customfield_generator {
         return $this->getDataGenerator()->get_plugin_generator('core_customfield');
     }
 
@@ -58,6 +52,8 @@ protected function get_generator() : core_customfield_generator {
      */
     public function test_constructor() {
         global $DB;
+        $this->resetAfterTest();
+
         // Create the category.
         $category0 = $this->get_generator()->create_category();
 
@@ -103,6 +99,8 @@ public function test_constructor() {
      */
     public function test_constructor_errors() {
         global $DB;
+        $this->resetAfterTest();
+
         // Create a category and a field.
         $category = $this->get_generator()->create_category();
         $field = $this->get_generator()->create_field(['categoryid' => $category->get('id')]);
@@ -175,6 +173,8 @@ public function test_constructor_errors() {
      */
     public function test_create_field() {
         global $DB;
+        $this->resetAfterTest();
+
         $lpg = $this->get_generator();
         $category = $lpg->create_category();
         $fields = $DB->get_records(\core_customfield\field::TABLE, ['categoryid' => $category->get('id')]);
@@ -203,6 +203,8 @@ public function test_create_field() {
      */
     public function test_delete_field() {
         global $DB;
+        $this->resetAfterTest();
+
         $lpg = $this->get_generator();
         $category = $lpg->create_category();
         $fields = $DB->get_records(\core_customfield\field::TABLE, ['categoryid' => $category->get('id')]);
@@ -229,6 +231,8 @@ public function test_delete_field() {
      * Tests for \core_customfield\field_controller::get_configdata_property() behaviour.
      */
     public function test_get_configdata_property() {
+        $this->resetAfterTest();
+
         $lpg = $this->get_generator();
         $category = $lpg->create_category();
         $configdata = ['a' => 'b', 'c' => ['d', 'e']];
@@ -243,4 +247,4 @@ public function test_get_configdata_property() {
         $this->assertEquals(['d', 'e'], $field->get_configdata_property('c'));
         $this->assertEquals(null, $field->get_configdata_property('x'));
     }
-}
\ No newline at end of file
+}
diff --git a/customfield/tests/generator_test.php b/customfield/tests/generator_test.php
index 4788d9cf3470b..c5335c37d9fef 100644
--- a/customfield/tests/generator_test.php
+++ b/customfield/tests/generator_test.php
@@ -39,7 +39,7 @@ class core_customfield_generator_testcase extends advanced_testcase {
      * Get generator
      * @return core_customfield_generator
      */
-    protected function get_generator() : core_customfield_generator {
+    protected function get_generator(): core_customfield_generator {
         return $this->getDataGenerator()->get_plugin_generator('core_customfield');
     }
 
diff --git a/customfield/tests/privacy_test.php b/customfield/tests/privacy_test.php
index 9a15ced565881..4a63085fb3f20 100644
--- a/customfield/tests/privacy_test.php
+++ b/customfield/tests/privacy_test.php
@@ -38,63 +38,59 @@
  */
 class core_customfield_privacy_testcase extends provider_testcase {
 
-    /** @var stdClass[]  */
-    private $courses = [];
-    /** @var \core_customfield\category_controller[] */
-    private $cfcats = [];
-    /** @var \core_customfield\field_controller[] */
-    private $cffields = [];
-
     /**
-     * Set up
+     * Generate data.
+     *
+     * @return array
      */
-    public function setUp() {
+    protected function generate_test_data(): array {
         $this->resetAfterTest();
 
-        $this->cfcats[1] = $this->get_generator()->create_category();
-        $this->cfcats[2] = $this->get_generator()->create_category();
-        $this->cffields[11] = $this->get_generator()->create_field(
-            ['categoryid' => $this->cfcats[1]->get('id'), 'type' => 'checkbox']);
-        $this->cffields[12] = $this->get_generator()->create_field(
-            ['categoryid' => $this->cfcats[1]->get('id'), 'type' => 'date']);
-        $this->cffields[13] = $this->get_generator()->create_field(
-            ['categoryid' => $this->cfcats[1]->get('id'),
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_customfield');
+        $cfcats[1] = $generator->create_category();
+        $cfcats[2] = $generator->create_category();
+        $cffields[11] = $generator->create_field(
+            ['categoryid' => $cfcats[1]->get('id'), 'type' => 'checkbox']);
+        $cffields[12] = $generator->create_field(
+            ['categoryid' => $cfcats[1]->get('id'), 'type' => 'date']);
+        $cffields[13] = $generator->create_field(
+            ['categoryid' => $cfcats[1]->get('id'),
             'type' => 'select', 'configdata' => ['options' => "a\nb\nc"]]);
-        $this->cffields[14] = $this->get_generator()->create_field(
-            ['categoryid' => $this->cfcats[1]->get('id'), 'type' => 'text']);
-        $this->cffields[15] = $this->get_generator()->create_field(
-            ['categoryid' => $this->cfcats[1]->get('id'), 'type' => 'textarea']);
-        $this->cffields[21] = $this->get_generator()->create_field(
-            ['categoryid' => $this->cfcats[2]->get('id')]);
-        $this->cffields[22] = $this->get_generator()->create_field(
-            ['categoryid' => $this->cfcats[2]->get('id')]);
-
-        $this->courses[1] = $this->getDataGenerator()->create_course();
-        $this->courses[2] = $this->getDataGenerator()->create_course();
-        $this->courses[3] = $this->getDataGenerator()->create_course();
-
-        $this->get_generator()->add_instance_data($this->cffields[11], $this->courses[1]->id, 1);
-        $this->get_generator()->add_instance_data($this->cffields[12], $this->courses[1]->id, 1546300800);
-        $this->get_generator()->add_instance_data($this->cffields[13], $this->courses[1]->id, 2);
-        $this->get_generator()->add_instance_data($this->cffields[14], $this->courses[1]->id, 'Hello1');
-        $this->get_generator()->add_instance_data($this->cffields[15], $this->courses[1]->id,
+        $cffields[14] = $generator->create_field(
+            ['categoryid' => $cfcats[1]->get('id'), 'type' => 'text']);
+        $cffields[15] = $generator->create_field(
+            ['categoryid' => $cfcats[1]->get('id'), 'type' => 'textarea']);
+        $cffields[21] = $generator->create_field(
+            ['categoryid' => $cfcats[2]->get('id')]);
+        $cffields[22] = $generator->create_field(
+            ['categoryid' => $cfcats[2]->get('id')]);
+
+        $courses[1] = $this->getDataGenerator()->create_course();
+        $courses[2] = $this->getDataGenerator()->create_course();
+        $courses[3] = $this->getDataGenerator()->create_course();
+
+        $generator->add_instance_data($cffields[11], $courses[1]->id, 1);
+        $generator->add_instance_data($cffields[12], $courses[1]->id, 1546300800);
+        $generator->add_instance_data($cffields[13], $courses[1]->id, 2);
+        $generator->add_instance_data($cffields[14], $courses[1]->id, 'Hello1');
+        $generator->add_instance_data($cffields[15], $courses[1]->id,
             ['text' => '<p>Hi there</p>', 'format' => FORMAT_HTML]);
 
-        $this->get_generator()->add_instance_data($this->cffields[21], $this->courses[1]->id, 'hihi1');
+        $generator->add_instance_data($cffields[21], $courses[1]->id, 'hihi1');
 
-        $this->get_generator()->add_instance_data($this->cffields[14], $this->courses[2]->id, 'Hello2');
+        $generator->add_instance_data($cffields[14], $courses[2]->id, 'Hello2');
 
-        $this->get_generator()->add_instance_data($this->cffields[21], $this->courses[2]->id, 'hihi2');
+        $generator->add_instance_data($cffields[21], $courses[2]->id, 'hihi2');
 
-        $this->setUser($this->getDataGenerator()->create_user());
-    }
+        $user = $this->getDataGenerator()->create_user();
+        $this->setUser($user);
 
-    /**
-     * Get generator
-     * @return core_customfield_generator
-     */
-    protected function get_generator() : core_customfield_generator {
-        return $this->getDataGenerator()->get_plugin_generator('core_customfield');
+        return [
+            'user' => $user,
+            'cfcats' => $cfcats,
+            'cffields' => $cffields,
+            'courses' => $courses,
+        ];
     }
 
     /**
@@ -111,11 +107,17 @@ public function test_get_metadata() {
      */
     public function test_get_customfields_data_contexts() {
         global $DB;
-        list($sql, $params) = $DB->get_in_or_equal([$this->courses[1]->id, $this->courses[2]->id], SQL_PARAMS_NAMED);
+        [
+            'cffields' => $cffields,
+            'cfcats' => $cfcats,
+            'courses' => $courses,
+        ] = $this->generate_test_data();
+
+        list($sql, $params) = $DB->get_in_or_equal([$courses[1]->id, $courses[2]->id], SQL_PARAMS_NAMED);
         $r = provider::get_customfields_data_contexts('core_course', 'course', '=0',
             $sql, $params);
-        $this->assertEquals([context_course::instance($this->courses[1]->id)->id,
-            context_course::instance($this->courses[2]->id)->id],
+        $this->assertEquals([context_course::instance($courses[1]->id)->id,
+            context_course::instance($courses[2]->id)->id],
             $r->get_contextids(), '', 0, 10, true);
     }
 
@@ -123,6 +125,8 @@ public function test_get_customfields_data_contexts() {
      * Test for provider::get_customfields_configuration_contexts()
      */
     public function test_get_customfields_configuration_contexts() {
+        $this->generate_test_data();
+
         $r = provider::get_customfields_configuration_contexts('core_course', 'course');
         $this->assertEquals([context_system::instance()->id], $r->get_contextids());
     }
@@ -132,13 +136,20 @@ public function test_get_customfields_configuration_contexts() {
      */
     public function test_export_customfields_data() {
         global $USER, $DB;
+        $this->resetAfterTest();
+        [
+            'cffields' => $cffields,
+            'cfcats' => $cfcats,
+            'courses' => $courses,
+        ] = $this->generate_test_data();
+
         // Hack one of the fields so it has an invalid field type.
-        $invalidfieldid = $this->cffields[21]->get('id');
+        $invalidfieldid = $cffields[21]->get('id');
         $DB->update_record('customfield_field', ['id' => $invalidfieldid, 'type' => 'invalid']);
 
-        $context = context_course::instance($this->courses[1]->id);
+        $context = context_course::instance($courses[1]->id);
         $contextlist = new approved_contextlist($USER, 'core_customfield', [$context->id]);
-        provider::export_customfields_data($contextlist, 'core_course', 'course', '=0', '=:i', ['i' => $this->courses[1]->id]);
+        provider::export_customfields_data($contextlist, 'core_course', 'course', '=0', '=:i', ['i' => $courses[1]->id]);
         /** @var core_privacy\tests\request\content_writer $writer */
         $writer = writer::with_context($context);
 
@@ -147,7 +158,7 @@ public function test_export_customfields_data() {
         $invaldfieldischecked = false;
         foreach ($DB->get_records('customfield_data', []) as $dbrecord) {
             $data = $writer->get_data(['Custom fields data', $dbrecord->id]);
-            if ($dbrecord->instanceid == $this->courses[1]->id) {
+            if ($dbrecord->instanceid == $courses[1]->id) {
                 $this->assertEquals($dbrecord->fieldid, $data->fieldid);
                 $this->assertNotEmpty($data->fieldtype);
                 $this->assertNotEmpty($data->fieldshortname);
@@ -167,10 +178,17 @@ public function test_export_customfields_data() {
      */
     public function test_delete_customfields_data() {
         global $USER, $DB;
-        $approvedcontexts = new approved_contextlist($USER, 'core_course', [context_course::instance($this->courses[1]->id)->id]);
+        $this->resetAfterTest();
+        [
+            'cffields' => $cffields,
+            'cfcats' => $cfcats,
+            'courses' => $courses,
+        ] = $this->generate_test_data();
+
+        $approvedcontexts = new approved_contextlist($USER, 'core_course', [context_course::instance($courses[1]->id)->id]);
         provider::delete_customfields_data($approvedcontexts, 'core_course', 'course');
-        $this->assertEmpty($DB->get_records('customfield_data', ['instanceid' => $this->courses[1]->id]));
-        $this->assertNotEmpty($DB->get_records('customfield_data', ['instanceid' => $this->courses[2]->id]));
+        $this->assertEmpty($DB->get_records('customfield_data', ['instanceid' => $courses[1]->id]));
+        $this->assertNotEmpty($DB->get_records('customfield_data', ['instanceid' => $courses[2]->id]));
     }
 
     /**
@@ -178,9 +196,16 @@ public function test_delete_customfields_data() {
      */
     public function test_delete_customfields_configuration() {
         global $USER, $DB;
+        $this->resetAfterTest();
+        [
+            'cffields' => $cffields,
+            'cfcats' => $cfcats,
+            'courses' => $courses,
+        ] = $this->generate_test_data();
+
         // Remember the list of fields in the category 2 before we delete it.
-        $catid1 = $this->cfcats[1]->get('id');
-        $catid2 = $this->cfcats[2]->get('id');
+        $catid1 = $cfcats[1]->get('id');
+        $catid2 = $cfcats[2]->get('id');
         $fids2 = $DB->get_fieldset_select('customfield_field', 'id', 'categoryid=?', [$catid2]);
         $this->assertNotEmpty($fids2);
         list($fsql, $fparams) = $DB->get_in_or_equal($fids2, SQL_PARAMS_NAMED);
@@ -208,9 +233,16 @@ public function test_delete_customfields_configuration() {
      */
     public function test_delete_customfields_configuration_for_context() {
         global $USER, $DB;
+        $this->resetAfterTest();
+        [
+            'cffields' => $cffields,
+            'cfcats' => $cfcats,
+            'courses' => $courses,
+        ] = $this->generate_test_data();
+
         // Remember the list of fields in the category 2 before we delete it.
-        $catid1 = $this->cfcats[1]->get('id');
-        $catid2 = $this->cfcats[2]->get('id');
+        $catid1 = $cfcats[1]->get('id');
+        $catid2 = $cfcats[2]->get('id');
         $fids2 = $DB->get_fieldset_select('customfield_field', 'id', 'categoryid=?', [$catid2]);
         $this->assertNotEmpty($fids2);
         list($fsql, $fparams) = $DB->get_in_or_equal($fids2, SQL_PARAMS_NAMED);
@@ -238,12 +270,19 @@ public function test_delete_customfields_configuration_for_context() {
      */
     public function test_delete_customfields_data_for_context() {
         global $DB;
+        $this->resetAfterTest();
+        [
+            'cffields' => $cffields,
+            'cfcats' => $cfcats,
+            'courses' => $courses,
+        ] = $this->generate_test_data();
+
         provider::delete_customfields_data_for_context('core_course', 'course',
-            context_course::instance($this->courses[1]->id));
+            context_course::instance($courses[1]->id));
         $fids2 = $DB->get_fieldset_select('customfield_field', 'id', '1=1', []);
         list($fsql, $fparams) = $DB->get_in_or_equal($fids2, SQL_PARAMS_NAMED);
-        $fparams['course1'] = $this->courses[1]->id;
-        $fparams['course2'] = $this->courses[2]->id;
+        $fparams['course1'] = $courses[1]->id;
+        $fparams['course2'] = $courses[2]->id;
         $this->assertEmpty($DB->get_records_select('customfield_data', 'instanceid = :course1 AND fieldid ' . $fsql, $fparams));
         $this->assertNotEmpty($DB->get_records_select('customfield_data', 'instanceid = :course2 AND fieldid ' . $fsql, $fparams));
     }
diff --git a/dataformat/pdf/classes/writer.php b/dataformat/pdf/classes/writer.php
index 0559c93aebc0e..1f204d83e6174 100644
--- a/dataformat/pdf/classes/writer.php
+++ b/dataformat/pdf/classes/writer.php
@@ -89,6 +89,11 @@ public function start_sheet($columns) {
     public function write_record($record, $rownum) {
         $rowheight = 0;
 
+        // If $record is an object convert it to an array.
+        if (is_object($record)) {
+            $record = (array)$record;
+        }
+
         foreach ($record as $cell) {
             $rowheight = max($rowheight, $this->pdf->getStringHeight($this->colwidth, $cell, false, true, '', 1));
         }
@@ -99,12 +104,19 @@ public function write_record($record, $rownum) {
             $this->print_heading();
         }
 
-        $total = count($record);
-        $counter = 1;
-        foreach ($record as $cell) {
-            $nextposition = ($counter == $total) ? 1 : 0;
+        // Get the last key for this record.
+        end($record);
+        $lastkey = key($record);
+
+        // Reset the record pointer.
+        reset($record);
+
+        // Loop through each element.
+        foreach ($record as $key => $cell) {
+            // Determine whether we're at the last element of the record.
+            $nextposition = ($lastkey === $key) ? 1 : 0;
+            // Write the element.
             $this->pdf->Multicell($this->colwidth, $rowheight, $cell, 1, 'L', false, $nextposition);
-            $counter++;
         }
     }
 
diff --git a/enrol/database/db/upgrade.php b/enrol/database/db/upgrade.php
index ca2733c53cb7c..9c288eb34e2b8 100644
--- a/enrol/database/db/upgrade.php
+++ b/enrol/database/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/externallib.php b/enrol/externallib.php
index 593541e131a72..89cff4856fa0d 100644
--- a/enrol/externallib.php
+++ b/enrol/externallib.php
@@ -1020,6 +1020,70 @@ public static function edit_user_enrolment_returns() {
         );
     }
 
+    /**
+     * Returns description of submit_user_enrolment_form parameters.
+     *
+     * @return external_function_parameters.
+     */
+    public static function submit_user_enrolment_form_parameters() {
+        return new external_function_parameters([
+            'formdata' => new external_value(PARAM_RAW, 'The data from the event form'),
+        ]);
+    }
+
+    /**
+     * External function that handles the user enrolment form submission.
+     *
+     * @param string $formdata The user enrolment form data in s URI encoded param string
+     * @return array An array consisting of the processing result and error flag, if available
+     */
+    public static function submit_user_enrolment_form($formdata) {
+        global $CFG, $DB, $PAGE;
+
+        // Parameter validation.
+        $params = self::validate_parameters(self::submit_user_enrolment_form_parameters(), ['formdata' => $formdata]);
+
+        $data = [];
+        parse_str($params['formdata'], $data);
+
+        $userenrolment = $DB->get_record('user_enrolments', ['id' => $data['ue']], '*', MUST_EXIST);
+        $instance = $DB->get_record('enrol', ['id' => $userenrolment->enrolid], '*', MUST_EXIST);
+        $plugin = enrol_get_plugin($instance->enrol);
+        $course = get_course($instance->courseid);
+        $context = context_course::instance($course->id);
+        self::validate_context($context);
+
+        require_once("$CFG->dirroot/enrol/editenrolment_form.php");
+        $customformdata = [
+            'ue' => $userenrolment,
+            'modal' => true,
+            'enrolinstancename' => $plugin->get_instance_name($instance)
+        ];
+        $mform = new enrol_user_enrolment_form(null, $customformdata, 'post', '', null, true, $data);
+
+        if ($validateddata = $mform->get_data()) {
+            require_once($CFG->dirroot . '/enrol/locallib.php');
+            $manager = new course_enrolment_manager($PAGE, $course);
+            $result = $manager->edit_enrolment($userenrolment, $validateddata);
+
+            return ['result' => $result];
+        } else {
+            return ['result' => false, 'validationerror' => true];
+        }
+    }
+
+    /**
+     * Returns description of submit_user_enrolment_form() result value
+     *
+     * @return external_description
+     */
+    public static function submit_user_enrolment_form_returns() {
+        return new external_single_structure([
+            'result' => new external_value(PARAM_BOOL, 'True if the user\'s enrolment was successfully updated'),
+            'validationerror' => new external_value(PARAM_BOOL, 'Indicates invalid form data', VALUE_DEFAULT, false),
+        ]);
+    }
+
     /**
      * Returns description of unenrol_user_enrolment() parameters
      *
diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php
index c286910f29c8e..9e216f6fac30f 100644
--- a/enrol/flatfile/db/upgrade.php
+++ b/enrol/flatfile/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php
index a4f9d25eb980b..81fa08cb9bca1 100644
--- a/enrol/guest/db/upgrade.php
+++ b/enrol/guest/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_guest_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php
index d89f2962cbad4..137602d74f4f5 100644
--- a/enrol/imsenterprise/db/upgrade.php
+++ b/enrol/imsenterprise/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/locallib.php b/enrol/locallib.php
index c77e1510c9fa6..dbe8636395d41 100644
--- a/enrol/locallib.php
+++ b/enrol/locallib.php
@@ -1191,7 +1191,7 @@ private function prepare_user_for_display($user, $extrafields, $now) {
         );
 
         foreach ($extrafields as $field) {
-            $details[$field] = $user->{$field};
+            $details[$field] = s($user->{$field});
         }
 
         // Last time user has accessed the site.
diff --git a/enrol/lti/classes/helper.php b/enrol/lti/classes/helper.php
index c8fadbafc4c91..a101b0d2437ba 100644
--- a/enrol/lti/classes/helper.php
+++ b/enrol/lti/classes/helper.php
@@ -576,18 +576,19 @@ protected static function get_cartridge_parameters($toolid) {
         // Work out the name of the tool.
         $title = self::get_name($tool);
         $launchurl = self::get_launch_url($toolid);
-        $launchurl = $launchurl->out();
-        $icon = self::get_icon($tool);
+        $launchurl = $launchurl->out(false);
+        $iconurl = self::get_icon($tool);
+        $iconurl = $iconurl->out(false);
         $securelaunchurl = null;
-        $secureicon = null;
+        $secureiconurl = null;
         $vendorurl = new \moodle_url('/');
-        $vendorurl = $vendorurl->out();
+        $vendorurl = $vendorurl->out(false);
         $description = self::get_description($tool);
 
         // If we are a https site, we can add the launch url and icon urls as secure equivalents.
         if (\is_https()) {
             $securelaunchurl = $launchurl;
-            $secureicon = $icon;
+            $secureiconurl = $iconurl;
         }
 
         return array(
@@ -595,13 +596,13 @@ protected static function get_cartridge_parameters($toolid) {
                     "/blti:title" => $title,
                     "/blti:description" => $description,
                     "/blti:extensions" => array(
-                            "/lticm:property[@name='icon_url']" => $icon,
-                            "/lticm:property[@name='secure_icon_url']" => $secureicon
+                            "/lticm:property[@name='icon_url']" => $iconurl,
+                            "/lticm:property[@name='secure_icon_url']" => $secureiconurl
                         ),
                     "/blti:launch_url" => $launchurl,
                     "/blti:secure_launch_url" => $securelaunchurl,
-                    "/blti:icon" => $icon,
-                    "/blti:secure_icon" => $secureicon,
+                    "/blti:icon" => $iconurl,
+                    "/blti:secure_icon" => $secureiconurl,
                     "/blti:vendor" => array(
                             "/lticp:code" => $SITE->shortname,
                             "/lticp:name" => $SITE->fullname,
@@ -634,7 +635,7 @@ protected static function set_xpath($xpath, $parameters, $prefix = '') {
                         if (is_null($value)) {
                             $node->parentNode->removeChild($node);
                         } else {
-                            $node->nodeValue = $value;
+                            $node->nodeValue = s($value);
                         }
                     }
                 } else {
diff --git a/enrol/lti/db/upgrade.php b/enrol/lti/db/upgrade.php
index 7b5736b44a54d..21c0943f74529 100644
--- a/enrol/lti/db/upgrade.php
+++ b/enrol/lti/db/upgrade.php
@@ -66,5 +66,8 @@ function xmldb_enrol_lti_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/manual/amd/build/form-potential-user-selector.min.js b/enrol/manual/amd/build/form-potential-user-selector.min.js
index bf66147628b8b..393173d748330 100644
--- a/enrol/manual/amd/build/form-potential-user-selector.min.js
+++ b/enrol/manual/amd/build/form-potential-user-selector.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/templates","core/str"],function(a,b,c,d){var e=100;return{processResults:function(b,c){var d=[];return a.isArray(c)?(a.each(c,function(a,b){d.push({value:b.id,label:b._label})}),d):c},transport:function(f,g,h,i){var j,k=a(f).attr("courseid"),l=a(f).attr("userfields").split(",");"undefined"==typeof k&&(k="1");var m=a(f).attr("enrolid");"undefined"==typeof m&&(m=""),j=b.call([{methodname:"core_enrol_get_potential_users",args:{courseid:k,enrolid:m,search:g,searchanywhere:!0,page:0,perpage:e+1}}]),j[0].then(function(b){var f=[],g=0;return b.length<=e?(a.each(b,function(b,d){var e=d,g=[];a.each(l,function(a,b){"undefined"!=typeof d[b]&&""!==d[b]&&(e.hasidentity=!0,g.push(d[b]))}),e.identity=g.join(", "),f.push(c.render("enrol_manual/form-user-selector-suggestion",e))}),a.when.apply(a.when,f).then(function(){var c=arguments;a.each(b,function(a,b){b._label=c[g],g++}),h(b)})):d.get_string("toomanyuserstoshow","core",">"+e).then(function(a){h(a)})}).fail(i)}}});
\ No newline at end of file
+define(["jquery","core/ajax","core/templates","core/str"],function(a,b,c,d){return{processResults:function(b,c){var d=[];return a.isArray(c)?(a.each(c,function(a,b){d.push({value:b.id,label:b._label})}),d):c},transport:function(e,f,g,h){var i,j=a(e).attr("courseid"),k=a(e).attr("userfields").split(",");"undefined"==typeof j&&(j="1");var l=a(e).attr("enrolid");"undefined"==typeof l&&(l="");var m=parseInt(a(e).attr("perpage"));isNaN(m)&&(m=100),i=b.call([{methodname:"core_enrol_get_potential_users",args:{courseid:j,enrolid:l,search:f,searchanywhere:!0,page:0,perpage:m+1}}]),i[0].then(function(b){var e=[],f=0;return b.length<=m?(a.each(b,function(b,d){var f=d,g=[];a.each(k,function(a,b){"undefined"!=typeof d[b]&&""!==d[b]&&(f.hasidentity=!0,g.push(d[b]))}),f.identity=g.join(", "),e.push(c.render("enrol_manual/form-user-selector-suggestion",f))}),a.when.apply(a.when,e).then(function(){var c=arguments;a.each(b,function(a,b){b._label=c[f],f++}),g(b)})):d.get_string("toomanyuserstoshow","core",">"+m).then(function(a){g(a)})}).fail(h)}}});
\ No newline at end of file
diff --git a/enrol/manual/amd/src/form-potential-user-selector.js b/enrol/manual/amd/src/form-potential-user-selector.js
index 7fac602a91a36..c2e53d82fd516 100644
--- a/enrol/manual/amd/src/form-potential-user-selector.js
+++ b/enrol/manual/amd/src/form-potential-user-selector.js
@@ -25,9 +25,6 @@
 
 define(['jquery', 'core/ajax', 'core/templates', 'core/str'], function($, Ajax, Templates, Str) {
 
-    /** @var {Number} Maximum number of users to show. */
-    var MAXUSERS = 100;
-
     return /** @alias module:enrol_manual/form-potential-user-selector */ {
 
         processResults: function(selector, results) {
@@ -57,6 +54,10 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str'], function($, Ajax,
             if (typeof enrolid === "undefined") {
                 enrolid = '';
             }
+            var perpage = parseInt($(selector).attr('perpage'));
+            if (isNaN(perpage)) {
+                perpage = 100;
+            }
 
             promise = Ajax.call([{
                 methodname: 'core_enrol_get_potential_users',
@@ -66,7 +67,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str'], function($, Ajax,
                     search: query,
                     searchanywhere: true,
                     page: 0,
-                    perpage: MAXUSERS + 1
+                    perpage: perpage + 1
                 }
             }]);
 
@@ -74,7 +75,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str'], function($, Ajax,
                 var promises = [],
                     i = 0;
 
-                if (results.length <= MAXUSERS) {
+                if (results.length <= perpage) {
                     // Render the label.
                     $.each(results, function(index, user) {
                         var ctx = user,
@@ -101,7 +102,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str'], function($, Ajax,
                     });
 
                 } else {
-                    return Str.get_string('toomanyuserstoshow', 'core', '>' + MAXUSERS).then(function(toomanyuserstoshow) {
+                    return Str.get_string('toomanyuserstoshow', 'core', '>' + perpage).then(function(toomanyuserstoshow) {
                         success(toomanyuserstoshow);
                         return;
                     });
diff --git a/enrol/manual/classes/enrol_users_form.php b/enrol/manual/classes/enrol_users_form.php
index 165a6e996de1a..5a4e50f54f114 100644
--- a/enrol/manual/classes/enrol_users_form.php
+++ b/enrol/manual/classes/enrol_users_form.php
@@ -99,6 +99,7 @@ public function definition() {
             'multiple' => true,
             'courseid' => $course->id,
             'enrolid' => $instance->id,
+            'perpage' => $CFG->maxusersperpage,
             'userfields' => implode(',', get_extra_user_fields($context))
         );
         $mform->addElement('autocomplete', 'userlist', get_string('selectusers', 'enrol_manual'), array(), $options);
diff --git a/enrol/manual/db/upgrade.php b/enrol/manual/db/upgrade.php
index 48dfc6929bf63..0546271b635f0 100644
--- a/enrol/manual/db/upgrade.php
+++ b/enrol/manual/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_manual_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/manual/tests/behat/quickenrolment.feature b/enrol/manual/tests/behat/quickenrolment.feature
index 2afa506adc372..72bb05926b64b 100644
--- a/enrol/manual/tests/behat/quickenrolment.feature
+++ b/enrol/manual/tests/behat/quickenrolment.feature
@@ -154,6 +154,16 @@ Feature: Teacher can search and enrol users one by one into the course
     And I click on ".form-autocomplete-downarrow" "css_element" in the "Select users" "form_row"
     Then I should see "Too many users (>100) to show"
 
+  @javascript
+  Scenario: Changing the Maximum users per page setting affects the enrolment pop-up.
+    Given the following config values are set as admin:
+      | maxusersperpage | 5 |
+    And I navigate to course participants
+    And I press "Enrol users"
+    When I set the field "Select users" to "student00"
+    And I click on ".form-autocomplete-downarrow" "css_element" in the "Select users" "form_row"
+    Then I should see "Too many users (>5) to show"
+
   @javascript
   Scenario: Change the Show user identity setting affects the enrolment pop-up.
     Given I log out
diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php
index f6d9efb4af0ac..62dd9bb04d31f 100644
--- a/enrol/mnet/db/upgrade.php
+++ b/enrol/mnet/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php
index 93ebd504d81f6..40b8abda19e28 100644
--- a/enrol/paypal/db/upgrade.php
+++ b/enrol/paypal/db/upgrade.php
@@ -138,5 +138,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/self/db/upgrade.php b/enrol/self/db/upgrade.php
index cb255e8bf6dd5..42046662970d4 100644
--- a/enrol/self/db/upgrade.php
+++ b/enrol/self/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_self_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/self/lib.php b/enrol/self/lib.php
index bac388754b930..0f5d84435b0af 100644
--- a/enrol/self/lib.php
+++ b/enrol/self/lib.php
@@ -448,8 +448,9 @@ public function sync(progress_trace $trace, $courseid = null) {
             $userid = $instance->userid;
             unset($instance->userid);
             $this->unenrol_user($instance, $userid);
-            $days = $instance->customint2 / 60*60*24;
-            $trace->output("unenrolling user $userid from course $instance->courseid as they have did not log in for at least $days days", 1);
+            $days = $instance->customint2 / DAYSECS;
+            $trace->output("unenrolling user $userid from course $instance->courseid " .
+                "as they did not log in for at least $days days", 1);
         }
         $rs->close();
 
@@ -465,8 +466,9 @@ public function sync(progress_trace $trace, $courseid = null) {
             $userid = $instance->userid;
             unset($instance->userid);
             $this->unenrol_user($instance, $userid);
-                $days = $instance->customint2 / 60*60*24;
-            $trace->output("unenrolling user $userid from course $instance->courseid as they have did not access course for at least $days days", 1);
+            $days = $instance->customint2 / DAYSECS;
+            $trace->output("unenrolling user $userid from course $instance->courseid " .
+                "as they did not access the course for at least $days days", 1);
         }
         $rs->close();
 
diff --git a/enrol/self/tests/self_test.php b/enrol/self/tests/self_test.php
index 0a6fcffe03483..e939eaf4ca492 100644
--- a/enrol/self/tests/self_test.php
+++ b/enrol/self/tests/self_test.php
@@ -61,7 +61,7 @@ public function test_longtimnosee() {
 
         $now = time();
 
-        $trace = new null_progress_trace();
+        $trace = new progress_trace_buffer(new text_progress_trace(), false);
 
         // Prepare some data.
 
@@ -133,18 +133,32 @@ public function test_longtimnosee() {
         // Execute sync - this is the same thing used from cron.
 
         $selfplugin->sync($trace, $course2->id);
+        $output = $trace->get_buffer();
+        $trace->reset_buffer();
         $this->assertEquals(10, $DB->count_records('user_enrolments'));
-
+        $this->assertStringContainsString('No expired enrol_self enrolments detected', $output);
         $this->assertTrue($DB->record_exists('user_enrolments', array('enrolid'=>$instance1->id, 'userid'=>$user1->id)));
         $this->assertTrue($DB->record_exists('user_enrolments', array('enrolid'=>$instance1->id, 'userid'=>$user2->id)));
         $this->assertTrue($DB->record_exists('user_enrolments', array('enrolid'=>$instance3->id, 'userid'=>$user1->id)));
         $this->assertTrue($DB->record_exists('user_enrolments', array('enrolid'=>$instance3->id, 'userid'=>$user3->id)));
+
         $selfplugin->sync($trace, null);
+        $output = $trace->get_buffer();
+        $trace->reset_buffer();
         $this->assertEquals(6, $DB->count_records('user_enrolments'));
         $this->assertFalse($DB->record_exists('user_enrolments', array('enrolid'=>$instance1->id, 'userid'=>$user1->id)));
         $this->assertFalse($DB->record_exists('user_enrolments', array('enrolid'=>$instance1->id, 'userid'=>$user2->id)));
         $this->assertFalse($DB->record_exists('user_enrolments', array('enrolid'=>$instance3->id, 'userid'=>$user1->id)));
         $this->assertFalse($DB->record_exists('user_enrolments', array('enrolid'=>$instance3->id, 'userid'=>$user3->id)));
+        $this->assertStringContainsString('unenrolling user ' . $user1->id . ' from course ' . $course1->id .
+            ' as they did not log in for at least 14 days', $output);
+        $this->assertStringContainsString('unenrolling user ' . $user1->id . ' from course ' . $course3->id .
+            ' as they did not log in for at least 50 days', $output);
+        $this->assertStringContainsString('unenrolling user ' . $user2->id . ' from course ' . $course1->id .
+            ' as they did not access the course for at least 14 days', $output);
+        $this->assertStringContainsString('unenrolling user ' . $user3->id . ' from course ' . $course3->id .
+            ' as they did not access the course for at least 50 days', $output);
+        $this->assertStringNotContainsString('unenrolling user ' . $user4->id, $output);
 
         $this->assertEquals(6, $DB->count_records('role_assignments'));
         $this->assertEquals(4, $DB->count_records('role_assignments', array('roleid'=>$studentrole->id)));
@@ -669,7 +683,7 @@ public function test_get_welcome_email_contact() {
         $context = context_course::instance($course1->id);
 
         // Get editing teacher role.
-        $editingteacherrole = $DB->get_record('role', ['archetype' => 'editingteacher']);
+        $editingteacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
         $this->assertNotEmpty($editingteacherrole);
 
         // Enable self enrolment plugin and set to send email from course contact.
@@ -700,7 +714,7 @@ public function test_get_welcome_email_contact() {
         $this->assertEquals($user1->email, $contact->email);
 
         // Get manager role, and enrol user as manager.
-        $managerrole = $DB->get_record('role', ['archetype' => 'manager']);
+        $managerrole = $DB->get_record('role', ['shortname' => 'manager']);
         $this->assertNotEmpty($managerrole);
         $instance1->customint4 = ENROL_SEND_EMAIL_FROM_KEY_HOLDER;
         $DB->update_record('enrol', $instance1);
diff --git a/enrol/tests/externallib_test.php b/enrol/tests/externallib_test.php
index da07c87ab97c8..ee4ca4bba3bd6 100644
--- a/enrol/tests/externallib_test.php
+++ b/enrol/tests/externallib_test.php
@@ -958,6 +958,154 @@ public function test_edit_user_enrolment() {
         $this->assertEquals(ENROL_USER_SUSPENDED, $ue->status);
     }
 
+    /**
+     * dataProvider for test_submit_user_enrolment_form().
+     */
+    public function submit_user_enrolment_form_provider() {
+        $now = new DateTime();
+
+        $nextmonth = clone($now);
+        $nextmonth->add(new DateInterval('P1M'));
+
+        return [
+            'Invalid data' => [
+                'customdata' => [
+                    'status' => ENROL_USER_ACTIVE,
+                    'timestart' => [
+                        'day' => $now->format('j'),
+                        'month' => $now->format('n'),
+                        'year' => $now->format('Y'),
+                        'hour' => $now->format('G'),
+                        'minute' => 0,
+                        'enabled' => 1,
+                    ],
+                    'timeend' => [
+                        'day' => $now->format('j'),
+                        'month' => $now->format('n'),
+                        'year' => $now->format('Y'),
+                        'hour' => $now->format('G'),
+                        'minute' => 0,
+                        'enabled' => 1,
+                    ],
+                ],
+                'expectedresult' => false,
+                'validationerror' => true
+            ],
+            'Valid data' => [
+                'customdata' => [
+                    'status' => ENROL_USER_ACTIVE,
+                    'timestart' => [
+                        'day' => $now->format('j'),
+                        'month' => $now->format('n'),
+                        'year' => $now->format('Y'),
+                        'hour' => $now->format('G'),
+                        'minute' => 0,
+                        'enabled' => 1,
+                    ],
+                    'timeend' => [
+                        'day' => $nextmonth->format('j'),
+                        'month' => $nextmonth->format('n'),
+                        'year' => $nextmonth->format('Y'),
+                        'hour' => $nextmonth->format('G'),
+                        'minute' => 0,
+                        'enabled' => 1,
+                    ],
+                ],
+                'expectedresult' => true,
+                'validationerror' => false
+            ],
+            'Suspend user' => [
+                'customdata' => [
+                    'status' => ENROL_USER_SUSPENDED,
+                ],
+                'expectedresult' => true,
+                'validationerror' => false
+            ],
+        ];
+    }
+
+    /**
+     * @param array $customdata The data we are providing to the webservice.
+     * @param bool $expectedresult The result we are expecting to receive from the webservice.
+     * @param bool $validationerror The validationerror we are expecting to receive from the webservice.
+     * @dataProvider submit_user_enrolment_form_provider
+     */
+    public function test_submit_user_enrolment_form($customdata, $expectedresult, $validationerror) {
+        global $CFG, $DB;
+
+        $this->resetAfterTest(true);
+        $datagen = $this->getDataGenerator();
+
+        /** @var enrol_manual_plugin $manualplugin */
+        $manualplugin = enrol_get_plugin('manual');
+
+        $studentroleid = $DB->get_field('role', 'id', ['shortname' => 'student'], MUST_EXIST);
+        $teacherroleid = $DB->get_field('role', 'id', ['shortname' => 'editingteacher'], MUST_EXIST);
+        $course = $datagen->create_course();
+        $user = $datagen->create_user();
+        $teacher = $datagen->create_user();
+
+        $instanceid = null;
+        $instances = enrol_get_instances($course->id, true);
+        foreach ($instances as $inst) {
+            if ($inst->enrol == 'manual') {
+                $instanceid = (int)$inst->id;
+                break;
+            }
+        }
+        if (empty($instanceid)) {
+            $instanceid = $manualplugin->add_default_instance($course);
+            if (empty($instanceid)) {
+                $instanceid = $manualplugin->add_instance($course);
+            }
+        }
+        $this->assertNotNull($instanceid);
+
+        $instance = $DB->get_record('enrol', ['id' => $instanceid], '*', MUST_EXIST);
+        $manualplugin->enrol_user($instance, $user->id, $studentroleid, 0, 0, ENROL_USER_ACTIVE);
+        $manualplugin->enrol_user($instance, $teacher->id, $teacherroleid, 0, 0, ENROL_USER_ACTIVE);
+        $ueid = (int) $DB->get_field(
+                'user_enrolments',
+                'id',
+                ['enrolid' => $instance->id, 'userid' => $user->id],
+                MUST_EXIST
+        );
+
+        // Login as teacher.
+        $teacher->ignoresesskey = true;
+        $this->setUser($teacher);
+
+        $formdata = [
+            'ue'        => $ueid,
+            'ifilter'   => 0,
+            'status'    => null,
+            'timestart' => null,
+            'timeend'   => null,
+        ];
+
+        $formdata = array_merge($formdata, $customdata);
+
+        require_once("$CFG->dirroot/enrol/editenrolment_form.php");
+        $formdata = enrol_user_enrolment_form::mock_generate_submit_keys($formdata);
+
+        $querystring = http_build_query($formdata, '', '&');
+
+        $result = external_api::clean_returnvalue(
+                core_enrol_external::submit_user_enrolment_form_returns(),
+                core_enrol_external::submit_user_enrolment_form($querystring)
+        );
+
+        $this->assertEquals(
+                ['result' => $expectedresult, 'validationerror' => $validationerror],
+                $result,
+                '', 0.0, 10, true);
+
+        if (!empty($result['result'])) {
+            $ue = $DB->get_record('user_enrolments', ['id' => $ueid], '*', MUST_EXIST);
+            $this->assertEquals($formdata['status'], $ue->status);
+        }
+    }
+
     /**
      * Test for core_enrol_external::unenrol_user_enrolment().
      */
diff --git a/favourites/tests/component_favourite_service_test.php b/favourites/tests/component_favourite_service_test.php
index 78c43d242e0c3..b4440073aaad9 100644
--- a/favourites/tests/component_favourite_service_test.php
+++ b/favourites/tests/component_favourite_service_test.php
@@ -88,7 +88,7 @@ protected function get_mock_repository(array $mockstore) {
                 // Check the mockstore for all objects with properties matching the key => val pairs in $criteria.
                 foreach ($mockstore as $index => $mockrow) {
                     $mockrowarr = (array)$mockrow;
-                    if (array_diff($criteria, $mockrowarr) == []) {
+                    if (array_diff_assoc($criteria, $mockrowarr) == []) {
                         $returns[$index] = $mockrow;
                     }
                 }
@@ -107,7 +107,7 @@ protected function get_mock_repository(array $mockstore) {
                 $crit = ['userid' => $userid, 'component' => $comp, 'itemtype' => $type, 'itemid' => $id, 'contextid' => $ctxid];
                 foreach ($mockstore as $fakerow) {
                     $fakerowarr = (array)$fakerow;
-                    if (array_diff($crit, $fakerowarr) == []) {
+                    if (array_diff_assoc($crit, $fakerowarr) == []) {
                         return $fakerow;
                     }
                 }
@@ -133,7 +133,7 @@ protected function get_mock_repository(array $mockstore) {
                 // Check the mockstore for all objects with properties matching the key => val pairs in $criteria.
                 foreach ($mockstore as $index => $mockrow) {
                     $mockrowarr = (array)$mockrow;
-                    if (array_diff($criteria, $mockrowarr) == []) {
+                    if (array_diff_assoc($criteria, $mockrowarr) == []) {
                         $count++;
                     }
                 }
@@ -156,7 +156,7 @@ protected function get_mock_repository(array $mockstore) {
                 // Check the mockstore for all objects with properties matching the key => val pairs in $criteria.
                 foreach ($mockstore as $index => $mockrow) {
                     $mockrowarr = (array)$mockrow;
-                    if (array_diff($criteria, $mockrowarr) == []) {
+                    if (array_diff_assoc($criteria, $mockrowarr) == []) {
                         unset($mockstore[$index]);
                     }
                 }
@@ -169,7 +169,7 @@ protected function get_mock_repository(array $mockstore) {
                 foreach ($mockstore as $index => $mockrow) {
                     $mockrowarr = (array)$mockrow;
                     echo "Here";
-                    if (array_diff($criteria, $mockrowarr) == []) {
+                    if (array_diff_assoc($criteria, $mockrowarr) == []) {
                         return true;
                     }
                 }
diff --git a/favourites/tests/user_favourite_service_test.php b/favourites/tests/user_favourite_service_test.php
index c48e81feeac70..b4e4b61f66788 100644
--- a/favourites/tests/user_favourite_service_test.php
+++ b/favourites/tests/user_favourite_service_test.php
@@ -88,7 +88,7 @@ protected function get_mock_repository(array $mockstore) {
                 // Check the mockstore for all objects with properties matching the key => val pairs in $criteria.
                 foreach ($mockstore as $index => $mockrow) {
                     $mockrowarr = (array)$mockrow;
-                    if (array_diff($criteria, $mockrowarr) == []) {
+                    if (array_diff_assoc($criteria, $mockrowarr) == []) {
                         $returns[$index] = $mockrow;
                     }
                 }
@@ -107,7 +107,7 @@ protected function get_mock_repository(array $mockstore) {
                 $crit = ['userid' => $userid, 'component' => $comp, 'itemtype' => $type, 'itemid' => $id, 'contextid' => $ctxid];
                 foreach ($mockstore as $fakerow) {
                     $fakerowarr = (array)$fakerow;
-                    if (array_diff($crit, $fakerowarr) == []) {
+                    if (array_diff_assoc($crit, $fakerowarr) == []) {
                         return $fakerow;
                     }
                 }
@@ -133,7 +133,7 @@ protected function get_mock_repository(array $mockstore) {
                 // Check the mockstore for all objects with properties matching the key => val pairs in $criteria.
                 foreach ($mockstore as $index => $mockrow) {
                     $mockrowarr = (array)$mockrow;
-                    if (array_diff($criteria, $mockrowarr) == []) {
+                    if (array_diff_assoc($criteria, $mockrowarr) == []) {
                         $count++;
                     }
                 }
@@ -156,7 +156,7 @@ protected function get_mock_repository(array $mockstore) {
                 // Check the mockstore for all objects with properties matching the key => val pairs in $criteria.
                 foreach ($mockstore as $index => $mockrow) {
                     $mockrowarr = (array)$mockrow;
-                    if (array_diff($criteria, $mockrowarr) == []) {
+                    if (array_diff_assoc($criteria, $mockrowarr) == []) {
                         return true;
                     }
                 }
diff --git a/files/converter/googledrive/classes/converter.php b/files/converter/googledrive/classes/converter.php
index aeda2ffbc6293..f55f8db05f201 100644
--- a/files/converter/googledrive/classes/converter.php
+++ b/files/converter/googledrive/classes/converter.php
@@ -124,7 +124,7 @@ public function start_document_conversion(\core_files\conversion $conversion) {
         $uploadurl;
         // Google returns a location header with the location for the upload.
         foreach ($headers as $header) {
-            if (strpos($header, 'Location:') === 0) {
+            if (stripos($header, 'Location:') === 0) {
                 $uploadurl = trim(substr($header, strpos($header, ':') + 1));
             }
         }
diff --git a/files/converter/unoconv/classes/converter.php b/files/converter/unoconv/classes/converter.php
index bbcedf0e73b30..cb20f607b2d50 100644
--- a/files/converter/unoconv/classes/converter.php
+++ b/files/converter/unoconv/classes/converter.php
@@ -194,7 +194,9 @@ public function serve_test_document() {
 
         $conversions = conversion::get_conversions_for_file($testdocx, $format);
         foreach ($conversions as $conversion) {
-            $conversion->delete();
+            if ($conversion->get('id')) {
+                $conversion->delete();
+            }
         }
 
         $conversion = new conversion(0, (object) [
diff --git a/filter/activitynames/tests/filter_test.php b/filter/activitynames/tests/filter_test.php
index 403170efffe5a..b21c924c1b7d8 100644
--- a/filter/activitynames/tests/filter_test.php
+++ b/filter/activitynames/tests/filter_test.php
@@ -37,7 +37,6 @@
 class filter_activitynames_filter_testcase extends advanced_testcase {
 
     public function test_links() {
-        global $CFG;
         $this->resetAfterTest(true);
 
         // Create a test course.
@@ -59,8 +58,8 @@ public function test_links() {
         preg_match_all('~<a class="autolink" title="([^"]*)" href="[^"]*/mod/page/view.php\?id=([0-9]+)">([^<]*)</a>~',
                 $filtered, $matches);
 
-        // There should be 3 links links.
-        $this->assertEquals(2, count($matches[1]));
+        // There should be 2 links links.
+        $this->assertCount(2, $matches[1]);
 
         // Check text of title attribute.
         $this->assertEquals($page1->name, $matches[1][0]);
@@ -74,4 +73,33 @@ public function test_links() {
         $this->assertEquals($page1->name, $matches[3][0]);
         $this->assertEquals($page2->name, $matches[3][1]);
     }
+
+    public function test_links_activity_named_hyphen() {
+        $this->resetAfterTest(true);
+
+        // Create a test course.
+        $course = $this->getDataGenerator()->create_course();
+        $context = context_course::instance($course->id);
+
+        // Work around an issue with the activity names filter which maintains a static cache
+        // of activities for current course ID. We can re-build the cache by switching user.
+        $this->setUser($this->getDataGenerator()->create_user());
+
+        // Create a page activity named '-' (single hyphen).
+        $page = $this->getDataGenerator()->create_module('page', ['course' => $course->id, 'name' => '-']);
+
+        $html = '<p>Please read the - page.</p>';
+        $filtered = format_text($html, FORMAT_HTML, array('context' => $context));
+
+        // Find the page link in the filtered html.
+        preg_match_all('~<a class="autolink" title="([^"]*)" href="[^"]*/mod/page/view.php\?id=([0-9]+)">([^<]*)</a>~',
+            $filtered, $matches);
+
+        // We should have exactly one match.
+        $this->assertCount(1, $matches[1]);
+
+        $this->assertEquals($page->name, $matches[1][0]);
+        $this->assertEquals($page->cmid, $matches[2][0]);
+        $this->assertEquals($page->name, $matches[3][0]);
+    }
 }
diff --git a/filter/classes/external.php b/filter/classes/external.php
index ed6218f976304..07911a9ec5558 100644
--- a/filter/classes/external.php
+++ b/filter/classes/external.php
@@ -85,7 +85,7 @@ public static function get_available_in_context($contexts) {
             } catch (Exception $e) {
                 $warnings[] = array(
                     'item' => 'context',
-                    'itemid' => $context['instanceid'],
+                    'itemid' => $contextinfo['instanceid'],
                     'warningcode' => $e->getCode(),
                     'message' => $e->getMessage(),
                 );
diff --git a/filter/emoticon/filter.php b/filter/emoticon/filter.php
index 5f5b3ff5dc052..6b6651ddcaca4 100644
--- a/filter/emoticon/filter.php
+++ b/filter/emoticon/filter.php
@@ -104,14 +104,14 @@ protected function replace_emoticons($text) {
         }
 
         // Detect all zones that we should not handle (including the nested tags).
-        $processing = preg_split('/(<\/?(?:span|script)[^>]*>)/is', $text, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $processing = preg_split('/(<\/?(?:span|script|pre)[^>]*>)/is', $text, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
         // Initialize the results.
         $resulthtml = "";
         $exclude = 0;
 
         // Define the patterns that mark the start of the forbidden zones.
-        $excludepattern = array('/^<script/is', '/^<span[^>]+class="nolink[^"]*"/is');
+        $excludepattern = array('/^<script/is', '/^<span[^>]+class="nolink[^"]*"/is', '/^<pre/is');
 
         // Loop through the fragments.
         foreach ($processing as $fragment) {
@@ -126,13 +126,15 @@ protected function replace_emoticons($text) {
             }
             if ($exclude > 0) {
                 // If we are ignoring the fragment, then we must check if we may have reached the end of the zone.
-                if (strpos($fragment, '</span') !== false || strpos($fragment, '</script') !== false) {
+                if (strpos($fragment, '</span') !== false || strpos($fragment, '</script') !== false
+                    || strpos($fragment, '</pre') !== false) {
                     $exclude -= 1;
                     // This is needed because of a double increment at the first element.
                     if ($exclude == 1) {
                         $exclude -= 1;
                     }
-                } else if (strpos($fragment, '<span') !== false || strpos($fragment, '<script') !== false) {
+                } else if (strpos($fragment, '<span') !== false || strpos($fragment, '<script') !== false
+                    || strpos($fragment, '<pre') !== false) {
                     // If we find a nested tag we increase the exclusion level.
                     $exclude = $exclude + 1;
                 }
diff --git a/filter/emoticon/tests/filter_test.php b/filter/emoticon/tests/filter_test.php
index 10ee76e8303ee..9935db92d8032 100644
--- a/filter/emoticon/tests/filter_test.php
+++ b/filter/emoticon/tests/filter_test.php
@@ -95,6 +95,21 @@ public function filter_emoticon_provider() {
                 'format' => FORMAT_HTML,
                 'expected' => '<span class="nolink"><span>(n)</span>(n)</span>' . $this->get_converted_content_for_emoticon('(n)'),
             ],
+            'Basic pre should not be processed' => [
+                'input' => '<pre>(n)</pre>',
+                'format' => FORMAT_HTML,
+                'expected' => '<pre>(n)</pre>',
+            ],
+            'Nested pre should not be processed' => [
+                'input' => '<pre><pre>(n)</pre>(n)</pre>',
+                'format' => FORMAT_HTML,
+                'expected' => '<pre><pre>(n)</pre>(n)</pre>',
+            ],
+            'Nested pre should not be processed but following emoticon' => [
+                'input' => '<pre><pre>(n)</pre>(n)</pre>(n)',
+                'format' => FORMAT_HTML,
+                'expected' => '<pre><pre>(n)</pre>(n)</pre>' . $this->get_converted_content_for_emoticon('(n)'),
+            ],
         ];
     }
 
diff --git a/filter/mathjaxloader/db/upgrade.php b/filter/mathjaxloader/db/upgrade.php
index e4bb953f13d25..c93d3987a12d8 100644
--- a/filter/mathjaxloader/db/upgrade.php
+++ b/filter/mathjaxloader/db/upgrade.php
@@ -160,5 +160,8 @@ function xmldb_filter_mathjaxloader_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/mathjaxloader/lang/en/filter_mathjaxloader.php b/filter/mathjaxloader/lang/en/filter_mathjaxloader.php
index cbe42bd153c0a..c3bbe43c41cf6 100644
--- a/filter/mathjaxloader/lang/en/filter_mathjaxloader.php
+++ b/filter/mathjaxloader/lang/en/filter_mathjaxloader.php
@@ -38,7 +38,7 @@
 
 This can be useful to save on bandwidth or because of local proxy restrictions.
 
-To use a local installation of MathJax, first download the full MathJax library from http://www.mathjax.org/. Then install it on a web server. Finally update the MathJax filter settings httpurl and/or httpsurl to point to the local MathJax.js URL.';
+To use a local installation of MathJax, first download the full MathJax library from https://www.mathjax.org/. Then install it on a web server. Finally update the MathJax filter settings httpurl and/or httpsurl to point to the local MathJax.js URL.';
 $string['mathjaxsettings'] = 'MathJax configuration';
 $string['mathjaxsettings_desc'] = 'The default MathJax configuration should be appropriate for most users, but MathJax is highly configurable and any of the standard MathJax configuration options can be added here.';
 $string['privacy:metadata'] = 'The MathJax plugin does not store any personal data.';
diff --git a/filter/mediaplugin/db/upgrade.php b/filter/mediaplugin/db/upgrade.php
index a8a43ac6634ef..b201df6afbcfb 100644
--- a/filter/mediaplugin/db/upgrade.php
+++ b/filter/mediaplugin/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/mediaplugin/styles.css b/filter/mediaplugin/styles.css
index 9a17d5b671d8e..c6ec054fbfd99 100644
--- a/filter/mediaplugin/styles.css
+++ b/filter/mediaplugin/styles.css
@@ -19,6 +19,14 @@
     margin: auto;
 }
 
+/* This is needed to display videos in an adequate size and without too much space
+   withing the specific mod assign table views. */
+.path-mod-assign .gradingtable .mediaplugin,
+.path-mod-assign .submissionsummarytable .mediaplugin {
+    width: 400px;
+    height: auto;
+}
+
 /* Make media plugin behave properly in mod summaries and labels */
 .mod-indent-outer .mediaplugin {
     display: table-cell;
diff --git a/filter/multilang/filter.php b/filter/multilang/filter.php
index efb618f705b22..2e9bac35575ee 100644
--- a/filter/multilang/filter.php
+++ b/filter/multilang/filter.php
@@ -16,8 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    filter
- * @subpackage multilang
+ * @package    filter_multilang
  * @copyright  Gaetan Frenoy <gaetan@frenoy.net>
  * @copyright  2004 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -39,6 +38,14 @@
 // Following new syntax is not compatible with old one:
 //   <span lang="XX" class="multilang">one lang</span><span lang="YY" class="multilang">another language</span>
 
+
+/**
+ * Implementation of the Moodle filter API for the Multi-lang filter.
+ *
+ * @copyright  Gaetan Frenoy <gaetan@frenoy.net>
+ * @copyright  2004 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class filter_multilang extends moodle_text_filter {
     function filter($text, array $options = array()) {
         global $CFG;
@@ -60,7 +67,7 @@ function filter($text, array $options = array()) {
             $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.*?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.*?<\/(?:lang|span)>)+/is';
         }
 
-        $result = preg_replace_callback($search, 'filter_multilang_impl', $text);
+        $result = preg_replace_callback($search, [$this, 'process_match'], $text);
 
         if (is_null($result)) {
             return $text; //error during regex processing (too many nested spans?)
@@ -68,44 +75,60 @@ function filter($text, array $options = array()) {
             return $result;
         }
     }
-}
 
-function filter_multilang_impl($langblock) {
-    global $CFG;
-
-    $mylang = current_language();
-    static $parentcache;
-    if (!isset($parentcache)) {
-        $parentcache = array();
-    }
-    if (!array_key_exists($mylang, $parentcache)) {
-        $parentlang = get_parent_language($mylang);
-        $parentcache[$mylang] = $parentlang;
-    } else {
-        $parentlang = $parentcache[$mylang];
-    }
+    /**
+     * This is the callback used by the preg_replace_callback call above.
+     *
+     * @param array $langblock one of the matches from the regex match.
+     * @return string the replacement string (one of the possible translations).
+     */
+    protected function process_match(array $langblock): string {
+        $searchtosplit = '/<(?:lang|span)[^>]+lang="([a-zA-Z0-9_-]+)"[^>]*>(.*?)<\/(?:lang|span)>/is';
+
+        if (!preg_match_all($searchtosplit, $langblock[0], $rawlanglist)) {
+            // Skip malformed blocks.
+            return $langblock[0];
+        }
 
-    $searchtosplit = '/<(?:lang|span)[^>]+lang="([a-zA-Z0-9_-]+)"[^>]*>(.*?)<\/(?:lang|span)>/is';
+        $langlist = array();
+        foreach ($rawlanglist[1] as $index => $lang) {
+            $lang = str_replace('-', '_', strtolower($lang)); // Normalize languages.
+            $langlist[$lang] = $rawlanglist[2][$index];
+        }
 
-    if (!preg_match_all($searchtosplit, $langblock[0], $rawlanglist)) {
-        //skip malformed blocks
-        return $langblock[0];
-    }
+        // Follow the stream of parent languages.
+        $lang = current_language();
+        do {
+            if (isset($langlist[$lang])) {
+                return $langlist[$lang];
+            }
+        } while ($lang = $this->get_parent_lang($lang));
 
-    $langlist = array();
-    foreach ($rawlanglist[1] as $index=>$lang) {
-        $lang = str_replace('-','_',strtolower($lang)); // normalize languages
-        $langlist[$lang] = $rawlanglist[2][$index];
+        // If we don't find a match, default to the first provided translation.
+        return array_shift($langlist);
     }
 
-    if (array_key_exists($mylang, $langlist)) {
-        return $langlist[$mylang];
-    } else if (array_key_exists($parentlang, $langlist)) {
-        return $langlist[$parentlang];
-    } else {
-        $first = array_shift($langlist);
-        return $first;
+    /**
+     * Puts some caching around get_parent_language().
+     *
+     * Also handle parent == 'en' in a way that works better for us.
+     *
+     * @param string $lang a Moodle language code, e.g. 'fr'.
+     * @return string the parent language.
+     */
+    protected function get_parent_lang(string $lang): string {
+        static $parentcache;
+        if (!isset($parentcache)) {
+            $parentcache = ['en' => ''];
+        }
+        if (!isset($parentcache[$lang])) {
+            $parentcache[$lang] = get_parent_language($lang);
+            // The standard get_parent_language method returns '' for parent == 'en'.
+            // That is less helpful for us, so change it back.
+            if ($parentcache[$lang] === '') {
+                $parentcache[$lang] = 'en';
+            }
+        }
+        return $parentcache[$lang];
     }
 }
-
-
diff --git a/filter/multilang/tests/filter_test.php b/filter/multilang/tests/filter_test.php
new file mode 100644
index 0000000000000..2dbefa2c8219b
--- /dev/null
+++ b/filter/multilang/tests/filter_test.php
@@ -0,0 +1,148 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests.
+ *
+ * @package filter_multilang
+ * @category test
+ * @copyright 2019 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+
+/**
+ * Tests for filter_multilang.
+ *
+ * @copyright 2019 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class filter_multilang_filter_testcase extends advanced_testcase {
+
+    public function setUp() {
+        parent::setUp();
+
+        $this->resetAfterTest(true);
+
+        // Enable glossary filter at top level.
+        filter_set_global_state('multilang', TEXTFILTER_ON);
+    }
+
+    /**
+     * Setup parent language relationship.
+     *
+     * @param string $child the child language, e.g. 'fr_ca'.
+     * @param string $parent the parent language, e.g. 'fr'.
+     */
+    protected function setup_parent_language(string $child, string $parent) {
+        global $CFG;
+
+        $langfolder = $CFG->dataroot . '/lang/' . $child;
+        check_dir_exists($langfolder);
+        $langconfig = "<?php\n\$string['parentlanguage'] = '$parent';";
+        file_put_contents($langfolder . '/langconfig.php', $langconfig);
+    }
+
+    /**
+     * Data provider for multi-language filtering tests.
+     */
+    public function multilang_testcases() {
+        return [
+            'Basic case EN' => [
+                'English',
+                '<span lang="en" class="multilang">English</span><span lang="fr" class="multilang">Français</span>',
+                'en',
+            ],
+            'Basic case FR' => [
+                'Français',
+                '<span lang="en" class="multilang">English</span><span lang="fr" class="multilang">Français</span>',
+                'fr',
+            ],
+            'Reversed input order EN' => [
+                'English',
+                '<span lang="fr" class="multilang">Français</span><span class="multilang" lang="en">English</span>',
+                'en',
+            ],
+            'Reversed input order EN' => [
+                'Français',
+                '<span lang="fr" class="multilang">Français</span><span class="multilang" lang="en">English</span>',
+                'fr',
+            ],
+            'Fallback to parent when child not present' => [
+                'Français',
+                '<span lang="en" class="multilang">English</span><span lang="fr" class="multilang">Français</span>',
+                'fr_ca', ['fr_ca' => 'fr']
+            ],
+            'Both parent and child language present, using child' => [
+                'Québécois',
+                '<span lang="fr_ca" class="multilang">Québécois</span>
+                <span lang="fr" class="multilang">Français</span>
+                <span lang="en" class="multilang">English</span>',
+                'fr_ca', ['fr_ca' => 'fr'],
+            ],
+            'Both parent and child language present, using parent' => [
+                'Français',
+                '<span lang="fr_ca" class="multilang">Québécois</span>
+                <span lang="fr" class="multilang">Français</span>
+                <span lang="en" class="multilang">English</span>',
+                'fr', ['fr_ca' => 'fr'],
+            ],
+            'Both parent and child language present - reverse order, using child' => [
+                'Québécois',
+                '<span lang="en" class="multilang">English</span>
+                <span lang="fr" class="multilang">Français</span>
+                <span lang="fr_ca" class="multilang">Québécois</span>',
+                'fr_ca', ['fr_ca' => 'fr'],
+            ],
+            'Both parent and child language present - reverse order, using parent' => [
+                'Français',
+                '<span lang="en" class="multilang">English</span>
+                <span lang="fr" class="multilang">Français</span>
+                <span lang="fr_ca" class="multilang">Québécois</span>',
+                'fr', ['fr_ca' => 'fr'],
+            ],
+            'Fallback to parent when child not present when parent is en' => [
+                'English',
+                '<span lang="de" class="multilang">Deutsch</span><span lang="en" class="multilang">English</span>',
+                'en_us',
+            ],
+        ];
+    }
+
+    /**
+     * Tests the filtering of multi-language strings.
+     *
+     * @dataProvider multilang_testcases
+     *
+     * @param string $expectedoutput The expected filter output.
+     * @param string $input the input that is filtererd.
+     * @param string $targetlang the laguage to set as the current languge .
+     * @param array $parentlangs Array child lang => parent lang. E.g. ['es_co' => 'es', 'es_mx' => 'es'].
+     */
+    public function test_filtering($expectedoutput, $input, $targetlang, $parentlangs = []) {
+        global $SESSION;
+        $SESSION->forcelang = $targetlang;
+
+        foreach ($parentlangs as $child => $parent) {
+            $this->setup_parent_language($child, $parent);
+        }
+
+        $filtered = format_text($input, FORMAT_HTML, array('context' => context_system::instance()));
+        $this->assertEquals($expectedoutput, $filtered);
+    }
+}
diff --git a/filter/tests/external_test.php b/filter/tests/external_test.php
index 71bdef4d48f6c..17796a3b4d9b4 100644
--- a/filter/tests/external_test.php
+++ b/filter/tests/external_test.php
@@ -187,5 +187,14 @@ public function test_get_available_in_context_module() {
         $this->assertEquals($firstfilter, $result['filters'][0]['filter']); // OK, the filter is enabled globally.
         $this->assertEquals(TEXTFILTER_OFF, $result['filters'][0]['localstate']); // It is not available in this context.
         $this->assertEquals(TEXTFILTER_ON, $result['filters'][0]['inheritedstate']); // In the parent context is available.
+
+        // Try user without permission, warning expected.
+        $user = $this->getDataGenerator()->create_user();
+        $this->setUser($user);
+        $result = external::get_available_in_context(array(array('contextlevel' => 'module', 'instanceid' => $forum->cmid)));
+        $result = external_api::clean_returnvalue(external::get_available_in_context_returns(), $result);
+        $this->assertNotEmpty($result['warnings']);
+        $this->assertEquals('context', $result['warnings'][0]['item']);
+        $this->assertEquals($forum->cmid, $result['warnings'][0]['itemid']);
     }
 }
diff --git a/filter/tex/db/upgrade.php b/filter/tex/db/upgrade.php
index ec40486e27dda..dae22573abd56 100644
--- a/filter/tex/db/upgrade.php
+++ b/filter/tex/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/grading/form/guide/db/upgrade.php b/grade/grading/form/guide/db/upgrade.php
index 290350d3cdd19..e9e73f4c461d5 100644
--- a/grade/grading/form/guide/db/upgrade.php
+++ b/grade/grading/form/guide/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_gradingform_guide_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/grading/form/guide/lang/en/gradingform_guide.php b/grade/grading/form/guide/lang/en/gradingform_guide.php
index 7499a4c41a335..9343b4aabdfdd 100644
--- a/grade/grading/form/guide/lang/en/gradingform_guide.php
+++ b/grade/grading/form/guide/lang/en/gradingform_guide.php
@@ -49,7 +49,7 @@
 $string['definemarkingguide'] = 'Define marking guide';
 $string['description'] = 'Description';
 $string['descriptionmarkers'] = 'Description for Markers';
-$string['descriptionstudents'] = 'Description for Students';
+$string['descriptionstudents'] = 'Description for students';
 $string['err_maxscoreisnegative'] = 'The max score is not valid, negative values are not allowed';
 $string['err_maxscorenotnumeric'] = 'Criterion max score must be numeric';
 $string['err_nocomment'] = 'Comment can not be empty';
diff --git a/grade/grading/form/rubric/db/upgrade.php b/grade/grading/form/rubric/db/upgrade.php
index e7e0bdf5c63fe..7b47339e44b7e 100644
--- a/grade/grading/form/rubric/db/upgrade.php
+++ b/grade/grading/form/rubric/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/grading/form/rubric/lang/en/gradingform_rubric.php b/grade/grading/form/rubric/lang/en/gradingform_rubric.php
index d5951aec2f570..b799a66f122fb 100644
--- a/grade/grading/form/rubric/lang/en/gradingform_rubric.php
+++ b/grade/grading/form/rubric/lang/en/gradingform_rubric.php
@@ -53,8 +53,8 @@
 $string['leveldefinition'] = 'Level {$a} definition';
 $string['levelempty'] = 'Click to edit level';
 $string['levelsgroup'] = 'Levels group';
-$string['lockzeropoints'] = 'Calculate grade based on the rubric having a minimum score of 0';
-$string['lockzeropoints_help'] = 'This setting only applies if the sum of the minimum number of points for each criterion is greater than 0. If ticked, the minimum achievable grade for the rubric will be greater than 0. If unticked, the minimum possible score for the rubric will be mapped to the minimum grade available for the activity (which is 0 unless a scale is used).';
+$string['lockzeropoints'] = 'Calculate grade having a minimum score of the minimum achievable grade for the rubric';
+$string['lockzeropoints_help'] = 'This setting only applies if the sum of the minimum number of points for each criterion is greater than 0. If ticked, the minimum achievable grade for the rubric will be the minimum achievable grade for the rubric. If unticked, the minimum possible score for the rubric will be mapped to the minimum grade available for the activity (which is 0 unless a scale is used).';
 $string['name'] = 'Name';
 $string['needregrademessage'] = 'The rubric definition was changed after this student had been graded. The student can not see this rubric until you check the rubric and update the grade.';
 $string['pluginname'] = 'Rubric';
@@ -75,7 +75,7 @@
 
 If a scale is used for grading, the score will be rounded and converted to the scale elements as if they were consecutive integers.
 
-This grade calculation may be changed by editing the form and ticking the box \'Calculate grade based on the rubric having a minimum score of 0\'.';
+This grade calculation may be changed by editing the form and ticking the box \'Calculate grade having a minimum score of the minimum achievable grade for the rubric\'.';
 $string['rubricnotcompleted'] = 'Please choose something for each criterion';
 $string['rubricoptions'] = 'Rubric options';
 $string['rubricstatus'] = 'Current rubric status';
diff --git a/grade/grading/form/rubric/renderer.php b/grade/grading/form/rubric/renderer.php
index 4b510d4c507ae..6382662489195 100644
--- a/grade/grading/form/rubric/renderer.php
+++ b/grade/grading/form/rubric/renderer.php
@@ -435,7 +435,7 @@ protected function rubric_edit_options($mode, $options) {
             switch ($option) {
                 case 'sortlevelsasc':
                     // Display option as dropdown
-                    $html .= html_writer::label(get_string($option, 'gradingform_rubric'), $attrs['id'], false, array('class' => 'label'));
+                    $html .= html_writer::label(get_string($option, 'gradingform_rubric'), $attrs['id'], false);
                     $value = (int)(!!$value); // make sure $value is either 0 or 1
                     if ($mode == gradingform_rubric_controller::DISPLAY_EDIT_FULL) {
                         $selectoptions = array(0 => get_string($option.'0', 'gradingform_rubric'), 1 => get_string($option.'1', 'gradingform_rubric'));
diff --git a/grade/grading/form/rubric/tests/behat/grade_calculation.feature b/grade/grading/form/rubric/tests/behat/grade_calculation.feature
index 687f1a49c7e2b..0e264b67ee248 100644
--- a/grade/grading/form/rubric/tests/behat/grade_calculation.feature
+++ b/grade/grading/form/rubric/tests/behat/grade_calculation.feature
@@ -23,12 +23,13 @@ Feature: Converting rubric score to grades
       | activity   | name              | intro | course | idnumber    | grade   | advancedgradingmethod_submissions |
       | assign     | Test assignment 1 | Test  | C1     | assign1     | <grade> | rubric                            |
     When I log in as "teacher1"
+    And I change window size to "large"
     And I am on "Course 1" course homepage with editing mode on
     And I go to "Test assignment 1" advanced grading definition page
     And I set the following fields to these values:
       | Name | Assignment 1 rubric |
       | Description | Rubric test description |
-      | Calculate grade based on the rubric having a minimum score of 0 | <lockzeropoints> |
+      | Calculate grade having a minimum score of the minimum achievable grade for the rubric | <lockzeropoints> |
     And I define the following rubric:
       | Criterion 1 | Level 11 | 20 | Level 12 | 25 | Level 13 | 40 | Level 14  | 50  |
       | Criterion 2 | Level 21 | 20 | Level 22 | 25 | Level 23 | 30 |           |     |
diff --git a/grade/grading/form/rubric/tests/behat/negative_points.feature b/grade/grading/form/rubric/tests/behat/negative_points.feature
index 33d0e1e0deb91..363bb6feea7e5 100644
--- a/grade/grading/form/rubric/tests/behat/negative_points.feature
+++ b/grade/grading/form/rubric/tests/behat/negative_points.feature
@@ -26,6 +26,7 @@ Feature: Rubrics can have levels with negative scores
     And the following "activities" exist:
       | activity   | name              | intro | course | idnumber    | grade   | advancedgradingmethod_submissions |
       | assign     | Test assignment 1 | Test  | C1     | assign1     | 100     | rubric                            |
+    And I change window size to "large"
     When I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
     And I go to "Test assignment 1" advanced grading definition page
diff --git a/grade/grading/lib.php b/grade/grading/lib.php
index d2f57e9f63bab..386363844eccf 100644
--- a/grade/grading/lib.php
+++ b/grade/grading/lib.php
@@ -322,8 +322,10 @@ public function get_available_areas() {
             }
 
         } else if ($this->get_context()->contextlevel == CONTEXT_MODULE) {
-            list($context, $course, $cm) = get_context_info_array($this->get_context()->id);
-            return self::available_areas('mod_'.$cm->modname);
+            $modulecontext = $this->get_context();
+            $coursecontext = $modulecontext->get_course_context();
+            $cm = get_fast_modinfo($coursecontext->instanceid)->get_cm($modulecontext->instanceid);
+            return self::available_areas("mod_{$cm->modname}");
 
         } else {
             throw new coding_exception('Unsupported gradable area context level');
diff --git a/grade/lib.php b/grade/lib.php
index 7a976615b5be0..67857cb02fa56 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -986,7 +986,7 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null,
 
     // Put a warning on all gradebook pages if the course has modules currently scheduled for background deletion.
     require_once($CFG->dirroot . '/course/lib.php');
-    if (course_modules_pending_deletion($courseid)) {
+    if (course_modules_pending_deletion($courseid, true)) {
         \core\notification::add(get_string('gradesmoduledeletionpendingwarning', 'grades'),
             \core\output\notification::NOTIFY_WARNING);
     }
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 1b82a20ee6e3f..53741c4256729 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -767,7 +767,7 @@ public function get_left_rows($displayaverages) {
                 $fieldcell = new html_table_cell();
                 $fieldcell->attributes['class'] = 'userfield user' . $field;
                 $fieldcell->header = false;
-                $fieldcell->text = $user->{$field};
+                $fieldcell->text = s($user->{$field});
                 $userrow->cells[] = $fieldcell;
             }
 
diff --git a/grade/report/history/tests/behat/basic_functionality.feature b/grade/report/history/tests/behat/basic_functionality.feature
index 06a951883d7b6..1b1326a05d8fd 100644
--- a/grade/report/history/tests/behat/basic_functionality.feature
+++ b/grade/report/history/tests/behat/basic_functionality.feature
@@ -77,7 +77,7 @@ Feature: A teacher checks the grade history report in a course
       | Student 2          | The greatest assignment ever  | 50.00          | 70.00         | Teacher 2 |
       | Student 2          | Rewarding assignment          | 60.00          | 80.00         | Teacher 2 |
     # Test filtering by assignment.
-    And I click on "The greatest assignment ever" "option" in the "#id_itemid" "css_element"
+    And I set the field "Grade item" to "The greatest assignment ever"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
       | First name/Surname | Grade item                    | Original grade | Revised grade | Grader    |
@@ -87,7 +87,7 @@ Feature: A teacher checks the grade history report in a course
       | Student 1          | Rewarding assignment          |                | 60.00         | Teacher 1 |
       | Student 1          | Rewarding assignment          | 60.00          | 80.00         | Teacher 2 |
     # Test filtering by grader.
-    And I click on "Teacher 1" "option" in the "#id_grader" "css_element"
+    And I set the field "Grader" to "Teacher 1"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
       | First name/Surname | Grade item                    | Original grade | Revised grade | Grader    |
diff --git a/grade/report/overview/db/upgrade.php b/grade/report/overview/db/upgrade.php
index 72726d8cf82c0..6efe5a2d4fd9b 100644
--- a/grade/report/overview/db/upgrade.php
+++ b/grade/report/overview/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_gradereport_overview_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/singleview/classes/local/ui/dropdown_attribute.php b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
index 50f1ce9966712..06b37e1aa674e 100644
--- a/grade/report/singleview/classes/local/ui/dropdown_attribute.php
+++ b/grade/report/singleview/classes/local/ui/dropdown_attribute.php
@@ -93,7 +93,8 @@ public function html() {
                     'value' => $option,
                     'selected' => $selected == $option
                 ];
-            }, array_keys($options))
+            }, array_keys($options)),
+            'label' => get_string('gradefor', 'gradereport_singleview', $this->label),
         );
 
         return $OUTPUT->render_from_template('gradereport_singleview/dropdown_attribute', $context);
diff --git a/grade/report/singleview/templates/bulk_insert.mustache b/grade/report/singleview/templates/bulk_insert.mustache
index abe592ac131ab..3c8a88dd8f986 100644
--- a/grade/report/singleview/templates/bulk_insert.mustache
+++ b/grade/report/singleview/templates/bulk_insert.mustache
@@ -18,13 +18,13 @@
     Bulk insert attribute.
 }}
 <div class="enable">
-    <input type="checkbox" name="{{applyname}}" value="1" id="{{applyname}}">
+    <input type="checkbox" name="{{applyname}}" value="1" id="{{applyname}}" class="ml-0">
     <label for="{{applyname}}">{{applylabel}}</label>
 </div>
 <fieldset class="form-inline">
     <legend class="accesshide">{{label}}</legend>
     <label for="{{menuname}}">{{menulabel}}</label>
-    <select name="{{menuname}}" id="{{menuname}}" class="form-control">
+    <select name="{{menuname}}" id="{{menuname}}" class="form-control custom-select">
         {{#menuoptions}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/menuoptions}}
diff --git a/grade/report/singleview/templates/dropdown_attribute.mustache b/grade/report/singleview/templates/dropdown_attribute.mustache
index 9f3be1a882d0a..5bdb65799380e 100644
--- a/grade/report/singleview/templates/dropdown_attribute.mustache
+++ b/grade/report/singleview/templates/dropdown_attribute.mustache
@@ -17,6 +17,7 @@
 {{!
     Dropdown attribute.
 }}
+<label for="{{name}}" class="accesshide">{{label}}</label>
 <select id="{{name}}" name="{{name}}" class="custom-select" tabindex="1" {{#disabled}}disabled{{/disabled}}>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
diff --git a/grade/report/singleview/tests/behat/singleview.feature b/grade/report/singleview/tests/behat/singleview.feature
index d86cdcffc3958..e18eb5c46eba7 100644
--- a/grade/report/singleview/tests/behat/singleview.feature
+++ b/grade/report/singleview/tests/behat/singleview.feature
@@ -87,7 +87,7 @@ Feature: We can use Single view
     And the field "Grade for james (Student) 1" matches value "12.05"
     And the field "Exclude for holly (Student) 2" matches value "1"
     And I select "new grade item 1" from the "Select grade item..." singleselect
-    And I click on "Very good" "option"
+    And I set the field "Grade for james (Student) 1" to "Very good"
     And I press "Save"
     Then I should see "Grades were set for 1 items"
     And I press "Continue"
@@ -98,7 +98,7 @@ Feature: We can use Single view
     And I log in as "teacher2"
     And I am on "Course 1" course homepage
     Given I navigate to "View > Single view" in the course gradebook
-    And I click on "Student 4" "option"
+    And I select "Student 4" from the "Select user..." singleselect
     And the "Exclude for Test assignment one" "checkbox" should be disabled
     And the "Override for Test assignment one" "checkbox" should be enabled
 
diff --git a/grade/report/user/db/upgrade.php b/grade/report/user/db/upgrade.php
index bc436ed2c3b9b..bca069486ab18 100644
--- a/grade/report/user/db/upgrade.php
+++ b/grade/report/user/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_gradereport_user_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/user/externallib.php b/grade/report/user/externallib.php
index 8bbd6e54b20e1..da5f8668631d0 100644
--- a/grade/report/user/externallib.php
+++ b/grade/report/user/externallib.php
@@ -514,7 +514,7 @@ public static function get_grade_items_returns() {
                                         'numusers' => new external_value(PARAM_INT, 'Num users in course', VALUE_OPTIONAL),
                                         'averageformatted' => new external_value(PARAM_NOTAGS, 'Grade average', VALUE_OPTIONAL),
                                         'feedback' => new external_value(PARAM_RAW, 'Grade feedback', VALUE_OPTIONAL),
-                                        'feedbackformat' => new external_format_value('feedback'),
+                                        'feedbackformat' => new external_format_value('feedback', VALUE_OPTIONAL),
                                     ), 'Grade items'
                                 )
                             )
diff --git a/grade/tests/behat/grade_to_pass.feature b/grade/tests/behat/grade_to_pass.feature
index a59f0fc396f86..e257fd95206a4 100644
--- a/grade/tests/behat/grade_to_pass.feature
+++ b/grade/tests/behat/grade_to_pass.feature
@@ -195,9 +195,9 @@ Feature: We can set the grade to pass value
     And I add a "Forum" to section "1" and I fill the form with:
       | Forum name     | Test Forum 1    |
       | Description    | Test               |
-      | Aggregate type | Average of ratings |
-      | Grade to pass  | 90                 |
-      | scale[modgrade_point] | 60 |
+      | Ratings > Aggregate type | Average of ratings |
+      | Ratings > scale[modgrade_point] | 60 |
+      | Grade > Grade to pass  | 90                 |
     Then I should see "The grade to pass can not be greater than the maximum possible grade 60"
 
   Scenario: Set a valid grade to pass for forum activity
@@ -205,8 +205,8 @@ Feature: We can set the grade to pass value
     And I add a "Forum" to section "1" and I fill the form with:
       | Forum name     | Test Forum 1    |
       | Description    | Test               |
-      | Aggregate type | Average of ratings |
-      | Grade to pass  | 90                 |
+      | Ratings > Aggregate type | Average of ratings |
+      | Grade > Grade to pass  | 90                 |
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I click on "Edit  forum Test Forum 1" "link"
diff --git a/group/autogroup.php b/group/autogroup.php
index b66ca45cb3ae8..206cfd040ed5d 100644
--- a/group/autogroup.php
+++ b/group/autogroup.php
@@ -171,7 +171,7 @@
             $table->width = '90%';
         }
         $table->data  = array();
-
+        $viewfullnames = has_capability('moodle/site:viewfullnames', $context);
         foreach ($groups as $group) {
             $line = array();
             if (groups_get_group_by_name($courseid, $group['name'])) {
@@ -183,7 +183,7 @@
             if ($data->allocateby != 'no') {
                 $unames = array();
                 foreach ($group['members'] as $user) {
-                    $unames[] = fullname($user, true);
+                    $unames[] = fullname($user, $viewfullnames);
                 }
                 $line[] = implode(', ', $unames);
                 $line[] = count($group['members']);
diff --git a/group/classes/output/user_groups_editable.php b/group/classes/output/user_groups_editable.php
index 9595a0335686e..a4a61c501119c 100644
--- a/group/classes/output/user_groups_editable.php
+++ b/group/classes/output/user_groups_editable.php
@@ -77,8 +77,10 @@ public function __construct($course, $context, $user, $coursegroups, $value) {
         foreach ($coursegroups as $group) {
             $options[$group->id] = format_string($group->name, true, ['context' => $this->context]);
         }
-        $this->edithint = get_string('editusersgroupsa', 'group', fullname($user));
-        $this->editlabel = get_string('editusersgroupsa', 'group', fullname($user));
+
+        $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $this->context));
+        $this->edithint = get_string('editusersgroupsa', 'group', $fullname);
+        $this->editlabel = get_string('editusersgroupsa', 'group', $fullname);
 
         $attributes = ['multiple' => true];
         $this->set_type_autocomplete($options, $attributes);
diff --git a/group/externallib.php b/group/externallib.php
index bebede4fd4b96..341e72750a886 100644
--- a/group/externallib.php
+++ b/group/externallib.php
@@ -556,7 +556,8 @@ public static function delete_group_members($members) {
             require_capability('moodle/course:managegroups', $context);
 
             if (!groups_remove_member_allowed($group, $user)) {
-                throw new moodle_exception('errorremovenotpermitted', 'group', '', fullname($user));
+                $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
+                throw new moodle_exception('errorremovenotpermitted', 'group', '', $fullname);
             }
             groups_remove_member($group, $user);
         }
diff --git a/group/index.php b/group/index.php
index 79c9e21aabd5c..ab3fb04d89831 100644
--- a/group/index.php
+++ b/group/index.php
@@ -81,6 +81,9 @@
     case 'ajax_getmembersingroup':
         $roles = array();
         if ($groupmemberroles = groups_get_members_by_role($groupids[0], $courseid, 'u.id, ' . get_all_user_name_fields(true, 'u'))) {
+
+            $viewfullnames = has_capability('moodle/site:viewfullnames', $context);
+
             foreach($groupmemberroles as $roleid=>$roledata) {
                 $shortroledata = new stdClass();
                 $shortroledata->name = $roledata->name;
@@ -88,7 +91,7 @@
                 foreach($roledata->users as $member) {
                     $shortmember = new stdClass();
                     $shortmember->id = $member->id;
-                    $shortmember->name = fullname($member, true);
+                    $shortmember->name = fullname($member, $viewfullnames);
                     $shortroledata->users[] = $shortmember;
                 }
                 $roles[] = $shortroledata;
@@ -190,12 +193,15 @@
 if ($singlegroup) {
     $usernamefields = get_all_user_name_fields(true, 'u');
     if ($groupmemberroles = groups_get_members_by_role(reset($groupids), $courseid, 'u.id, ' . $usernamefields)) {
+
+        $viewfullnames = has_capability('moodle/site:viewfullnames', $context);
+
         foreach ($groupmemberroles as $roleid => $roledata) {
             $users = array();
             foreach ($roledata->users as $member) {
                 $users[] = (object)[
                     'value' => $member->id,
-                    'text' => fullname($member, true)
+                    'text' => fullname($member, $viewfullnames)
                 ];
             }
             $members[] = (object)[
diff --git a/group/overview.php b/group/overview.php
index de91486b3ce45..d4619a6596277 100644
--- a/group/overview.php
+++ b/group/overview.php
@@ -69,6 +69,10 @@
 $strnogroup          = get_string('nogroup', 'group');
 $strnogrouping       = get_string('nogrouping', 'group');
 
+// This can show all users and all groups in a course.
+// This is lots of data so allow this script more resources.
+raise_memory_limit(MEMORY_EXTRA);
+
 // Get all groupings and sort them by formatted name.
 $groupings = $DB->get_records('groupings', array('courseid'=>$courseid), 'name');
 foreach ($groupings as $gid => $grouping) {
@@ -244,9 +248,11 @@
             $line[] = html_writer::tag('span', $name, array('class' => 'group_hoverdescription', 'data-groupid' => $gpid));
             $hoverevents[$gpid] = get_string('descriptiona', null, $jsdescription);
         }
+        $viewfullnames = has_capability('moodle/site:viewfullnames', $context);
         $fullnames = array();
         foreach ($users as $user) {
-            $fullnames[] = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$course->id.'">'.fullname($user, true).'</a>';
+            $fullnames[] = html_writer::link(new moodle_url('/user/view.php', ['id' => $user->id, 'course' => $course->id]),
+                fullname($user, $viewfullnames));
         }
         $line[] = implode(', ', $fullnames);
         $line[] = count($users);
diff --git a/install/lang/ar/admin.php b/install/lang/ar/admin.php
index d8aa404445037..f979eb1e053ce 100644
--- a/install/lang/ar/admin.php
+++ b/install/lang/ar/admin.php
@@ -34,12 +34,10 @@
 $string['cliansweryes'] = 'نعم';
 $string['cliincorrectvalueerror'] = 'خطأ، القيمة "{$a->value}" غير صحيحة من أجل "{$a->option}"';
 $string['cliincorrectvalueretry'] = 'قيمة غير صحيحة، حاول مرة أخرى';
-$string['clitypevalue'] = 'أدخل القيمة';
-$string['clitypevaluedefault'] = 'ادخل القيم أو اضغط انتر (Enter) لإستخدام القيم الأفتراضية  ({$a})';
-$string['cliunknowoption'] = 'خيارات غير معروفة
-{$a}
-الرجاء استخدام خيار المساعدة';
-$string['cliyesnoprompt'] = 'ادخل (Y) تعني نعم أو (N) تعني لأ';
-$string['environmentrequireinstall'] = 'مطلوب تثبيته/تفيله';
-$string['environmentrequireversion'] = 'مطلوب الأصدار {$a->needed} ، وانت تستخدم الأصدار {$a->current}';
+$string['clitypevalue'] = 'اكتب قيمة';
+$string['clitypevaluedefault'] = 'اكتب قيمة أو اضغط زر الإدخال لاستخدام القيم الافتراضية ({$a})';
+$string['cliunknowoption'] = 'خيارات غير معروفة: {$a} الرجاء استخدام -- خيار المساعدة.';
+$string['cliyesnoprompt'] = 'أدخل (Y) و تعني نعم أو (N) و تعني لا';
+$string['environmentrequireinstall'] = 'يجب تثبيته و تمكينه';
+$string['environmentrequireversion'] = 'مطلوب الإصدار {$a->needed} ، و أنت تشغل الإصدار {$a->current}';
 $string['upgradekeyset'] = 'مفتاح التحديث (اتركها فارغة إن لم ترغب بتحديده)';
diff --git a/install/lang/ar_wp/langconfig.php b/install/lang/ar_wp/langconfig.php
new file mode 100644
index 0000000000000..798c70c3df84e
--- /dev/null
+++ b/install/lang/ar_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'ar';
+$string['thislanguage'] = 'بالعربي workplace';
diff --git a/install/lang/ca/error.php b/install/lang/ca/error.php
index 626222cb63f37..e0a91776d4ee4 100644
--- a/install/lang/ca/error.php
+++ b/install/lang/ca/error.php
@@ -46,7 +46,7 @@
 $string['invalidmd5'] = 'L\'md5 no és vàlid. Torneu a provar-ho';
 $string['missingrequiredfield'] = 'Falta algun camp necessari';
 $string['remotedownloaderror'] = '<p>No s\'ha pogut baixar el component al vostre servidor. Verifiqueu els paràmetres del servidor intermediari. Es recomana vivament l\'extensió cURL de PHP.</p>
-<p>Haureu de baixar manualment el fitxer <a href="{$a->url}">{$a->url}</a>, copiar-lo a la ubicació «{$a->dest}» del vostre servidor i descomprimir-lo allí.</p>';
+<p>Haureu de baixar manualment el fitxer <a href="{$a->url}">{$a->url}</a>, copiar-lo a la ubicació «{$a->dest}» del vostre servidor i descomprimir-lo allà.</p>';
 $string['wrongdestpath'] = 'El camí de destinació és erroni';
 $string['wrongsourcebase'] = 'L\'adreça (URL) base de la font és errònia';
 $string['wrongzipfilename'] = 'El nom del fitxer ZIP és erroni';
diff --git a/course/publish/hubselector.php b/install/lang/ca_valencia_racv/langconfig.php
similarity index 54%
rename from course/publish/hubselector.php
rename to install/lang/ca_valencia_racv/langconfig.php
index e731d4dceaee4..71ff0e80f828d 100644
--- a/course/publish/hubselector.php
+++ b/install/lang/ca_valencia_racv/langconfig.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -14,17 +15,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/*
- * @package    course
- * @subpackage publish
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
  *
- * On this page the user selects where he wants to publish the course
-*/
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
-require('../../config.php');
+defined('MOODLE_INTERNAL') || die();
 
-$id = required_param('id', PARAM_INT);
-redirect(new moodle_url('/course/publish/index.php', ['id' => $id]));
\ No newline at end of file
+$string['thislanguage'] = 'Valencià_RACV';
diff --git a/install/lang/ca_wp/langconfig.php b/install/lang/ca_wp/langconfig.php
new file mode 100644
index 0000000000000..2684abc29d59c
--- /dev/null
+++ b/install/lang/ca_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'ca';
+$string['thislanguage'] = 'Català per a Workplace';
diff --git a/install/lang/cs/install.php b/install/lang/cs/install.php
index e03e3b2fe8466..90bc3bf569851 100644
--- a/install/lang/cs/install.php
+++ b/install/lang/cs/install.php
@@ -89,7 +89,7 @@
 $string['welcomep20'] = 'Podařilo se vám úspěšně nainstalovat a spustit balíček <strong>{$a->packname} {$a->packversion}</strong>. Gratulujeme!';
 $string['welcomep30'] = 'Tato verze <strong>{$a->installername}</strong> obsahuje aplikace k vytvoření prostředí, ve kterém bude provozován váš <strong>Moodle</strong>. Jmenovitě se jedná o:';
 $string['welcomep40'] = 'Balíček rovněž obsahuje <strong>Moodle ve verzi {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'Použití všech aplikací v tomto balíčku je vázáno jejich příslušnými licencemi. Kompletní balíček <strong>{$a->installername}</strong> je software s <a href="http://www.opensource.org/docs/definition_plain.html"> otevřeným kódem (open source)</a> a je šířen pod licencí <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
+$string['welcomep50'] = 'Použití všech aplikací v tomto balíčku je vázáno jejich příslušnými licencemi. Kompletní balíček <strong>{$a->installername}</strong> je software s <a href="https://www.opensource.org/docs/definition_plain.html"> otevřeným kódem (open source)</a> a je šířen pod licencí <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a>.';
 $string['welcomep60'] = 'Následující stránky vás v několik jednoduchých krocích nastavením <strong>Moodlu</strong> na vašem počítači. Můžete přijmout výchozí nastavení, nebo si je upravit podle svých potřeb.';
 $string['welcomep70'] = 'Stisknutím níže uvedeného tlačítka "Další" pokračujte v nastavení vaší instalace Moodlu.';
 $string['wwwroot'] = 'Webová adresa';
diff --git a/install/lang/da/install.php b/install/lang/da/install.php
index 20859625545fe..bee6f3c9cafc8 100644
--- a/install/lang/da/install.php
+++ b/install/lang/da/install.php
@@ -88,7 +88,7 @@
 Tillykke med det!';
 $string['welcomep30'] = 'Denne version af <strong>{$a->installername}</strong> indeholder programmerne til at oprette et miljø, hvori <strong>Moodle</strong> vil operere, nemlig:';
 $string['welcomep40'] = 'Pakken indeholder også <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'Brugen af programmerne i denne pakke reguleres af deres respektive licenser. Hele <strong>{$a->installername}</strong>-pakken er <a href="http://www.opensource.org/docs/definition_plain.html">open source</a> og distribueret under <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>-licensen.';
+$string['welcomep50'] = 'Brugen af programmerne i denne pakke reguleres af deres respektive licenser. Hele <strong>{$a->installername}</strong>-pakken er <a href="https://www.opensource.org/docs/definition_plain.html">open source</a> og distribueret under <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a>-licensen.';
 $string['welcomep60'] = 'De følgende sider vil hjælpe dig gennem nogle nemme trin til konfiguration og opsætning af <strong>Moodle</strong> på din computer. Du kan acceptere standardindstillingerne, eller vælge at ændre dem så de bedre svarer til dine egne behov.';
 $string['welcomep70'] = 'Klik på "Næste" herunder for at forsætte opsætningen af <strong>Moodle</strong>.';
 $string['wwwroot'] = 'Webadresse';
diff --git a/install/lang/el/admin.php b/install/lang/el/admin.php
index a68438e39a6cd..dccc3eb925d77 100644
--- a/install/lang/el/admin.php
+++ b/install/lang/el/admin.php
@@ -32,13 +32,14 @@
 
 $string['clianswerno'] = 'ο';
 $string['cliansweryes'] = 'ν';
-$string['cliincorrectvalueerror'] = 'Σφάλμα, λανθασμένη τιμή "{$a->value}" για το "{$a->option}"';
+$string['cliincorrectvalueerror'] = 'Σφάλμα, λανθασμένη τιμή «{$a->value}» για το «{$a->option}»';
 $string['cliincorrectvalueretry'] = 'Λανθασμένη τιμή. Παρακαλούμε προσπαθήστε ξανά.';
 $string['clitypevalue'] = 'πληκτρολογήστε μια τιμή';
 $string['clitypevaluedefault'] = 'πληκτρολογήστε μια τιμή· πατήστε Enter για να χρησιμοποιήσετε τηνπροεπιλεγμένη τιμή ({$a})';
-$string['cliunknowoption'] = 'Μη αναγνωρίσιμες επιλογές: {$a}<br />
-Παρακαλούμε χρησιμοποιήστε την επιλογή --βοήθεια';
-$string['cliyesnoprompt'] = 'πατώντας y (σημαίνει yes=ναι) αλλιώς πατώντας n (σημαίνει no=όχι)';
+$string['cliunknowoption'] = 'Μη αναγνωρίσιμες επιλογές:
+ {$a}<br />
+Παρακαλούμε χρησιμοποιήστε την επιλογή --help (βοήθεια)';
+$string['cliyesnoprompt'] = 'πατήστε y (σημαίνει yes=ναι) ή πατήστε n (σημαίνει no=όχι)';
 $string['environmentrequireinstall'] = 'απαιτείται να εγκατασταθεί/ ενεργοποιηθεί';
 $string['environmentrequireversion'] = 'απαιτείται η έκδοση {$a->needed} ενώ εσείς έχετε την {$a->current}';
 $string['upgradekeyset'] = 'Κλειδί αναβάθμισης (αφήστε κενό για να μην το ορίσετε)';
diff --git a/install/lang/el/error.php b/install/lang/el/error.php
index b4a6f49486599..2966927e58f4c 100644
--- a/install/lang/el/error.php
+++ b/install/lang/el/error.php
@@ -40,11 +40,11 @@
 $string['cannotsavezipfile'] = 'Αδυναμία αποθήκευσης συμπιεσμένου αρχείου';
 $string['cannotunzipfile'] = 'Αδυναμία αποσυμπίεσης αρχείου';
 $string['componentisuptodate'] = 'Το στοιχείο λογισμικού είναι ενημερωμένο.';
-$string['dmlexceptiononinstall'] = '<p>Παρουσιάστηκε σφάλμα βάσης δεδομένων [{$a->errorcode}].<br />{$a->debuginfo}</p>';
+$string['dmlexceptiononinstall'] = '<p>Παρουσιάστηκε κάποιο σφάλμα βάσης δεδομένων [{$a->errorcode}].<br />{$a->debuginfo}</p>';
 $string['downloadedfilecheckfailed'] = 'Αποτυχία ελέγχου αρχείου που έγινε λήψη';
-$string['invalidmd5'] = 'Μη έγκυρο md5';
+$string['invalidmd5'] = 'Η μεταβλητή ελέγχου ήταν λανθασμένη - δοκιμάστε ξανά';
 $string['missingrequiredfield'] = 'Κάποιο απαιτούμενο πεδίο λείπει';
-$string['remotedownloaderror'] = '<p>Απέτυχε η λήψη του τμήματος στον εξυπηρετητή σας. Παρακαλούμε επιβεβαιώστε τις ρυθμίσεις του διακομιστή μεσολάβησης (proxy)· η επέκταση PHP cURL συνιστάται θερμά.</p> <p>Πρέπει να κατεβάσετε το <a href="{$a->url}">{$a->url}</a> χειροκίνητα, να το αντιγράψετε στο "{$a->dest}" στον εξυπηρετητή σας και να το αποσυμπιέσετε εκεί.</p>';
-$string['wrongdestpath'] = 'Λανθασμένη διαδρομή προορισμού (πλήρες όνομα).';
+$string['remotedownloaderror'] = '<p>Η λήψη του στοιχείου λογισμικού στον εξυπηρετητή σας απέτυχε. Παρακαλούμε επαληθεύστε τις ρυθμίσεις του διακομιστή μεσολάβησης (proxy)· η επέκταση PHP cURL συνιστάται θερμά.</p><br /><p>Πρέπει να κατεβάσετε το αρχείο <a href="{$a->url}">{$a->url}</a> χειροκίνητα, να το αντιγράψετε στο «{$a->dest}» στον εξυπηρετητή σας και να το αποσυμπιέσετε εκεί.</p>';
+$string['wrongdestpath'] = 'Λανθασμένο μονοπάτι προορισμού.';
 $string['wrongsourcebase'] = 'Λανθασμένη βάση πηγής URL.';
 $string['wrongzipfilename'] = 'Λανθασμένo όνομα αρχείου ZIP.';
diff --git a/install/lang/el/install.php b/install/lang/el/install.php
index 98744e2a185cd..aa518e4026355 100644
--- a/install/lang/el/install.php
+++ b/install/lang/el/install.php
@@ -37,7 +37,7 @@
 $string['clialreadyconfigured'] = 'Το αρχείο ρυθμίσεων config.php υπάρχει ήδη. Χρησιμοποιήστε το admin/cli/install_database.php για να εγκαταστήσετε το Moodle για αυτόν τον ιστότοπο.';
 $string['clialreadyinstalled'] = 'Το αρχείο ρυθμίσεων config.php υπάρχει ήδη. Χρησιμοποιήστε το admin/cli/install_database.php για να αναβαθμίσετε το Moodle για αυτόν τον ιστότοπο.';
 $string['cliinstallheader'] = 'Moodle {$a} πρόγραμμα εγκατάστασης γραμμής εντολών';
-$string['databasehost'] = 'Κεντρικός Υπολογιστής Βάσης Δεδομένων';
+$string['databasehost'] = 'Κεντρικός H/Y που φιλοξενεί την Βάση Δεδομένων';
 $string['databasename'] = 'Όνομα Βάσης Δεδομένων';
 $string['databasetypehead'] = 'Επιλογή οδηγού βάσης δεδομένων';
 $string['dataroot'] = 'Φάκελος δεδομένων';
@@ -49,22 +49,33 @@
 Ο πλήρης έλεγχος του περιβάλλοντος πραγματοποιείται πριν κάθε εγκατάσταση και αναβάθμιση. Παρακαλούμε επικοινωνήστε με τον διαχειριστή του εξυπηρετητή εάν δεν ξέρετε πως να εγκαταστήσετε νέα έκδοση της PHP ή να ενεργοποιήσετε επεκτάσεις της.';
 $string['errorsinenvironment'] = 'Ο έλεγχος του περιβάλλοντος απέτυχε!';
 $string['installation'] = 'Εγκατάσταση';
-$string['langdownloaderror'] = 'Δυστυχώς η γλώσσα "{$a}" δεν είναι εγκατεστημένη. Η εγκατάσταση θα συνεχιστεί στα αγγλικά.';
-$string['memorylimithelp'] = '<p>Το όριο μνήμης της PHP στον εξυπηρετητή σας είναι ορισμένο αυτή τη στιγμή στα {$a}.</p> <p>Αυτό μπορεί να προκαλέσει προβλήματα μνήμης στο Moodle στη συνέχεια, ειδικά αν έχετε πολλά ενεργοποιημένα αρθρώματα και/ή πολλούς χρήστες.</p> <p>Προτείνεται η ρύθμιση της PHP με μεγαλύτερο όριο, αν αυτό είναι δυνατό, π.χ. 40M. Υπάρχουν πολλοί τρόποι να το κάνετε αυτό, τους οποίους μπορείτε να δοκιμάσετε:</p> <ol> <li>Αν έχετε τη δυνατότητα, κάνετε επαναμεταγλώττιση την PHP με την παράμετρο <i>--enable-memory-limit</i>. Αυτό θα επιτρέψει στο Moodle να ορίσει μόνο του το όριο μνήμης.</li> <li>Αν έχετε πρόσβαση στο αρχείο php.ini, μπορείτε να αλλάξετε τη ρύθμιση <b>memory_limit</b> σε 40M. Αν δεν έχετε πρόσβαση ζητήστε από το διαχειριστή να το κάνει για εσάς.</li> <li>Σε κάποιους εξυπηρετητές PHP μπορείτε να δημιουργήσετε ένα αρχείο .htaccess στο φάκελο του Moodle που να περιέχει τις παρακάτω γραμμές:<p><blockquote>php_value memory_limit 40M</div></blockquote> <p>Ωστόσο, σε κάποιους εξυπηρετητές αυτό θα εμποδίσει τη λειτουργία <b>όλων</b> των σελιδών PHP (θα βλέπετε σφάλματα όταν ανοίγετε τις σελίδες), οπότε θα πρέπει να διαγράψετε το αρχείο .htaccess.</p></li> </ol>';
+$string['langdownloaderror'] = 'Δυστυχώς η γλώσσα «{$a}» δεν είναι εγκατεστημένη. Η εγκατάσταση θα συνεχιστεί στα αγγλικά.';
+$string['memorylimithelp'] = '<p>Το όριο μνήμης της PHP στον εξυπηρετητή σας είναι ορισμένο αυτή τη στιγμή στα {$a}.</p>
+
+<p>Αυτό μπορεί να προκαλέσει προβλήματα μνήμης στο Moodle στη συνέχεια, ειδικά αν έχετε πολλά ενεργοποιημένα αρθρώματα και/ή πολλούς χρήστες.</p>
+
+<p>Προτείνεται η ρύθμιση της PHP με μεγαλύτερο όριο, αν αυτό είναι δυνατό, π.χ. 40M. Υπάρχουν πολλοί τρόποι να το κάνετε αυτό, τους οποίους μπορείτε να δοκιμάσετε:</p>
+<ol>
+<li>Αν έχετε τη δυνατότητα, κάνετε επαναμεταγλώττιση της PHP με την παράμετρο <i>--enable-memory-limit</i>. Αυτό θα επιτρέψει στο Moodle να ορίσει μόνο του το όριο μνήμης.</li>
+<li>Αν έχετε πρόσβαση στο αρχείο php.ini, μπορείτε να αλλάξετε τη ρύθμιση <b>memory_limit</b> σε 40M. Αν δεν έχετε πρόσβαση ζητήστε από το διαχειριστή να το κάνει για εσάς.</li>
+<li>Σε κάποιους εξυπηρετητές PHP μπορείτε να δημιουργήσετε ένα αρχείο .htaccess στο φάκελο του Moodle που να περιέχει την παρακάτω γραμμή:
+<blockquote>php_value memory_limit 40M</div></blockquote>
+<p>Ωστόσο, σε κάποιους εξυπηρετητές αυτό θα εμποδίσει τη λειτουργία <b>όλων</b> των σελίδων PHP (θα βλέπετε σφάλματα όταν ανοίγετε τις σελίδες), οπότε θα πρέπει να διαγράψετε το αρχείο .htaccess.</p></li>
+</ol>';
 $string['paths'] = 'Διαδρομές';
 $string['pathserrcreatedataroot'] = 'Ο Φάκελος δεδομένων ({$a->dataroot}) δεν μπορεί να δημιουργθεί από το πρόγραμμα εγκατάστασης.';
 $string['pathshead'] = 'Επιβεβαίωση Διαδρομών';
 $string['pathsrodataroot'] = 'Ο Φάκελος Δεδομένων δεν είναι εγγράψιμος.';
 $string['pathsroparentdataroot'] = 'Ο γονικός φάκελος ({$a->parent}) δεν είναι εγγράψιμος. Ο φάκελος δεδομένων ({$a->dataroot}) δεν μπορεί να δημιουργθεί από το πρόγραμμα εγκατάστασης.';
-$string['pathssubadmindir'] = 'Κάποιοι λίγοι κεντρικοί υπολογιστές ιστού χρησιμοποιούν το /admin ως ειδική διεύθυνση URL για την πρόσβαση σε κάποιο πίνακα ελέγχου ή κάτι τέτοιο. Δυστυχώς αυτό έρχεται σε αντίθεση με την τυπική τοποθεσία των σελίδων διαχείρισης (admin) του Moodle. Αυτό μπορεί να διορθωθεί με την μετονομασία του admin φακέλου στην εγκατάστασή σας, και βάζοντας αυτό το καινούργιο όνομα εδώ. Για παράδειγμα: <em>moodleadmin</em>.  Αυτό θα διορθώσει όλους τους συνδέσμους με το admin στην διεύθυνσή τους σε όλη την εγκατάσταση του Moodle σας.';
-$string['pathssubdataroot'] = '<p>Ένας φάκελος όπου το Moodle θα αποθηκεύει όλα τα ανεβασμένα από τους χρήστες αρχεία.</p> <p>Αυτος ο φάκελος θα πρέπει να είναι αναγνώσιμος ΚΑΙ ΕΓΓΡΑΨΙΜΟΣ από τον χρήστη του εξυπηρετητή ιστού (συνήθως \'nobody\' ή \'apache\').</p> <p>Δεν πρέπει να είναι προσβάσιμος κατευθείαν από τον ιστό.</p> <p>Αν ο φάκελος δεν υπάρχει, η διαδικασία εγκατάστασης θα προσπαθήσει να τον δημιουργήσει.</p>';
+$string['pathssubadmindir'] = 'Κάποιοι λίγοι κεντρικοί υπολογιστές ιστού χρησιμοποιούν το /admin ως ειδική διεύθυνση URL για την πρόσβαση σε κάποιο πίνακα ελέγχου ή κάτι τέτοιο. Δυστυχώς αυτό έρχεται σε αντίθεση με την τυπική τοποθεσία των σελίδων διαχείρισης (admin) του Moodle. Αυτό μπορεί να διορθωθεί με την μετονομασία του admin φακέλου στην εγκατάστασή σας, και βάζοντας αυτό το καινούργιο όνομα εδώ. Για παράδειγμα: <em>moodleadmin</em>. Αυτό θα διορθώσει όλους τους συνδέσμους με το admin στην διεύθυνσή τους σε όλη την εγκατάσταση του Moodle σας.';
+$string['pathssubdataroot'] = '<p>Ένας φάκελος όπου το Moodle θα αποθηκεύει όλα τα ανεβασμένα από τους χρήστες αρχεία.</p> <p>Αυτος ο φάκελος θα πρέπει να είναι αναγνώσιμος ΚΑΙ ΕΓΓΡΑΨΙΜΟΣ από τον χρήστη του εξυπηρετητή ιστού (συνήθως «nobody» ή «apache»).</p> <p>Δεν πρέπει να είναι προσβάσιμος κατευθείαν από τον ιστό.</p> <p>Αν ο φάκελος δεν υπάρχει, η διαδικασία εγκατάστασης θα προσπαθήσει να τον δημιουργήσει.</p>';
 $string['pathssubdirroot'] = '<p>Η πλήρης διαδρομή του φακέλου που περιέχει τα αρχεία κώδικα του Moodle.</p>';
-$string['pathssubwwwroot'] = '<p>Η πλήρης διεύθυνση (ιστού) από την οποία θα γίνεται η πρόσβαση στο Moodle, δηλαδή η διεύθυνση που οι χρήστες θα εισάγουν στην γραμμή διεύθυνσης του περιηγητή, για να έχουν πρόσβαση στου Moodle.</p>
+$string['pathssubwwwroot'] = '<p>Η πλήρης διεύθυνση από την οποία θα γίνεται η πρόσβαση στο Moodle, δηλαδή η διεύθυνση που οι χρήστες θα εισάγουν στην γραμμή διεύθυνσης του περιηγητή, για να έχουν πρόσβαση στου Moodle.</p>
 <p>Δεν είναι δυνατόν να έχετε πρόβαση στο Moodle χρησιμοποιώντας πολλαπλές διευθύνσεις. Εάν ο ιστότοπος θα είναι προσβάσιμος μέσω πολλαπλών διευθύνσεων τότε επιλέξτε την ευκολότερη και εγκαταστήστε μια μόνιμη ανακατεύθυνση για καθεμία από τις άλλες διευθύνσεις.</p>
 <p>Εάν ο ιστότοπός σας είναι προσβάσιμος τόσο από το Διαδίκτυο όσο και από ένα εσωτερικό δίκτυο (που συχνά λέγεται intranet) τότε χρησιμοποιήστε εδώ την δημόσια διεύθυνση.</p>
 <p>Αν η τρέχουσα διεύθυνση δεν είναι σωστή, παρακαλούμε αλλάξτε την URL διεύθυνση στην γραμμή διευθύνσεων του περιηγητή σας και επανεκκινήστε την εγκατάσταση.</p>';
 $string['pathsunsecuredataroot'] = 'Η τοποθεσία του Φάκελου Δεδομένων δεν είναι ασφαλής';
-$string['pathswrongadmindir'] = 'Ο Φάκελος Admin δεν υπάρχει';
+$string['pathswrongadmindir'] = 'Ο φάκελος Admin δεν υπάρχει';
 $string['phpextension'] = 'Επέκταση {$a} της PHP';
 $string['phpversion'] = 'Έκδοση της PHP';
 $string['phpversionhelp'] = 'p>Το Moodle απαιτεί η έκδοση της PHP να είναι τουλάχιστον 5.6.5 ή 7.1 (η 7.0.x έχει κάποιους περιορισμούς στη μηχανή).</p>
@@ -74,7 +85,7 @@
 $string['welcomep20'] = 'Βλέπετε αυτή τη σελίδα γιατί εγκαταστήσατε και ξεκινήσατε με επιτυχία το πακέτο <strong>{$a->packname} {$a->packversion}</strong> στον υπολογιστή σας. Συγχαρητήρια!';
 $string['welcomep30'] = 'Αυτή η έκδοση/διανομή <strong>{$a->installername}</strong> περιλαμβάνει τις εφαρμογές για τη δημιουργία ενός περιβάλλοντος μέσα στο οποίο θα λειτουργεί το <strong>Moodle</strong>, ονομαστικά:';
 $string['welcomep40'] = 'Το πακέτο περιλαμβάνει επίσης το <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'Η χρήση όλων των εφαρμογών σε αυτό το πακέτο υπόκειται στις αντίστοιχες άδειες. Ολόκληρο το πακέτο <strong>{$a->installername}</strong> είναι <a href="http://www.opensource.org/docs/definition_plain.html">λογισμικό ανοικτού κώδικα</a> και διανέμεται με την <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> άδεια.';
-$string['welcomep60'] = 'Οι παρακάτω σελίδες θα σας καθοδηγήσουν με εύκολα βήματα στην εγκατάσταση και ρύθμιση του <strong>Moodle</strong> στον υπολογιστή σας. Μπορείτε να δεχθείτε τις προεπιλεγμένες ρυθμίσεις ή προαιρετικά, να τις τροποποιήσετε ανάλογα με τις ανάγκες σας.';
-$string['welcomep70'] = 'Πατήστε το κουμπί "Συνέχεια" για να συνεχίσετε με την εκγατάσταση του <strong>Moodle</strong>.';
+$string['welcomep50'] = 'Η χρήση όλων των εφαρμογών σε αυτό το πακέτο υπόκειται στις αντίστοιχες άδειες. Ολόκληρο το πακέτο <strong>{$a->installername}</strong> είναι <a href="https://www.opensource.org/docs/definition_plain.html">λογισμικό ανοικτού κώδικα</a> και διανέμεται με την <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a> άδεια.';
+$string['welcomep60'] = 'Οι παρακάτω σελίδες θα σας καθοδηγήσουν με εύκολα βήματα στην εγκατάσταση και ρύθμιση του <strong>Moodle</strong> στον Η/Υ σας. Μπορείτε να δεχθείτε τις προεπιλεγμένες ρυθμίσεις ή προαιρετικά, να τις τροποποιήσετε ανάλογα με τις ανάγκες σας.';
+$string['welcomep70'] = 'Πατήστε το κουμπί «Συνέχεια» για να συνεχίσετε με την εγκατάσταση του <strong>Moodle</strong>.';
 $string['wwwroot'] = 'Διεύθυνση ιστού';
diff --git a/install/lang/el_kids/langconfig.php b/install/lang/el_kids/langconfig.php
new file mode 100644
index 0000000000000..ef6e6b69c445a
--- /dev/null
+++ b/install/lang/el_kids/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'el';
+$string['thislanguage'] = 'Ελληνικά για παιδιά';
diff --git a/install/lang/el_uni/langconfig.php b/install/lang/el_uni/langconfig.php
new file mode 100644
index 0000000000000..d5cc284bb0934
--- /dev/null
+++ b/install/lang/el_uni/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'el';
+$string['thislanguage'] = 'Ελληνικά για σχολές';
diff --git a/install/lang/el_wp/admin.php b/install/lang/el_wp/admin.php
new file mode 100644
index 0000000000000..4421c5ad64bb5
--- /dev/null
+++ b/install/lang/el_wp/admin.php
@@ -0,0 +1,44 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['clianswerno'] = 'ο';
+$string['cliansweryes'] = 'ν';
+$string['cliincorrectvalueerror'] = 'Σφάλμα, λανθασμένη τιμή «{$a->value}» για το «{$a->option}»';
+$string['cliincorrectvalueretry'] = 'Λανθασμένη τιμή. Παρακαλούμε προσπαθήστε ξανά.';
+$string['clitypevalue'] = 'πληκτρολογήστε μια τιμή';
+$string['clitypevaluedefault'] = 'πληκτρολογήστε μια τιμή· πατήστε Enter για να χρησιμοποιήσετε τηνπροεπιλεγμένη τιμή ({$a})';
+$string['cliunknowoption'] = 'Μη αναγνωρίσιμες επιλογές: {$a}<br />
+Παρακαλούμε χρησιμοποιήστε την επιλογή --βοήθεια';
+$string['cliyesnoprompt'] = 'πατήστε y (σημαίνει yes=ναι) ή πατήστε n (σημαίνει no=όχι)';
+$string['environmentrequireinstall'] = 'απαιτείται να εγκατασταθεί/ ενεργοποιηθεί';
+$string['environmentrequireversion'] = 'απαιτείται η έκδοση {$a->needed} ενώ εσείς έχετε την {$a->current}';
+$string['upgradekeyset'] = 'Κλειδί αναβάθμισης (αφήστε κενό για να μην το ορίσετε)';
diff --git a/install/lang/el_wp/error.php b/install/lang/el_wp/error.php
new file mode 100644
index 0000000000000..bf4b25dd8b6d7
--- /dev/null
+++ b/install/lang/el_wp/error.php
@@ -0,0 +1,50 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['cannotcreatedboninstall'] = '<p>Αδυναμία δημιουργίας βάσης δεδομένων.</p> <p>Η βάση δεδομένων που προσδιορίστηκε δεν υπάρχει και ο χρήστης που δόθηκε δεν έχει δικαίωμα να δημιουργήσει την βάση δεδομένων.</p> <p>Ο διαχειριστής του ιστοτόπου πρέπει να επαληθεύσει τις ρυθμίσεις της βάσης δεδομένων.</p>';
+$string['cannotcreatelangdir'] = 'Δε δημιουργήθηκε φάκελος γλώσσας.';
+$string['cannotcreatetempdir'] = 'Αδυναμία δημιουργίας προσωρινού φακέλου';
+$string['cannotdownloadcomponents'] = 'Δεν μπορεί να γίνει λήψη των στοιχείων λογισμικού';
+$string['cannotdownloadzipfile'] = 'Δεν μπορεί να γίνει λήψη του αρχείου ZIP.';
+$string['cannotfindcomponent'] = 'Δεν βρέθηκε το στοιχείο λογισμικού.';
+$string['cannotsavemd5file'] = 'Αδυναμία αποθήκευσης αρχείου md5.';
+$string['cannotsavezipfile'] = 'Αδυναμία αποθήκευσης συμπιεσμένου αρχείου';
+$string['cannotunzipfile'] = 'Αδυναμία αποσυμπίεσης αρχείου';
+$string['componentisuptodate'] = 'Το στοιχείο λογισμικού είναι ενημερωμένο.';
+$string['dmlexceptiononinstall'] = '<p>Παρουσιάστηκε σφάλμα βάσης δεδομένων [{$a->errorcode}].<br />{$a->debuginfo}</p>';
+$string['downloadedfilecheckfailed'] = 'Αποτυχία ελέγχου αρχείου που έγινε λήψη';
+$string['invalidmd5'] = 'Μη έγκυρο md5';
+$string['missingrequiredfield'] = 'Κάποιο απαιτούμενο πεδίο λείπει';
+$string['remotedownloaderror'] = '<p>Απέτυχε η λήψη του τμήματος στον εξυπηρετητή σας. Παρακαλούμε επιβεβαιώστε τις ρυθμίσεις του διακομιστή μεσολάβησης (proxy)· η επέκταση PHP cURL συνιστάται θερμά.</p> <p>Πρέπει να κατεβάσετε το <a href="{$a->url}">{$a->url}</a> χειροκίνητα, να το αντιγράψετε στο «{$a->dest}» στον εξυπηρετητή σας και να το αποσυμπιέσετε εκεί.</p>';
+$string['wrongdestpath'] = 'Λανθασμένη διαδρομή προορισμού (πλήρες όνομα).';
+$string['wrongsourcebase'] = 'Λανθασμένη βάση πηγής URL.';
+$string['wrongzipfilename'] = 'Λανθασμένo όνομα αρχείου ZIP.';
diff --git a/install/lang/el_wp/install.php b/install/lang/el_wp/install.php
new file mode 100644
index 0000000000000..37efea7bbbe26
--- /dev/null
+++ b/install/lang/el_wp/install.php
@@ -0,0 +1,80 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['admindirname'] = 'Φάκελος διαχειριστή';
+$string['availablelangs'] = 'Λίστα διαθέσιμων πακέτων γλωσσών';
+$string['chooselanguagehead'] = 'Επιλογή γλώσσας';
+$string['chooselanguagesub'] = 'Παρακαλούμε, επιλέξτε γλώσσα για την εγκατάσταση. Αυτή η γλώσσα θα χρησιμοποιηθεί επίσης ως προεπιλεγμένη γλώσσα για τον ιστότοπο, αν και μπορεί να αλλάξει αργότερα.';
+$string['clialreadyconfigured'] = 'Το αρχείο ρυθμίσεων config.php υπάρχει ήδη. Χρησιμοποιήστε το admin/cli/install_database.php για να εγκαταστήσετε το Moodle για αυτόν τον ιστότοπο.';
+$string['clialreadyinstalled'] = 'Το αρχείο ρυθμίσεων config.php υπάρχει ήδη. Χρησιμοποιήστε το admin/cli/install_database.php για να αναβαθμίσετε το Moodle για αυτόν τον ιστότοπο.';
+$string['cliinstallheader'] = 'Moodle {$a} πρόγραμμα εγκατάστασης γραμμής εντολών';
+$string['databasehost'] = 'Κεντρικός Υπολογιστής Βάσης Δεδομένων';
+$string['databasename'] = 'Όνομα Βάσης Δεδομένων';
+$string['databasetypehead'] = 'Επιλογή οδηγού βάσης δεδομένων';
+$string['dataroot'] = 'Φάκελος δεδομένων';
+$string['datarootpermission'] = 'Άδεια φακέλων/καταλόγων δεδομένων';
+$string['dbprefix'] = 'Πρόθεμα πινάκων';
+$string['dirroot'] = 'Φάκελος Moodle';
+$string['environmenthead'] = 'Έλεγχος περιβάλλοντος...';
+$string['environmentsub2'] = 'Κάθε έκδοση Moodle έχει κάποια ελάχιστη απαίτηση σχετικά με την έκδοση της PHP και ενός αριθμού από αναγκαίες επεκτάσεις PHP.
+Ο πλήρης έλεγχος του περιβάλλοντος πραγματοποιείται πριν κάθε εγκατάσταση και αναβάθμιση. Παρακαλούμε επικοινωνήστε με τον διαχειριστή του εξυπηρετητή εάν δεν ξέρετε πως να εγκαταστήσετε νέα έκδοση της PHP ή να ενεργοποιήσετε επεκτάσεις της.';
+$string['errorsinenvironment'] = 'Ο έλεγχος του περιβάλλοντος απέτυχε!';
+$string['installation'] = 'Εγκατάσταση';
+$string['langdownloaderror'] = 'Δυστυχώς η γλώσσα «{$a}» δεν είναι εγκατεστημένη. Η εγκατάσταση θα συνεχιστεί στα αγγλικά.';
+$string['memorylimithelp'] = '<p>Το όριο μνήμης της PHP στον εξυπηρετητή σας είναι ορισμένο αυτή τη στιγμή στα {$a}.</p> <p>Αυτό μπορεί να προκαλέσει προβλήματα μνήμης στο Moodle στη συνέχεια, ειδικά αν έχετε πολλά ενεργοποιημένα αρθρώματα και/ή πολλούς χρήστες.</p> <p>Προτείνεται η ρύθμιση της PHP με μεγαλύτερο όριο, αν αυτό είναι δυνατό, π.χ. 40M. Υπάρχουν πολλοί τρόποι να το κάνετε αυτό, τους οποίους μπορείτε να δοκιμάσετε:</p> <ol> <li>Αν έχετε τη δυνατότητα, κάνετε επαναμεταγλώττιση την PHP με την παράμετρο <i>--enable-memory-limit</i>. Αυτό θα επιτρέψει στο Moodle να ορίσει μόνο του το όριο μνήμης.</li> <li>Αν έχετε πρόσβαση στο αρχείο php.ini, μπορείτε να αλλάξετε τη ρύθμιση <b>memory_limit</b> σε 40M. Αν δεν έχετε πρόσβαση ζητήστε από το διαχειριστή να το κάνει για εσάς.</li> <li>Σε κάποιους εξυπηρετητές PHP μπορείτε να δημιουργήσετε ένα αρχείο .htaccess στο φάκελο του Moodle που να περιέχει τις παρακάτω γραμμές:<p><blockquote>php_value memory_limit 40M</div></blockquote> <p>Ωστόσο, σε κάποιους εξυπηρετητές αυτό θα εμποδίσει τη λειτουργία <b>όλων</b> των σελιδών PHP (θα βλέπετε σφάλματα όταν ανοίγετε τις σελίδες), οπότε θα πρέπει να διαγράψετε το αρχείο .htaccess.</p></li> </ol>';
+$string['paths'] = 'Διαδρομές';
+$string['pathserrcreatedataroot'] = 'Ο Φάκελος δεδομένων ({$a->dataroot}) δεν μπορεί να δημιουργθεί από το πρόγραμμα εγκατάστασης.';
+$string['pathshead'] = 'Επιβεβαίωση Διαδρομών';
+$string['pathsrodataroot'] = 'Ο Φάκελος Δεδομένων δεν είναι εγγράψιμος.';
+$string['pathsroparentdataroot'] = 'Ο γονικός φάκελος ({$a->parent}) δεν είναι εγγράψιμος. Ο φάκελος δεδομένων ({$a->dataroot}) δεν μπορεί να δημιουργθεί από το πρόγραμμα εγκατάστασης.';
+$string['pathssubadmindir'] = 'Κάποιοι λίγοι κεντρικοί υπολογιστές ιστού χρησιμοποιούν το /admin ως ειδική διεύθυνση URL για την πρόσβαση σε κάποιο πίνακα ελέγχου ή κάτι τέτοιο. Δυστυχώς αυτό έρχεται σε αντίθεση με την τυπική τοποθεσία των σελίδων διαχείρισης (admin) του Moodle. Αυτό μπορεί να διορθωθεί με την μετονομασία του admin φακέλου στην εγκατάστασή σας, και βάζοντας αυτό το καινούργιο όνομα εδώ. Για παράδειγμα: <em>moodleadmin</em>.  Αυτό θα διορθώσει όλους τους συνδέσμους με το admin στην διεύθυνσή τους σε όλη την εγκατάσταση του Moodle σας.';
+$string['pathssubdataroot'] = '<p>Ένας φάκελος όπου το Moodle θα αποθηκεύει όλα τα ανεβασμένα από τους χρήστες αρχεία.</p> <p>Αυτος ο φάκελος θα πρέπει να είναι αναγνώσιμος ΚΑΙ ΕΓΓΡΑΨΙΜΟΣ από τον χρήστη του εξυπηρετητή ιστού (συνήθως «nobody» ή «apache»).</p> <p>Δεν πρέπει να είναι προσβάσιμος κατευθείαν από τον ιστό.</p> <p>Αν ο φάκελος δεν υπάρχει, η διαδικασία εγκατάστασης θα προσπαθήσει να τον δημιουργήσει.</p>';
+$string['pathssubdirroot'] = '<p>Η πλήρης διαδρομή του φακέλου που περιέχει τα αρχεία κώδικα του Moodle.</p>';
+$string['pathssubwwwroot'] = '<p>Η πλήρης διεύθυνση (ιστού) από την οποία θα γίνεται η πρόσβαση στο Moodle, δηλαδή η διεύθυνση που οι χρήστες θα εισάγουν στην γραμμή διεύθυνσης του περιηγητή, για να έχουν πρόσβαση στου Moodle.</p>
+<p>Δεν είναι δυνατόν να έχετε πρόβαση στο Moodle χρησιμοποιώντας πολλαπλές διευθύνσεις. Εάν ο ιστότοπος θα είναι προσβάσιμος μέσω πολλαπλών διευθύνσεων τότε επιλέξτε την ευκολότερη και εγκαταστήστε μια μόνιμη ανακατεύθυνση για καθεμία από τις άλλες διευθύνσεις.</p>
+<p>Εάν ο ιστότοπός σας είναι προσβάσιμος τόσο από το Διαδίκτυο όσο και από ένα εσωτερικό δίκτυο (που συχνά λέγεται intranet) τότε χρησιμοποιήστε εδώ την δημόσια διεύθυνση.</p>
+<p>Αν η τρέχουσα διεύθυνση δεν είναι σωστή, παρακαλούμε αλλάξτε την URL διεύθυνση στην γραμμή διευθύνσεων του περιηγητή σας και επανεκκινήστε την εγκατάσταση.</p>';
+$string['pathsunsecuredataroot'] = 'Η τοποθεσία του Φάκελου Δεδομένων δεν είναι ασφαλής';
+$string['pathswrongadmindir'] = 'Ο Φάκελος Admin δεν υπάρχει';
+$string['phpextension'] = 'Επέκταση {$a} της PHP';
+$string['phpversion'] = 'Έκδοση της PHP';
+$string['phpversionhelp'] = 'p>Το Moodle απαιτεί η έκδοση της PHP να είναι τουλάχιστον 5.6.5 ή 7.1 (η 7.0.x έχει κάποιους περιορισμούς στη μηχανή).</p>
+<p>Αυτή τη στιγμή έχετε την έκδοση {$a}</p>
+<p>Πρέπει να αναβαθμίσετε την PHP ή να μεταφερθείτε σε έναν κεντρικό Η/Υ με μια νεότερη έκδοση της PHP!</p>';
+$string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
+$string['welcomep20'] = 'Βλέπετε αυτή τη σελίδα γιατί εγκαταστήσατε και ξεκινήσατε με επιτυχία το πακέτο <strong>{$a->packname} {$a->packversion}</strong> στον υπολογιστή σας. Συγχαρητήρια!';
+$string['welcomep30'] = 'Αυτή η έκδοση/διανομή <strong>{$a->installername}</strong> περιλαμβάνει τις εφαρμογές για τη δημιουργία ενός περιβάλλοντος μέσα στο οποίο θα λειτουργεί το <strong>Moodle</strong>, ονομαστικά:';
+$string['welcomep40'] = 'Το πακέτο περιλαμβάνει επίσης το <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
+$string['welcomep50'] = 'Η χρήση όλων των εφαρμογών σε αυτό το πακέτο υπόκειται στις αντίστοιχες άδειες. Ολόκληρο το πακέτο <strong>{$a->installername}</strong> είναι <a href="http://www.opensource.org/docs/definition_plain.html">λογισμικό ανοικτού κώδικα</a> και διανέμεται με την <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> άδεια.';
+$string['welcomep60'] = 'Οι παρακάτω σελίδες θα σας καθοδηγήσουν με εύκολα βήματα στην εγκατάσταση και ρύθμιση του <strong>Moodle</strong> στον υπολογιστή σας. Μπορείτε να δεχθείτε τις προεπιλεγμένες ρυθμίσεις ή προαιρετικά, να τις τροποποιήσετε ανάλογα με τις ανάγκες σας.';
+$string['welcomep70'] = 'Πατήστε το κουμπί «Συνέχεια» για να συνεχίσετε με την εγκατάσταση του <strong>Moodle</strong>.';
+$string['wwwroot'] = 'Διεύθυνση ιστού';
diff --git a/install/lang/el_wp/langconfig.php b/install/lang/el_wp/langconfig.php
new file mode 100644
index 0000000000000..adb05a695894c
--- /dev/null
+++ b/install/lang/el_wp/langconfig.php
@@ -0,0 +1,35 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'el';
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Ελληνικά για χώρους εργασίας';
diff --git a/install/lang/el_wp/moodle.php b/install/lang/el_wp/moodle.php
new file mode 100644
index 0000000000000..6375cf9547e46
--- /dev/null
+++ b/install/lang/el_wp/moodle.php
@@ -0,0 +1,37 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['language'] = 'Γλώσσα';
+$string['moodlelogo'] = 'Λογότυπο Moodle';
+$string['next'] = 'Επόμενο';
+$string['previous'] = 'Προηγούμενο';
+$string['reload'] = 'Eπαναφόρτωση';
diff --git a/install/lang/en/install.php b/install/lang/en/install.php
index 974ece35dc5b5..4fcf862f92375 100644
--- a/install/lang/en/install.php
+++ b/install/lang/en/install.php
@@ -99,10 +99,7 @@
 $string['welcomep30'] = 'This release of the <strong>{$a->installername}</strong> includes the applications
     to create an environment in which <strong>Moodle</strong> will operate, namely:';
 $string['welcomep40'] = 'The package also includes <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'The use of all the applications in this package is governed by their respective
-    licences. The complete <strong>{$a->installername}</strong> package is
-    <a href="http://www.opensource.org/docs/definition_plain.html">open source</a> and is distributed
-    under the <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> license.';
+$string['welcomep50'] = 'The use of all the applications in this package is governed by their respective licences. The complete <strong>{$a->installername}</strong> package is <a href="https://www.opensource.org/docs/definition_plain.html">open source</a> and is distributed under the <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a> license.';
 $string['welcomep60'] = 'The following pages will lead you through some easy to follow steps to
     configure and set up <strong>Moodle</strong> on your computer. You may accept the default
     settings or, optionally, amend them to suit your own needs.';
diff --git a/install/lang/es_mx/install.php b/install/lang/es_mx/install.php
index 272628e4a1134..275e453fad968 100644
--- a/install/lang/es_mx/install.php
+++ b/install/lang/es_mx/install.php
@@ -92,10 +92,7 @@
 $string['welcomep20'] = 'Si está viendo esta página es porque ha podido instalar y ejecutar exitosamente el paquete <strong>{$a->packname} {$a->packversion}</strong> en su computadora. !Enhorabuena!';
 $string['welcomep30'] = 'Esta versión de <strong>{$a->installername}</strong> incluye las aplicaciones necesarias para que <strong>Moodle</strong> funcione en su computadora,  principalmente:';
 $string['welcomep40'] = 'El paquete también incluye <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'El uso de todas las aplicaciones del paquete está gobernado por sus respectivas
-    licencias. El programa <strong>{$a->installername}</strong> es
-    <a href="http://www.opensource.org/docs/definition_plain.html">código abierto</a> y se distribuye
-    bajo licencia <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
+$string['welcomep50'] = 'El uso de todas las aplicaciones en este paquete está gobernado por sus respectivas licencias. El paquete completo<strong>{$a->installername}</strong> es <a href="https://www.opensource.org/docs/definition_plain.html">código abierto</a> y se distribuye bajo licencia <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a>.';
 $string['welcomep60'] = 'Las siguientes páginas le guiarán a través de algunos sencillos pasos para configurar y ajustar <strong>Moodle</strong> en su computadora. Puede utilizar los valores por defecto sugeridos o, de forma opcional, modificarlos para que se ajusten a sus necesidades.';
 $string['welcomep70'] = 'Pulse en el botón "Siguiente" para continuar con la configuración de <strong>Moodle</strong>.';
 $string['wwwroot'] = 'Dirección Web';
diff --git a/install/lang/es_ve/langconfig.php b/install/lang/es_ve/langconfig.php
index 65aaeb6d25c67..12bed67bc5b81 100644
--- a/install/lang/es_ve/langconfig.php
+++ b/install/lang/es_ve/langconfig.php
@@ -31,4 +31,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'es';
-$string['thislanguage'] = 'Español Venezuela';
+$string['thislanguage'] = 'Español - Venezuela';
diff --git a/install/lang/es_wp/langconfig.php b/install/lang/es_wp/langconfig.php
index 9f05ce4297f9c..a0d7bfeac591b 100644
--- a/install/lang/es_wp/langconfig.php
+++ b/install/lang/es_wp/langconfig.php
@@ -31,4 +31,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'es';
+$string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Español para la Empresa';
diff --git a/install/lang/eu/error.php b/install/lang/eu/error.php
index 89f24daabae01..91dda3f407606 100644
--- a/install/lang/eu/error.php
+++ b/install/lang/eu/error.php
@@ -46,7 +46,7 @@
 $string['downloadedfilecheckfailed'] = 'Jaitsitako fitxategiaren egiaztatzeak huts egin du.';
 $string['invalidmd5'] = 'Kontrolerako aldagaia gaizki zegoen - saiatu berriz ere';
 $string['missingrequiredfield'] = 'Beharrezko eremuren bat falta da.';
-$string['remotedownloaderror'] = '<p>Errorea osagaia zure zerbitzarian jaistean, mesedez egiaztatu proxy-ezarpenak, PHP cURL luzapena erabat gomendatzen da.</p>
+$string['remotedownloaderror'] = '<p>Errorea osagaia zure zerbitzarian jaistean, mesedez egiaztatu proxy-ezarpenak, PHP cURL hedapena erabat gomendatzen da.</p>
 <p> <a href="{$a->url}">{$a->url}</a> fitxategia eskuz jaitsi beharko zenuke, zure zerbitzariko "{$a->dest}"-ra kopiatu eta bertan deskonprimatu.</p>';
 $string['wrongdestpath'] = 'Bide desegokia';
 $string['wrongsourcebase'] = 'URL iturriaren oinarri akastuna';
diff --git a/install/lang/eu/install.php b/install/lang/eu/install.php
index f7ba951039234..fc656c2fd5f81 100644
--- a/install/lang/eu/install.php
+++ b/install/lang/eu/install.php
@@ -45,7 +45,7 @@
 $string['dbprefix'] = 'Taulen aurrizkia';
 $string['dirroot'] = 'Moodle direktorioa';
 $string['environmenthead'] = 'Zure ingurunea egiaztatzen...';
-$string['environmentsub2'] = 'Moodle-ko bertsio bakoitzak PHPko gutxieneko bertsioa eta derrigorrez instalatu beharreko PHP luzapen batzuk ditu. Ingurunearen azterketa oso bat egiten da instalazioa eta eguneraketa bakoitza egin aurretik. Mesedez, jarri harremanetan zerbitzariaren kudeatzailearekin ez badakizu bertsio berria edo PHP luzapenak nola instalatu.';
+$string['environmentsub2'] = 'Moodle-ko bertsio bakoitzak PHPko gutxieneko bertsioa eta derrigorrez instalatu beharreko PHP hedapen batzuk ditu. Ingurunearen azterketa oso bat egiten da instalazioa eta eguneraketa bakoitza egin aurretik. Mesedez, jarri harremanetan zerbitzariaren kudeatzailearekin ez badakizu bertsio berria edo PHP hedapenak nola instalatu.';
 $string['errorsinenvironment'] = 'Huts egin du ingurunearen egiaztatzeak!';
 $string['installation'] = 'Instalazioa';
 $string['langdownloaderror'] = 'Zoritxarrez "{$a}" hizkuntza ezin izan da jaitsi. Instalazio-prozesuak ingelesez jarraituko du.';
@@ -76,14 +76,14 @@
 <p>Direktorio honetan web-zerbitzariaren erabiltzaileak irakurtzeko eta idazteko baimena izan beharko ditu (normalean \'www-data\', \'nobody\', edo \'apache\').</p>
 <p>Ez litzateke web bidez eskuragarri egon beharko.</p>
 <p>Direktorioa existitzen ez bada, instalazioan sortzeko saiakera egingo da.</p>';
-$string['pathssubdirroot'] = '<p>Moodle-ko kodea daukan direktorioaren helbide osoa.</p>';
+$string['pathssubdirroot'] = '<p>Moodle-ko kodea daukan direktorioaren bide osoa.</p>';
 $string['pathssubwwwroot'] = '<p>Moodle eskuragarri egongo den helbide osoa, hau da, erabiltzaileek Moodle-n sartzeko nabigatzaileareko helbide barran idatziko duten helbidea</p>
 <p>Moodle ezin da hainbat helbidetatik eskuragarri egon. Zure gunea hainbat helbidetatik eskuragarri badago errazena aukeratu eta bertara beste helbideetatik behin-betiko berbideraketak konfiguratu itzazu.</p>
 <p>Zure gunea Internetetik eta barne-sare batetik eskuragarri badago (batzuetan Intranet deitutakoa), hemen helbide publikoa erabili ezazu.</p>
 <p>Oraingo helbidea egokia ez bada, mesedez aldatu ezazu URLa zure nabigatzailean eta instalazioa berriz abiatu ezazu.</p>';
 $string['pathsunsecuredataroot'] = 'Dataroot-en kokapena ez da segurua';
 $string['pathswrongadmindir'] = 'Admin direktorioa ez da existitzen';
-$string['phpextension'] = '{$a} PHP luzapena';
+$string['phpextension'] = '{$a} PHP hedapena';
 $string['phpversion'] = 'PHP bertsioa';
 $string['phpversionhelp'] = '<p>Moodle-k PHP 5.6.5 edo 7.1 bertsioetako bat behar du (7.0.x bertsioek muga batzuk dituzte). </p>
 <p>Zure bertsioa: {$a}</p>
@@ -93,10 +93,7 @@
 $string['welcomep30'] = '<strong>{$a->installername}</strong>ren bertsio honek <strong>Moodle</strong>-k
 zure ordenagailuan funtzionatzeko behar diren aplikazioak dauzka, zehazki hurrengoak:';
 $string['welcomep40'] = 'Paketeak ere zera dauka: <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'Paketeko aplikazio guztien erabilpena dagozkien lizentziek
-    arautzen dute. <strong>{$a->installername}</strong> aplikazioak
-    <a href="http://www.opensource.org/docs/definition_plain.html">kode irekia</a> dauka eta
-   <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> lizentziapean banatzen da.';
+$string['welcomep50'] = 'Paketeko aplikazio guztien erabilpena dagozkien lizentziek arautzen dute. <strong>{$a->installername}</strong> aplikazioak <a href="https://www.opensource.org/docs/definition_plain.html">kode irekia</a> dauka eta <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a> lizentziapean banatzen da.';
 $string['welcomep60'] = 'Datozen orriek urrats erraz batzuen bidez gidatuko zaituzte <strong>Moodle</strong> zure ordenagailuan instalatu eta konfiguratzeko. Aholkatzen diren lehenetsitako balioak mantendu edo, nahi izanez gero, alda ditzakezu zure beharrei erantzun diezaieten.';
 $string['welcomep70'] = 'Egin klik "Hurrengoa" botoian <strong>Moodle</strong>ren konfigurazioarekin jarraitzeko.';
 $string['wwwroot'] = 'Web helbidea';
diff --git a/install/lang/fr/install.php b/install/lang/fr/install.php
index dd55efbe1a5a8..6104329f3feea 100644
--- a/install/lang/fr/install.php
+++ b/install/lang/fr/install.php
@@ -44,11 +44,11 @@
 $string['datarootpermission'] = 'Droits d\'accès au dossier de données';
 $string['dbprefix'] = 'Préfixe des tables';
 $string['dirroot'] = 'Dossier Moodle';
-$string['environmenthead'] = 'Vérification de l\'environnement...';
+$string['environmenthead'] = 'Vérification de l\'environnement…';
 $string['environmentsub2'] = 'Chaque version de Moodle nécessite une version minimale de certains composants PHP et des extensions de PHP obligatoires. Une vérification complète de l\'environnement est effectuée avec chaque installation et chaque mise à jour. Veuillez contacter l\'administrateur du serveur si vous ne savez pas comment installer une nouvelle version ou activer des extensions de PHP.';
 $string['errorsinenvironment'] = 'Échec de la vérification de l\'environnement !';
 $string['installation'] = 'Installation';
-$string['langdownloaderror'] = 'La langue {$a} n\'a pas pu être téléchargée. La suite de l\'installation se déroulera en anglais. Vous pourrez télécharger et installer d\'autres langues à la fin de l\'installation';
+$string['langdownloaderror'] = 'La langue « {$a} » n\'a pas pu être téléchargée. La suite de l\'installation se déroulera en anglais. Vous pourrez télécharger et installer d\'autres langues à la fin de l\'installation';
 $string['memorylimithelp'] = '<p>La limite de mémoire de PHP sur votre serveur est actuellement de {$a}.</p>
 <p>Cette valeur trop basse risque de générer des problèmes de manque de mémoire pour Moodle, notamment si vous utilisez beaucoup de modules et/ou si vous avez un grand nombre d\'utilisateurs.</p>
 <p>Il est recommandé de configurer PHP avec une limite de mémoire aussi élevée que possible, par exemple 40 Mo. Vous pouvez obtenir cela de différentes façons :</p>
@@ -85,7 +85,7 @@
 $string['welcomep20'] = 'Vous voyez cette page, car vous avez installé Moodle correctement et lancé le logiciel <b>{$a->packname} {$a->packversion}</b> sur votre ordinateur. Félicitations !';
 $string['welcomep30'] = 'Cette version de <b>{$a->installername}</b> comprend des logiciels qui créent un environnement dans lequel <b>Moodle</b> va fonctionner, à savoir :';
 $string['welcomep40'] = 'Ce paquet contient également <b>Moodle {$a->moodlerelease} ({$a->moodleversion})</b>.';
-$string['welcomep50'] = 'L\'utilisation de tous les logiciels de ce paquet est soumis à l\'acceptation de leurs licences respectives. Le paquet <b>{$a->installername}</b> est un <a href="http://www.opensource.org/docs/definition_plain.html">logiciel libre</a>. Il est distribué sous licence <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
+$string['welcomep50'] = 'L\'utilisation de tous les logiciels de ce paquetage est soumis à l\'acceptation de leurs licences respectives. Le paquetage complet <strong>{$a->installername}</strong> est un <a href="https://www.opensource.org/docs/definition_plain.html">logiciel libre</a>. Il est distribué sous licence <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a>.';
 $string['welcomep60'] = 'Les pages suivantes vous aideront pas à pas à configurer et mettre en place <b>Moodle</b> sur votre ordinateur. Il vous sera possible d\'accepter les réglages par défaut ou, facultativement, de les adapter à vos propres besoins.';
 $string['welcomep70'] = 'Cliquer sur le bouton « Suivant » ci-dessous pour continuer l\'installation de <b>Moodle</b>.';
 $string['wwwroot'] = 'Adresse web';
diff --git a/install/lang/fr_incl/langconfig.php b/install/lang/fr_incl/langconfig.php
new file mode 100644
index 0000000000000..6474c8d415e72
--- /dev/null
+++ b/install/lang/fr_incl/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'fr';
+$string['thislanguage'] = 'Français (écriture inclusive)';
diff --git a/install/lang/fr_wp/langconfig.php b/install/lang/fr_wp/langconfig.php
new file mode 100644
index 0000000000000..7c85fcfcc90a6
--- /dev/null
+++ b/install/lang/fr_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'fr';
+$string['thislanguage'] = 'Français pour Workplace';
diff --git a/install/lang/gl/error.php b/install/lang/gl/error.php
index 2c16045194914..3012c29edf8a7 100644
--- a/install/lang/gl/error.php
+++ b/install/lang/gl/error.php
@@ -34,17 +34,17 @@
 <p>A base de datos especificada non existe e o usuario indicado non ten permiso para crear a base de datos.</p>
 <p>O administrador do sitio debería verificar a configuración da base de datos.</p>';
 $string['cannotcreatelangdir'] = 'Non se pode crear o directorio de idioma';
-$string['cannotcreatetempdir'] = 'Non se pode crear un directorio temporal';
-$string['cannotdownloadcomponents'] = 'Non foi posíbel descargar compoñentes';
-$string['cannotdownloadzipfile'] = 'Non foi posíbel descargar o ficheiro ZIP';
-$string['cannotfindcomponent'] = 'Non foi posíbel atopar o compoñente';
+$string['cannotcreatetempdir'] = 'Non é posíbel crear un directorio temporal';
+$string['cannotdownloadcomponents'] = 'Non é posíbel descargar compoñentes';
+$string['cannotdownloadzipfile'] = 'Non é posíbel descargar o arquivo ZIP';
+$string['cannotfindcomponent'] = 'Non é posíbel atopar o compoñente';
 $string['cannotsavemd5file'] = 'Non é posíbel gardar o ficheiro md5';
 $string['cannotsavezipfile'] = 'Non é posíbel gardar o arquivo ZIP';
 $string['cannotunzipfile'] = 'Non é posíbel descomprimir o ficheiro';
 $string['componentisuptodate'] = 'O compoñente está actualizado';
 $string['dmlexceptiononinstall'] = '<p>Produciuse un erro na base de datos [{$a->errorcode}].<br />{$a->debuginfo}</p>';
 $string['downloadedfilecheckfailed'] = 'A comprobación do ficheiro descargado non foi satisfactoria';
-$string['invalidmd5'] = 'md5 non válido';
+$string['invalidmd5'] = 'A variábel de verificación non é correcta, ténteo de novo';
 $string['missingrequiredfield'] = 'Falta algún campo obrigatorio';
 $string['remotedownloaderror'] = '<p>Fallo a descarga do compoñente cara o seu servidor. Recomendase encarecidamente que verifiqoe os axustes do proxy, extensión PHP cURL.</p>
 <p>Debe descargar o ficheiro <a href="{$a->url}">{$a->url}</a> manualmente, copialo en «{$a->dest}» no seu servidor e descomprimilo alí.</p>';
diff --git a/install/lang/gl/install.php b/install/lang/gl/install.php
index 117e7b691dd58..a4807e650152a 100644
--- a/install/lang/gl/install.php
+++ b/install/lang/gl/install.php
@@ -33,7 +33,7 @@
 $string['admindirname'] = 'Directorio Admin';
 $string['availablelangs'] = 'Lista de idiomas dispoñíbeis';
 $string['chooselanguagehead'] = 'Escolla un idioma';
-$string['chooselanguagesub'] = 'Escolla un idioma para o proceso de instalación. Este idioma empregarase tamén como idioma predeterminado do sitio, se ben pode cambiarse máis adiante.';
+$string['chooselanguagesub'] = 'Escolla un idioma para o proceso de instalación. Este idioma empregarase tamén como idioma predeterminado do sitio, malia que pode cambiarse máis adiante.';
 $string['clialreadyconfigured'] = 'Xa existe o ficheiro config.php. Empregue admin/cli/install_database.php se quere actualizar o seu sitio web.';
 $string['clialreadyinstalled'] = 'Xa existe o ficheiro config.php. Empregue admin/cli/upgrade.php se quere actualizar o seu sitio web.';
 $string['cliinstallheader'] = 'Programa de instalación de Moodle en liña de ordes {$a}';
@@ -46,7 +46,7 @@
 $string['dirroot'] = 'Directorio de Moodle';
 $string['environmenthead'] = 'Comprobando o seu entorno ...';
 $string['environmentsub2'] = 'Cada versión de Moodle ten algún requisito mínimo da versión de PHP e un número obrigatorio de extensións de PHP.
-Antes de cada instalación ou actualización faise unha comprobación completa do entorno . Póñase en contacto co administrador do servidor se non sabe como instalar a nova versión ou activar as extensións PHP.';
+Antes de cada instalación ou actualización faise unha comprobación completa do entorno. Póñase en contacto co administrador do servidor se non sabe como instalar a nova versión ou activar as extensións PHP.';
 $string['errorsinenvironment'] = 'A comprobación do entorno no foi satisfactoria!';
 $string['installation'] = 'Instalación';
 $string['langdownloaderror'] = 'Non foi posíbel descargar o idioma «{$a}». O proceso de instalación continuará en inglés.';
@@ -70,29 +70,29 @@
     (poderá ver os erros cando se miran as páxinas) de modo que terá que eliminar o ficheiro .htaccess.</p></li>
 </ol>';
 $string['paths'] = 'Rutas';
-$string['pathserrcreatedataroot'] = 'O directorio de datos ({$a->dataroot}) non puido ser creado polo instalador.';
+$string['pathserrcreatedataroot'] = 'O instalador non pode crear o directorio de datos ({$a->dataroot}).';
 $string['pathshead'] = 'Confirme as rutas';
 $string['pathsrodataroot'] = 'O directorio dataroot non ten permisos de escritura.';
 $string['pathsroparentdataroot'] = 'O directorio principal ({$a->parent}) non ten permisos de escritura. O instalador non pode crear o directorio de datos ({$a->dataroot}).';
 $string['pathssubadmindir'] = 'Moi poucos enderezos web empregan /admin como URL especial para
 permitirlle acceder a un panel de control ou semellante. Desafortunadamente, isto entra en conflito coa localización estándar das páxinas de administración de Moodle. Vostede pode corrixir isto
 renomeando o directorio admin na súa instalación, e poñendo aquí ese novo nome.  Por exemplo: <em>moodleadmin</em>. Iso corrixirá as ligazóns admin en Moodle.';
-$string['pathssubdataroot'] = 'Necesitase un lugar no que Moodle poida gardar os ficheiros enviados. Este directorio debe ser lexíbel E ESCRIBÍBEL polo usuario do servidor web
-(normalmente «nobody», «apache», «www-data»), mais non debería ser accesíbel directamente desde o web. Se non existe o instalador tentará crealo.';
+$string['pathssubdataroot'] = '<p>Un directorio onde Moodle almacenará todo o contido de ficheiros enviados polos usuarios.</p>
+<p>Este directorio debería ser lexible e escribíbel polo usuario do servidor web (normalmente «www-data«» «ninguén» ou «apache»).</p>
+<p> Non debe ser accesíbel directamente na web. </p>
+<p> Se o directorio non existe actualmente, o proceso de instalación tentará crealo. </p>';
 $string['pathssubdirroot'] = 'Ruta completa do directorio de instalación de Moodle.';
-$string['pathssubwwwroot'] = 'Enderezo web completo para acceder a Moodle.
-Non é posíbel acceder a Moodle empregando enderezos múltiples.
-Se o seu sitio ten varios enderezos públicos debe configurar encamiñamentos permanentes en todos eles, agás neste.
-Se o seu sitio web é accesíbel tanto desde unha Intranet como desde Internet, escriba aquí o enderezo público e configure o DNS para que os usuarios da Intranet poidan empregar tamén o enderezo público.
-Se o enderezo non é correcto, cambie o URL no seu navegador para reiniciar a instalación cun valor diferente.';
-$string['pathsunsecuredataroot'] = 'A localización de dataroot non é segura';
+$string['pathssubwwwroot'] = '<p>O enderezo completo onde se accederá a Moodle, é dicir, o enderezo que os usuarios introducirán na barra de enderezos do seu navegador para acceder a Moodle.</p>
+<p>Non é posible acceder a Moodle con varias direccións. Se o seu sitio é accesible a través de varios enderezos, escolla o máis sinxelo e configure unha redirección permanente para cada un dos outros enderezos.</p>
+<p Se o seu sitio é accesible tanto dende a Internet como dende unha rede interna (ás veces chamada Intranet), entón use o enderezo público aquí.</p>
+<p>Se o enderezo actual non é correcto, cambie o URL na barra de enderezos do seu navegador e reinicie a instalación.</p>';
+$string['pathsunsecuredataroot'] = 'A localización de «dataroot» non é segura';
 $string['pathswrongadmindir'] = 'Non existe o directorio Admin';
 $string['phpextension'] = 'Extensión PHP {$a}';
 $string['phpversion'] = 'Versión PHP';
-$string['phpversionhelp'] = '<p>Moodle require polo menos unha das versións de PHP 4.3.0 ou 5.1.0 ( as versións 5.0.x teñen unha serie de problemas coñecidos).</p>
+$string['phpversionhelp'] = '<p>Moodle require polo menos unha das versións de PHP 5.6.5 ou 7.1 (7.0.x ten algunhas limitacións de motor).</p>
 <p>Neste momento está executandose a versión {$a}</p>
-<p>Debe actualizar PHP ou trasladarse a outro servidor cunha versión máis recente de PHP!<br />
-(NO caso de 5.0.x podería tamén reverter cara a versión 4.4.x)</p>';
+<p>Debe actualizar PHP ou trasladarse a outro servidor cunha versión máis recente de PHP.</p>';
 $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
 $string['welcomep20'] = 'Se esta a ver esta páxina é porque puido instalar satisfactoriamente e
     executar o paquete <strong>{$a->packname} {$a->packversion}</strong> no seu computador. Parabéns!';
diff --git a/install/lang/he_kids/langconfig.php b/install/lang/he_kids/langconfig.php
index 361ecf260af74..5fd4b98bae4b1 100644
--- a/install/lang/he_kids/langconfig.php
+++ b/install/lang/he_kids/langconfig.php
@@ -31,4 +31,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'he';
+$string['thisdirection'] = 'rtl';
 $string['thislanguage'] = 'עברית בתי־ספר';
diff --git a/install/lang/he_wp/admin.php b/install/lang/he_wp/admin.php
new file mode 100644
index 0000000000000..bdaed906b5bca
--- /dev/null
+++ b/install/lang/he_wp/admin.php
@@ -0,0 +1,35 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['clianswerno'] = 'ל';
+$string['cliansweryes'] = 'כ';
+$string['cliincorrectvalueretry'] = 'ערך לא תקין, נסו שוב בבקשה';
diff --git a/install/lang/he_wp/langconfig.php b/install/lang/he_wp/langconfig.php
new file mode 100644
index 0000000000000..8bfbc7812fb06
--- /dev/null
+++ b/install/lang/he_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'he';
+$string['thislanguage'] = 'עברית עבור Workplace';
diff --git a/install/lang/hi_wp/langconfig.php b/install/lang/hi_wp/langconfig.php
new file mode 100644
index 0000000000000..a8794458d8a06
--- /dev/null
+++ b/install/lang/hi_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'hi';
+$string['thislanguage'] = 'वर्कप्लेस  के लिए  हिंदी';
diff --git a/install/lang/hr/admin.php b/install/lang/hr/admin.php
index bffba6d78ff2f..1177582bcf923 100644
--- a/install/lang/hr/admin.php
+++ b/install/lang/hr/admin.php
@@ -37,7 +37,7 @@
 $string['clitypevalue'] = 'unesite vrijednost';
 $string['clitypevaluedefault'] = 'unesite vrijednost ili pritisnite Enter za korištenje zadane vrijednosti ({$a})';
 $string['cliunknowoption'] = 'Nepoznate opcije: {$a} Molimo koristite --help opciju.';
-$string['cliyesnoprompt'] = 'unesite y (znači da) ili n (znači ne)';
+$string['cliyesnoprompt'] = 'unesite d (znači da) ili n (znači ne)';
 $string['environmentrequireinstall'] = 'je neophodno instalirati/omogućiti';
 $string['environmentrequireversion'] = 'neophodna inačica je {$a->needed}, a vi trenutačno koristite inačicu {$a->current}';
 $string['upgradekeyset'] = 'Ključ za ažuriranje (ostavite prazno kako ga ne bi zadali)';
diff --git a/install/lang/hr_schools/langconfig.php b/install/lang/hr_schools/langconfig.php
new file mode 100644
index 0000000000000..507610dc8fbf2
--- /dev/null
+++ b/install/lang/hr_schools/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'hr';
+$string['thislanguage'] = 'Croatian schools';
diff --git a/install/lang/hu/install.php b/install/lang/hu/install.php
index 964592c80508e..ea09537a87bd1 100644
--- a/install/lang/hu/install.php
+++ b/install/lang/hu/install.php
@@ -75,7 +75,7 @@
 $string['welcomep20'] = 'Azért látja ezt az oldalt, mert sikeresen telepítette és futtatja az {$a->packname} {$a->packversion} csomagot számítógépén. Gratulálunk!';
 $string['welcomep30'] = 'A {$a->installername} tartalmazza azokat az alkalmazásokat, amelyekkel a Moodle számára kialakítható a működési környezet, azaz:';
 $string['welcomep40'] = 'A csomag tartalmazza a Moodle {$a->moodlerelease} ({$a->moodleversion})-t is.';
-$string['welcomep50'] = 'A csomagban lévő alkalmazások használatára a vonatkozó engedélyek érvényesek. A teljes {$a->installername} csomag <a href="http://www.opensource.org/docs/definition_plain.html">nyílt forráskódú</a>, közreadása pedig a <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>-licenc alapján történik.';
+$string['welcomep50'] = 'A csomagban lévő alkalmazások használatára a vonatkozó engedélyek érvényesek. A teljes {$a->installername} csomag <a href="https://www.opensource.org/docs/definition_plain.html">nyílt forráskódú</a>, közreadása pedig a <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a>-licenc alapján történik.';
 $string['welcomep60'] = 'A következő oldalak segítségével számítógépén egyszerűen telepítheti és beállíthatja a Moodle-t. Elfogadhatja az alapbeállításokat, de igényeinek megfelelően módosíthatja is őket.';
 $string['welcomep70'] = 'Kattintson az alábbi "Következő" gombra és folytassa a Moodle telepítését.';
 $string['wwwroot'] = 'Webcím';
diff --git a/install/lang/id/install.php b/install/lang/id/install.php
index 691d6d4c01713..8ce4af32c92f3 100644
--- a/install/lang/id/install.php
+++ b/install/lang/id/install.php
@@ -33,15 +33,31 @@
 $string['admindirname'] = 'Direktori admin';
 $string['availablelangs'] = 'Paket bahasa yang tersedia';
 $string['chooselanguagehead'] = 'Pilih bahasa';
-$string['chooselanguagesub'] = 'Silakan pilih bahasa untuk instalasi. Bahasa ini juga akan digunakan sebagai bahasa default untuk situs, meskipun mungkin akan diubah kemudian.';
-$string['clialreadyconfigured'] = 'Berkas konfigurasi config.php sudah ada. Silakan gunakan admin /cli/install_database.php untuk menginstal Moodle untuk situs ini.';
-$string['clialreadyinstalled'] = 'File konfigurasi config.php sudah ada. Silakan gunakan admin/cli/install_database.php untuk menginstal Moodle untuk situs ini.';
-$string['databasehost'] = 'Host basis data';
+$string['chooselanguagesub'] = 'Sila pilih bahasa untuk instalasi. Bahasa ini juga akan digunakan sebagai bahasa bawaan untuk situs, meskipun mungkin akan diubah kemudian.';
+$string['clialreadyconfigured'] = 'Berkas konfigurasi config.php sudah ada. Sila gunakan admin /cli/install_database.php untuk memasang Moodle untuk situs ini.';
+$string['clialreadyinstalled'] = 'Berkas konfigurasi config.php sudah ada. Silakan gunakan admin/cli/install_database.php untuk menginstal Moodle untuk situs ini.';
+$string['cliinstallheader'] = 'Program pemasangan baris perintah Moodle {$a}';
+$string['databasehost'] = 'Hos basis data';
 $string['databasename'] = 'Nama basis data';
 $string['databasetypehead'] = 'Pilih pengandar basis data';
 $string['dataroot'] = 'Direktori data';
+$string['datarootpermission'] = 'Izin direktori data';
 $string['dbprefix'] = 'Prefiks tabel';
+$string['dirroot'] = 'Direktori Moodle';
+$string['environmenthead'] = 'Memeriksa sistem Anda ...';
+$string['environmentsub2'] = 'Setiap rilis Moodle memiliki beberapa persyaratan versi PHP minimum dan sejumlah ekstensi PHP wajib. Pemeriksaan komponen sistem akan dilakukan sebelum pemasangan dan peningkatan versi. Silakan hubungi administrator peladen jika Anda tidak tahu cara mamasang versi baru atau mengaktifkan ekstensi PHP.';
+$string['errorsinenvironment'] = 'Pemeriksaan sistem gagal!';
 $string['installation'] = 'Instalasi';
+$string['langdownloaderror'] = 'Sayangnya bahasa "{$a}" tidak dapat diunduh. Proses instalasi akan dilanjutkan dalam bahasa Inggris.';
+$string['memorylimithelp'] = '<p> Batas memori PHP untuk server Anda saat ini diatur ke {$a}. </p> <p> Ini dapat menyebabkan Moodle memiliki masalah memori di kemudian hari, terutama jika Anda memiliki banyak modul yang diaktifkan dan/atau banyak pengguna. </p> <p> Kami menyarankan Anda mengkonfigurasi PHP dengan batas yang lebih tinggi jika memungkinkan, seperti 40M. Ada beberapa cara untuk melakukan ini yang dapat Anda coba: </p>
+<ol> <li> Jika Anda bisa, kompilasi ulang PHP dengan <i> --enable-memory-limit </i>. Ini memungkinkan Moodle untuk mengatur batas memori itu sendiri. </li>
+ <li> Jika Anda memiliki akses ke file php.ini, Anda dapat mengubah pengaturan <b> memory_limit </b> di sana menjadi sekitar 40M. Jika Anda tidak memiliki akses, Anda mungkin dapat meminta administrator untuk melakukan ini untuk Anda. </li>
+<li> Pada beberapa server PHP, Anda dapat membuat file .htaccess di direktori Moodle yang berisi baris ini: <blockquote> <div> php_value memory_limit 40M </div> </blockquote> <p> Namun, pada beberapa server ini tidak diizinkan <b> semua </b> halaman PHP tidak berfungsi (Anda akan melihat kesalahan ketika Anda melihat halaman) sehingga Anda Anda harus menghapus file .htaccess. </p> </li> </ol>';
+$string['paths'] = 'Jalur';
+$string['pathserrcreatedataroot'] = 'Direktori data ({$a->dataroot}) tidak dapat dibuat  oleh installer.';
+$string['pathshead'] = 'Konfirmasi jalur';
+$string['pathsrodataroot'] = 'Direktori data root tidak dapat ditulisi.';
+$string['pathsroparentdataroot'] = 'Direktori induk ({$a->parent}) tidak dapat ditulisi. Direktori data ({$a->dataroot}) tidak dapat dibuat oleh installer.';
 $string['pathssubadmindir'] = 'Beberapa hosting menggunakan / admin sebagai URL khusus untuk Anda mengakses panel kontrol atau sesuatu. Sayangnya ini bertentangan dengan lokasi standar untuk halaman admin Moodle. Anda dapat memperbaikinya dengan mengganti nama direktori admin di instalasi Anda, dan meletakkan nama baru itu di sini. Misalnya: <em> moodleadmin </em>. Ini akan memperbaiki tautan admin di Moodle.';
 $string['pathssubdataroot'] = '<p> Direktori tempat Moodle akan menyimpan semua konten file yang diunggah oleh pengguna. </p> <p> Direktori ini harus dapat dibaca dan ditulis oleh pengguna server web (biasanya \'www-data\', \'nobody\', atau \' apache \'). </p> <p> Itu tidak boleh diakses secara langsung melalui web. </p> <p> Jika direktori saat ini tidak ada, proses instalasi akan berusaha membuatnya. </p>';
 $string['pathssubdirroot'] = '<p> Jalur lengkap ke direktori yang berisi kode Moodle. </p>';
@@ -56,6 +72,6 @@
 $string['welcomep30'] = 'Rilis <strong> {$a->installername}</strong> ini mencakup aplikasi untuk menciptakan lingkungan tempat <strong> Moodle </strong> yang akan digunakan, yaitu:';
 $string['welcomep40'] = 'Paket juga termasuk <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
 $string['welcomep50'] = 'Penggunaan semua aplikasi dalam paket ini diatur oleh lisensi masing-masing. Paket <strong>{$a->installername}</strong> lengkap adalah <a href="http://www.opensource.org/docs/definition_plain.html"> sumber terbuka </a> dan didistribusikan di bawah lisensi <a href="http://www.gnu.org/copyleft/gpl.html"> GPL </a>.';
-$string['welcomep60'] = 'Halaman-halaman berikut akan menuntun Anda melalui beberapa langkah yang mudah diikuti untuk mengonfigurasi dan menyiapkan <strong> Moodle </strong> di komputer Anda. Anda dapat menerima pengaturan bawaan atau, secara opsional, mengubahnya sesuai dengan kebutuhan Anda.';
-$string['welcomep70'] = 'Klik tombol "Selanjutnya" di bawah untuk melanjutkan dengan penyiapan <strong> Moodle </strong>.';
+$string['welcomep60'] = 'Halaman berikut akan menuntun Anda melalui beberapa langkah yang mudah diikuti untuk mengonfigurasi dan menyiapkan <strong> Moodle </strong> di komputer Anda. Anda dapat menerima pengaturan bawaan atau, secara opsional, mengubahnya sesuai dengan kebutuhan Anda.';
+$string['welcomep70'] = 'Klik tombol "Selanjutnya" di bawah untuk melanjutkan instalasi <strong> Moodle </strong>.';
 $string['wwwroot'] = 'Alamat web';
diff --git a/install/lang/ja/install.php b/install/lang/ja/install.php
index a53560434a703..fb4dcf94a6eb5 100644
--- a/install/lang/ja/install.php
+++ b/install/lang/ja/install.php
@@ -57,7 +57,7 @@
 <ol>
 <li>あなたがリコンパイル可能な場合、PHPを<i>--enable-memory-limit</i>オプションでコンパイルしてください。これにより、Moodle自身がメモリ制限を設定することが可能になります。</li>
 <li>あなたがphp.iniファイルにアクセスできる場合、<b>memory_limit</b>設定を40Mのように変更することができます。php.iniファイルにアクセスできない場合、管理者に変更を依頼してください。</li>
-<li>いくつかのPHPサーバでは下記の行を含む.htaccessファイルをMoodleディレクトリに作成することができます:
+<li>いくつかのPHPサーバでは以下の行を含む.htaccessファイルをMoodleディレクトリに作成することができます:
 <blockquote><div>php_value memory_limit 40M</div></blockquote>
 <p>しかし、この設定が<b>すべての</b>PHPページの動作を妨げる場合もあります。ページ閲覧中にエラーが表示される場合、.htaccessファイルを削除してください。</p></li>
 </ol>';
@@ -91,7 +91,7 @@
 $string['welcomep20'] = 'インストールが正常に完了して、あなたのコンピュータで <strong>{$a->packname} {$a->packversion}</strong> パッケージが起動されたため、このページが表示されています。おめでとうございます!';
 $string['welcomep30'] = 'このリリース <strong>{$a->installername}</strong> には<strong>Moodle</strong>で環境を作成するアプリケーションが含まれています。すなわち:';
 $string['welcomep40'] = 'パッケージには <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong> も含まれています。';
-$string['welcomep50'] = 'このパッケージ内のすべてのアプリケーションの使用は個別のライセンスによって規定されています。全体の<strong>{$a->installername}</strong>パッケージは<a href="http://www.opensource.org/docs/definition_plain.html">オープンソース</a>であり、<a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>ライセンスの下で配布されています。';
+$string['welcomep50'] = 'このパッケージ内のすべてのアプリケーションの使用は個別のライセンスによって規定されています。全体の<strong>{$a->installername}</strong>パッケージは<a href="https://www.opensource.org/docs/definition_plain.html">オープンソース</a>であり、<a href="https://www.gnu.org/copyleft/gpl.html">GPL</a>ライセンスの下で配布されています。';
 $string['welcomep60'] = '次からのページはあなたのコンピュータに<strong>Moodle</strong>を簡単に設定およびセットアップする手順にしたがって進みます。あなたはデフォルトの設定を使用することも、必要に応じて任意で設定を変更することもできます。';
 $string['welcomep70'] = '<strong>Moodle</strong>のセットアップを続けるには「次へ」ボタンをクリックしてください。';
 $string['wwwroot'] = 'ウェブアドレス';
diff --git a/install/lang/ka/install.php b/install/lang/ka/install.php
index 3ffbdac6f17d0..bb8a68b84efd8 100644
--- a/install/lang/ka/install.php
+++ b/install/lang/ka/install.php
@@ -32,6 +32,7 @@
 
 $string['admindirname'] = 'ადმინისტრატორის დირექტორია';
 $string['availablelangs'] = 'ხელმისაწვდომი ენის პაკეტები';
+$string['chooselanguagehead'] = 'აირჩიეთ ენა';
 $string['dataroot'] = 'მონაცემტა დირექტორია';
 $string['dbprefix'] = 'ცხრილების პრეფიქსი';
 $string['dirroot'] = 'Moodle-ის დირექტორია';
diff --git a/install/lang/km/admin.php b/install/lang/km/admin.php
index 6b5b2408481a1..71c6d8f6ebb66 100644
--- a/install/lang/km/admin.php
+++ b/install/lang/km/admin.php
@@ -30,5 +30,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['clianswerno'] = 'ទេ';
 $string['environmentrequireinstall'] = 'ត្រូវតែបានដំឡើង និងអនុញ្ញាត';
 $string['environmentrequireversion'] = 'ត្រូវការកំណែ {$a->needed} ហើយអ្នកកំពុងរត់ {$a->current}';
diff --git a/install/lang/km/error.php b/install/lang/km/error.php
index 114fcfe083e2c..c39229547588d 100644
--- a/install/lang/km/error.php
+++ b/install/lang/km/error.php
@@ -41,7 +41,7 @@
 $string['componentisuptodate'] = 'សមាសភាគគឺទាន់សម័យ ។';
 $string['downloadedfilecheckfailed'] = 'បានបរាជ័យក្នុងការពិនិត្យឯកសារដែលបានទាញយក ។';
 $string['invalidmd5'] = 'md5 មិនត្រឹមត្រូវ';
-$string['missingrequiredfield'] = 'បាត់វាលដែលត្រូវការមួយចំនួន';
+$string['missingrequiredfield'] = 'បាត់ប្រអប់ទិន្នន័យដែលត្រូវទាមទារមួយចំនួន';
 $string['remotedownloaderror'] = 'បរាជ័យក្នុងការទាញយកសមាសភាគទៅម៉ាស៊ីនបម្រើរបស់អ្នក សូមផ្ទៀងផ្ទាត់ប្រូកស៊ី ផ្នែកបន្ថែម PHP cURL ត្រូវបានផ្ដល់អនុសាសន៍ ។<br /><br />អ្នកត្រូវតែទាញយកឯកសារ <a href="{$a->url}">{$a->url}</a> ដោយដៃ ចម្លងវាទៅ "{$a->dest}" ក្នុងម៉ាស៊ីនបម្រើរបស់អ្នក និងពន្លាវានៅទីនោះ ។';
 $string['wrongdestpath'] = 'ផ្លូវទិសដៅមិនត្រឹមត្រូវ ។';
 $string['wrongsourcebase'] = 'មូលដ្ឋាន URL ប្រភពមិនត្រឹមត្រូវ ។';
diff --git a/install/lang/my/langconfig.php b/install/lang/my/langconfig.php
index 768a9c95cb5b7..af3818c8cd78e 100644
--- a/install/lang/my/langconfig.php
+++ b/install/lang/my/langconfig.php
@@ -30,4 +30,4 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['thislanguage'] = 'myanma bhasa';
+$string['thislanguage'] = 'ဗမာစာ';
diff --git a/install/lang/nl/install.php b/install/lang/nl/install.php
index 623e935c200e2..27bc4115ff228 100644
--- a/install/lang/nl/install.php
+++ b/install/lang/nl/install.php
@@ -88,7 +88,7 @@
 $string['welcomep30'] = 'Deze uitgave van <strong>{$a->installername}</strong> bevat de software die nodig is om een omgeving te creëren waarin <strong>Moodle</strong> zal werken, namelijk:';
 $string['welcomep40'] = 'Dit pakket bevat ook <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
 $string['welcomep50'] = 'Het gebruik van alle programma\'s in dit pakket wordt geregeld door hun respectievelijke licenties. Het complete <strong>{$a->installername}</strong> pakket is
-<a href="http://www.opensource.org/docs/definition_plain.html">open source</a> en wordt verdeeld onder de <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> licentie.';
+<a href="https://www.opensource.org/docs/definition_plain.html">open source</a> en wordt verdeeld onder de <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a> licentie.';
 $string['welcomep60'] = 'De volgende pagina\'s leiden je door een aantal makkelijk te volgen stappen om <strong>Moodle</strong> te installeren op je computer. Je kunt de standaardinstellingen overnemen of, optioneel, ze aanpassen aan je noden.';
 $string['welcomep70'] = 'Klik op de "volgende"-knop om verder te gaan met de installatie van <strong>Moodle</strong>';
 $string['wwwroot'] = 'Web adres';
diff --git a/course/publish/lib.php b/install/lang/om/langconfig.php
similarity index 57%
rename from course/publish/lib.php
rename to install/lang/om/langconfig.php
index 72330f6fe23ad..58f2c8d7466fe 100644
--- a/course/publish/lib.php
+++ b/install/lang/om/langconfig.php
@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -14,4 +15,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
 defined('MOODLE_INTERNAL') || die();
+
+$string['thislanguage'] = 'Afaan Oromoo';
diff --git a/install/lang/pl/admin.php b/install/lang/pl/admin.php
index c87bb8691a6d4..9815b4ea171c9 100644
--- a/install/lang/pl/admin.php
+++ b/install/lang/pl/admin.php
@@ -40,6 +40,6 @@
   {$a}
 Proszę użyć pomocy.';
 $string['cliyesnoprompt'] = 'wpisz y (czyli tak) lub n (czyli nie)';
-$string['environmentrequireinstall'] = 'jest niezbędnę, żeby było zainstalowane/włączone';
+$string['environmentrequireinstall'] = 'jest niezbędne, aby było zainstalowane i włączone';
 $string['environmentrequireversion'] = 'wersja {$a->needed} jest niezbędna a ty używasz wersji {$a->current}';
 $string['upgradekeyset'] = 'Zaktualizuj klucz (pozostaw puste jeśli nie jest to skonfigurowane)';
diff --git a/install/lang/pt/install.php b/install/lang/pt/install.php
index 4ff411011fe4e..61f701b9fa888 100644
--- a/install/lang/pt/install.php
+++ b/install/lang/pt/install.php
@@ -61,7 +61,7 @@
 <p>Não deve ser diretamente acessível através da web.</p>
 <p> Se a diretoria não existir atualmente, o processo de instalação tentará criá-la.</p>';
 $string['pathssubdirroot'] = 'Caminho completo para a diretoria que contém o código Moodle.';
-$string['pathssubwwwroot'] = 'Endereço web completo de acesso ao Moodle. Não é possível aceder ao Moodle usando mais do que um endereço. Se o site tiver mais do que um endereço público, devem ser configurados redirecionamentos permanentes em todos eles, à exceção deste. Se o site pode ser acedido a partir da Internet e de Intranet, então use o endereço público aqui. Se o endereço atual não está correto, altere o endereço indicado na barra de endereço do seu navegador e reinicie a instalação.';
+$string['pathssubwwwroot'] = 'Endereço web completo de acesso ao Moodle. Não é possível aceder ao Moodle usando mais do que um endereço. Se o site tiver mais do que um endereço público, devem ser configurados redirecionamentos permanentes em todos eles, à exceção deste. Se o site pode ser acedido a partir da Internet e de Intranet, use o endereço público aqui. Se o endereço atual não está correto, altere o endereço indicado na barra de endereço do seu navegador e reinicie a instalação.';
 $string['pathsunsecuredataroot'] = 'A localização da pasta de dados não é segura';
 $string['pathswrongadmindir'] = 'A pasta <b>admin</b> não existe';
 $string['phpextension'] = 'Extensão <b>{$a}</b> do PHP';
@@ -72,8 +72,8 @@
 $string['welcomep10'] = '{$a->installername} ({$a->installerversion})';
 $string['welcomep20'] = 'A apresentação desta página confirma a correta instalação e ativação do pacote <strong>{$a->packname} {$a->packversion}</strong> no servidor.';
 $string['welcomep30'] = 'Esta versão do pacote <strong>{$a->installername}</strong> inclui as aplicações necessárias para o correto funcionamento do  <strong>Moodle</strong>, nomeadamente:';
-$string['welcomep40'] = 'Este pacote inclui <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'A utilização de todas as aplicações incluídas neste pacote é limitada pelas respetivas licenças. O pacote completo <strong>{$a->installername}</strong> é <ahref="http://www.opensource.org/docs/definition_plain.html">código aberto</a> e distribuído nos termos da licença <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
+$string['welcomep40'] = 'Este pacote inclui o lançamento <strong>{$a->moodlerelease} do Moodle ({$a->moodleversion})</strong>.';
+$string['welcomep50'] = 'A utilização de todas as aplicações incluídas neste pacote é limitada pelas respetivas licenças. O pacote completo <strong>{$a->installername}</strong> é <ahref="https://www.opensource.org/docs/definition_plain.html">código aberto</a> e é distribuído nos termos da licença <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a>.';
 $string['welcomep60'] = 'As páginas seguintes irão levá-lo através de alguns passos simples para
      configurar e definir o <strong>Moodle</strong> no seu computador. Você pode aceitar as configurações predefinidas ou, opcionalmente, alterá-las para atender às suas próprias necessidades.';
 $string['welcomep70'] = 'Clique no botão "Seguinte" para continuar a configuração do <strong>Moodle</strong>.';
diff --git a/install/lang/ro_wp/admin.php b/install/lang/ro_wp/admin.php
new file mode 100644
index 0000000000000..f6d63293545a7
--- /dev/null
+++ b/install/lang/ro_wp/admin.php
@@ -0,0 +1,37 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['clianswerno'] = 'n';
+$string['cliansweryes'] = 'y';
+$string['cliincorrectvalueretry'] = 'Valoarea nu este corectă, încercați din nou';
+$string['environmentrequireinstall'] = 'trebuie să fie instalat și activat';
+$string['environmentrequireversion'] = 'versiunea {$a->needed} este necesară iar dumneavoastră rulați {$a->current}';
diff --git a/install/lang/ro_wp/langconfig.php b/install/lang/ro_wp/langconfig.php
new file mode 100644
index 0000000000000..0842224b79ef9
--- /dev/null
+++ b/install/lang/ro_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'ro';
+$string['thislanguage'] = 'Workplace în limba română';
diff --git a/install/lang/ro_wp/moodle.php b/install/lang/ro_wp/moodle.php
new file mode 100644
index 0000000000000..8a40f61ddc0a6
--- /dev/null
+++ b/install/lang/ro_wp/moodle.php
@@ -0,0 +1,37 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['language'] = 'Limbă';
+$string['moodlelogo'] = 'Logo Moodle';
+$string['next'] = 'Următoarea';
+$string['previous'] = 'Anterior';
+$string['reload'] = 'Reîncarcă';
diff --git a/install/lang/rw/langconfig.php b/install/lang/rw/langconfig.php
new file mode 100644
index 0000000000000..a214772b2275f
--- /dev/null
+++ b/install/lang/rw/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Kinyarwanda';
diff --git a/install/lang/se/install.php b/install/lang/se/install.php
new file mode 100644
index 0000000000000..4c072b2db77e3
--- /dev/null
+++ b/install/lang/se/install.php
@@ -0,0 +1,39 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['availablelangs'] = 'Giellapáhkat mat leat gávdnamis';
+$string['chooselanguagehead'] = 'Vállje giela';
+$string['chooselanguagesub'] = 'Vállje giela (dušše installašuvdnjii). Don sáhtát válljet neahttabáikki ja geavaheaddji giela šearbmagovas maŋŋelaš.';
+$string['clialreadyconfigured'] = 'Fiila config.php gávdno jo. Geavat admin/cli/install_database.php jus áiggut installeret dán portála.';
+$string['clialreadyinstalled'] = 'Fiila config.php gávdno jo. Geavat admin/cli/install_database.php jus háliidat ođasmahttit Moodle dán portálas.';
+$string['langdownloaderror'] = 'Dađibahábut ii installerejuvvon giellapáhkka "{$a}". Installašuvdnaproseassa joatká eaŋgalsgillii.';
+$string['phpextension'] = '{$a} PHP gilkor';
diff --git a/install/lang/se/moodle.php b/install/lang/se/moodle.php
new file mode 100644
index 0000000000000..7fd6b2d4af20c
--- /dev/null
+++ b/install/lang/se/moodle.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['language'] = 'Giella';
+$string['next'] = 'Boahtte';
diff --git a/install/lang/sl/langconfig.php b/install/lang/sl/langconfig.php
index 7a7b99f061c95..9e0be7b06cc70 100644
--- a/install/lang/sl/langconfig.php
+++ b/install/lang/sl/langconfig.php
@@ -30,5 +30,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+$string['parentlanguage'] = '';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Sloven&#353;&#269;ina';
+$string['thislanguage'] = 'Slovenščina';
diff --git a/install/lang/sr_cr/install.php b/install/lang/sr_cr/install.php
index 6ee89b7fa237b..c98d2ece9439c 100644
--- a/install/lang/sr_cr/install.php
+++ b/install/lang/sr_cr/install.php
@@ -87,7 +87,7 @@
 $string['welcomep20'] = 'Ову страницу видите зато што сте успешно инсталирали и покренули <strong>{$a->packname} {$a->packversion}</strong> пакет на свом серверу. Честитамо!';
 $string['welcomep30'] = 'Ово издање <strong>{$a->installername}</strong> укључује апликације за креирање окружења у којем ће <strong>Moodle</strong> успешно функционисати, конкретно:';
 $string['welcomep40'] = 'Овај пакет обухвата и <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'Коришћење свих апликација овог пакета је уређено њиховим лиценцама. Комплетан<strong>{$a->installername}</strong> пакет је <a href="http://www.opensource.org/docs/definition_plain.html">отвореног кода</a> и дистрибуира се под <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> лиценцом.';
+$string['welcomep50'] = 'Коришћење свих апликација овог пакета је уређено њиховим лиценцама. Комплетан<strong>{$a->installername}</strong> пакет је <a href="https://www.opensource.org/docs/definition_plain.html">отвореног кода</a> и дистрибуира се под <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a> лиценцом.';
 $string['welcomep60'] = 'Наредне странице ће вас провести кроз неколико једноставних корака током којих ћете конфигурисати и подесити <strong>Moodle</strong> на свом рачунару. Можете прихватити подразумевана подешавања или их, опционо, прилагодити сопственим потребама.';
 $string['welcomep70'] = 'Кликните на дугме за наставак да бисте даље подешавали <strong>Moodle</strong>.';
 $string['wwwroot'] = 'Веб адреса';
diff --git a/install/lang/sr_lt/install.php b/install/lang/sr_lt/install.php
index c9a03ee5a7ed1..adb8e4ed2a4ef 100644
--- a/install/lang/sr_lt/install.php
+++ b/install/lang/sr_lt/install.php
@@ -84,7 +84,7 @@
 $string['welcomep20'] = 'Ovu stranicu vidite zato što ste uspešno instalirali i pokrenuli <strong>{$a->packname} {$a->packversion}</strong> paket na svom serveru. Čestitamo!';
 $string['welcomep30'] = 'Ovo izdanje <strong>{$a->installername}</strong> uključuje aplikacije za kreiranje okruženja u kojem će <strong>Moodle</strong> uspešno funkcionisati, konkretno:';
 $string['welcomep40'] = 'Ovaj paket obuhvata i <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'Korišćenje svih aplikacija ovog paketa je uređeno njihovim licencama. Kompletan<strong>{$a->installername}</strong> paket je <a href="http://www.opensource.org/docs/definition_plain.html">otvorenog koda</a> i distribuira se pod <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> licencom.';
+$string['welcomep50'] = 'Korišćenje svih aplikacija ovog paketa je uređeno njihovim licencama. Kompletan<strong>{$a->installername}</strong> paket je <a href="https://www.opensource.org/docs/definition_plain.html">otvorenog koda</a> i distribuira se pod <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a> licencom.';
 $string['welcomep60'] = 'Naredne stranice će vas provesti kroz nekoliko jednostavnih koraka tokom kojih ćete konfigurisati i podesiti <strong>Moodle</strong> na svom računaru. Možete prihvatiti podrazumevana podešavanja ili ih, opciono, prilagoditi sopstvenim potrebama.';
 $string['welcomep70'] = 'Kliknite na dugme za nastavak da biste dalje podešavali <strong>Moodle</strong>.';
 $string['wwwroot'] = 'Web adresa';
diff --git a/install/lang/ta_lk/moodle.php b/install/lang/ta_lk/moodle.php
index de7a1f08e6068..21bd28a4b07aa 100644
--- a/install/lang/ta_lk/moodle.php
+++ b/install/lang/ta_lk/moodle.php
@@ -31,6 +31,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['language'] = 'மொழி';
+$string['moodlelogo'] = 'Moodle சின்னம்';
 $string['next'] = 'அடுத்தது';
 $string['previous'] = 'முன்னைய';
 $string['reload'] = 'மீள ஏற்றுக';
diff --git a/install/lang/tpi/langconfig.php b/install/lang/tpi/langconfig.php
new file mode 100644
index 0000000000000..d97f94c2df73a
--- /dev/null
+++ b/install/lang/tpi/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['thisdirection'] = 'ltr';
+$string['thislanguage'] = 'Tok Pisin';
diff --git a/install/lang/zh_cn_wp/langconfig.php b/install/lang/zh_cn_wp/langconfig.php
new file mode 100644
index 0000000000000..1b91c7624e4d2
--- /dev/null
+++ b/install/lang/zh_cn_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'zh_cn';
+$string['thislanguage'] = 'Workplace 简体中文版';
diff --git a/install/lang/zh_tw_wp/langconfig.php b/install/lang/zh_tw_wp/langconfig.php
new file mode 100644
index 0000000000000..a00ce56d42125
--- /dev/null
+++ b/install/lang/zh_tw_wp/langconfig.php
@@ -0,0 +1,34 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Automatically generated strings for Moodle installer
+ *
+ * Do not edit this file manually! It contains just a subset of strings
+ * needed during the very first steps of installation. This file was
+ * generated automatically by export-installer.php (which is part of AMOS
+ * {@link http://docs.moodle.org/dev/Languages/AMOS}) using the
+ * list of strings defined in /install/stringnames.txt.
+ *
+ * @package   installer
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$string['parentlanguage'] = 'zh_tw';
+$string['thislanguage'] = 'Workplace 繁體中文版';
diff --git a/iplookup/tests/fixtures/GeoIP2-City-Test.mmdb b/iplookup/tests/fixtures/GeoIP2-City-Test.mmdb
new file mode 100644
index 0000000000000..c304794f62ff1
Binary files /dev/null and b/iplookup/tests/fixtures/GeoIP2-City-Test.mmdb differ
diff --git a/iplookup/tests/fixtures/README.txt b/iplookup/tests/fixtures/README.txt
new file mode 100644
index 0000000000000..f12faa2ac0022
--- /dev/null
+++ b/iplookup/tests/fixtures/README.txt
@@ -0,0 +1,10 @@
+GeoIP2-City-Test.mmdb:
+    Copyright: maxmind (github.com/maxmind)
+
+    https://github.com/maxmind/MaxMind-DB/blob/master/test-data/GeoIP2-City-Test.mmdb
+
+    Licence: Creative Commons Attribution-ShareAlike 3.0 Unported License
+
+    http://creativecommons.org/licenses/by-sa/3.0/
+
+    No changes have been made to this file.
diff --git a/iplookup/tests/geoip_test.php b/iplookup/tests/geoip_test.php
index b65be59962198..d553bd8938ab6 100644
--- a/iplookup/tests/geoip_test.php
+++ b/iplookup/tests/geoip_test.php
@@ -36,56 +36,15 @@
  */
 class core_iplookup_geoip_testcase extends advanced_testcase {
     public function setUp() {
-        if (!PHPUNIT_LONGTEST) {
-            // These tests are intensive and required downloads.
-            $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
-        }
-
         $this->resetAfterTest();
     }
 
-
     /**
      * Setup the GeoIP2File system.
      */
     public function setup_geoip2file() {
         global $CFG;
-
-        // Store the file somewhere where it won't be wiped out..
-        $gzfile = "$CFG->dataroot/phpunit/geoip/GeoLite2-City.mmdb.gz";
-        check_dir_exists(dirname($gzfile));
-        if (file_exists($gzfile) and (filemtime($gzfile) < time() - 60*60*24*30)) {
-            // Delete file if older than 1 month.
-            unlink($gzfile);
-        }
-
-        if (!file_exists($gzfile)) {
-            download_file_content('http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz',
-                null, null, false, 300, 20, false, $gzfile);
-        }
-
-        $this->assertTrue(file_exists($gzfile));
-
-        $geoipfile = str_replace('.gz', '', $gzfile);
-
-        // Open our files (in binary mode).
-        $file = gzopen($gzfile, 'rb');
-        $geoipfilebuf = fopen($geoipfile, 'wb');
-
-        // Keep repeating until the end of the input file.
-        while (!gzeof($file)) {
-            // Read buffer-size bytes.
-            // Both fwrite and gzread and binary-safe.
-            fwrite($geoipfilebuf, gzread($file, 4096));
-        }
-
-        // Files are done, close files.
-        fclose($geoipfilebuf);
-        gzclose($file);
-
-        $this->assertTrue(file_exists($geoipfile));
-
-        $CFG->geoip2file = $geoipfile;
+        $CFG->geoip2file = "$CFG->dirroot/iplookup/tests/fixtures/GeoIP2-City-Test.mmdb";
     }
 
     /**
@@ -121,9 +80,8 @@ public function test_ip($ip) {
      */
     public function ip_provider() {
         return [
-            'IPv4: Sample suggested by maxmind themselves' => ['24.24.24.24'],
-            'IPv4: github.com' => ['192.30.255.112'],
-            'IPv6: UCLA' => ['2607:f010:3fe:fff1::ff:fe00:25'],
+            'IPv4: IPV4 test' => ['81.2.69.142'],
+            'IPv6: IPV6 test' => ['2001:252:1::1:1:1'],
         ];
     }
 }
diff --git a/lang/en/access.php b/lang/en/access.php
index 6fe361641fe0c..ae8e241fb74a7 100644
--- a/lang/en/access.php
+++ b/lang/en/access.php
@@ -29,6 +29,8 @@
 $string['activitynext'] = 'Next activity';
 $string['activityprev'] = 'Previous activity';
 $string['breadcrumb'] = 'Navigation bar';
+$string['eventcontextlocked'] = 'Context frozen';
+$string['eventcontextunlocked'] = 'Context unfrozen';
 $string['hideblocka'] = 'Hide {$a} block';
 $string['showblocka'] = 'Show {$a} block';
 $string['sitemap'] = 'Site map';
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 26c89616de33b..f360e4f815406 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -112,8 +112,8 @@
 $string['cannotdeletemodfilter'] = 'You cannot uninstall the \'{$a->filter}\' because it is part of the \'{$a->module}\' module.';
 $string['cannotuninstall'] = '{$a} can not be uninstalled.';
 $string['categoryemail'] = 'Email';
-$string['cfgwwwrootslashwarning'] = 'You have defined $CFG->wwwroot incorrectly in your config.php file. You have included a \'/\' character at the end. Please remove it, or you will experience strange bugs like <a href=\'http://tracker.moodle.org/browse/MDL-11061\'>MDL-11061</a>.';
-$string['cfgwwwrootwarning'] = 'You have defined $CFG->wwwroot incorrectly in your config.php file. It does not match the URL you are using to access this page. Please correct it, or you will experience strange bugs like <a href=\'http://tracker.moodle.org/browse/MDL-11061\'>MDL-11061</a>.';
+$string['cfgwwwrootslashwarning'] = '$CFG->wwwroot is defined incorrectly in the config.php file. It includes a \'/\' character at the end which must be removed.';
+$string['cfgwwwrootwarning'] = '$CFG->wwwroot is defined incorrectly in the config.php file. It should match the URL you are using to access this page.';
 $string['cleanup'] = 'Cleanup';
 $string['clianswerno'] = 'n';
 $string['cliansweryes'] = 'y';
@@ -181,28 +181,26 @@
 $string['configcoursesperpage'] = 'Enter the number of courses to be displayed per page in a course listing.';
 $string['configcourseswithsummarieslimit'] = 'The maximum number of courses to display in a course listing including summaries before falling back to a simpler listing.';
 $string['configcronclionly'] = 'Running the cron from a web browser can expose privileged information to anonymous users. Thus it is recommended to only run the cron from the command line or set a cron password for remote access.';
-$string['configcronremotepassword'] = 'This means that the cron.php script cannot be run from a web browser without supplying the password using the following form of URL:<pre>
-    http://site.example.com/admin/cron.php?password=opensesame
-</pre>If this is left empty, no password is required.';
+$string['configcronremotepassword'] = 'This means that the cron.php script cannot be run from a web browser without supplying the password using the following form of URL:<pre> https://site.example.com/admin/cron.php?password=opensesame </pre>If this is left empty, no password is required.';
 $string['configcurlcache'] = 'Time-to-live for cURL cache, in seconds.';
 $string['configcustommenuitems'] = 'You can configure a custom menu here to be shown by themes. Each line consists of some menu text, a link URL (optional), a tooltip title (optional) and a language code or comma-separated list of codes (optional, for displaying the line to users of the specified language only), separated by pipe characters. Lines starting with a hyphen will appear as menu items in the previous top level menu, and dividers can be used by adding a line of one or more # characters where desired. For example:
 <pre>
 Moodle community|https://moodle.org
 -Moodle free support|https://moodle.org/support
--Moodle Docs|http://docs.moodle.org|Moodle Docs
--German Moodle Docs|http://docs.moodle.org/de|Documentation in German|de
+-Moodle Docs|https://docs.moodle.org|Moodle Docs
+-German Moodle Docs|https://docs.moodle.org/de|Documentation in German|de
 -###
 -Moodle development|https://moodle.org/development
-Moodle.com|http://moodle.com/
+Moodle.com|https://moodle.com/
 </pre>';
 $string['configcustomusermenuitems'] = 'You can configure the contents of the user menu (with the exception of the log out link, which is automatically added). Each line is separated by pipe characters and consists of 1) a string in "langstringname, componentname" form or as plain text, 2) a URL, and 3) an icon either as a pix icon (in the folder pix with the structure [subfoldername]/[iconname], e.g. i/publish) or as a URL. Dividers can be used by adding a line of one or more # characters where desired.';
 $string['configdbsessions'] = 'If enabled, this setting will use the database to store information about current sessions. Note that changing this setting now will log out all current users (including you). If you are using MySQL please make sure that \'max_allowed_packet\' in my.cnf (or my.ini) is at least 4M. Other session drivers can be configured directly in config.php, see config-dist.php for more information. This option disappears if you specify session driver in config.php file.';
 $string['configdebug'] = 'If you turn this on, then PHP\'s error_reporting will be increased so that more warnings are printed.  This is only useful for developers.';
 $string['configdebugdisplay'] = 'Set to on, the error reporting will go to the HTML page. This is practical, but breaks XHTML, JS, cookies and HTTP headers in general. Set to off, it will send the output to your server logs, allowing better debugging. The PHP setting error_log controls which log this goes to.';
 $string['configdebugpageinfo'] = 'Enable if you want page information printed in page footer.';
-$string['configdebugsmtp'] = 'Enable verbose debug information during sending of email messages to SMTP server.';
+$string['configdebugsmtp'] = 'Enable verbose debug information during sending of email messages to SMTP server. For this setting to take effect, the \'Debug messages\' setting must be set to \'Developer\'.';
 $string['configdebugvalidators'] = 'Enable if you want to have links to external validator servers in page footer. You may need to create new user with username <em>w3cvalidator</em>, and enable guest access. These changes may allow unauthorized access to server, do not enable on production sites!';
-$string['configdefaulthomepage'] = 'This determines the home page for logged in users';
+$string['configdefaulthomepage'] = 'This determines the first link in the navigation for logged-in users.';
 $string['configdefaultrequestcategory'] = 'Courses requested by users will be automatically placed in this category.';
 $string['configdefaultrequestedcategory'] = 'Default category to put courses that were requested into, if they\'re approved.';
 $string['configdefaultuserroleid'] = 'All logged in users will be given the capabilities of the role you specify here, at the site level, in ADDITION to any other roles they may have been given.  The default is the Authenticated user role.  Note that this will not conflict with other roles they have unless you prohibit capabilities, it just ensures that all users have capabilities that are not assignable at the course level (eg post blog entries, manage own calendar, etc).';
@@ -229,7 +227,7 @@
 $string['configenablerssfeeds'] = 'If enabled, RSS feeds are generated by various features across the site, such as blogs, forums, database activities and glossaries. Note that RSS feeds also need to be enabled for the particular activity modules.';
 $string['configenablerssfeedsdisabled'] = 'It is not available because RSS feeds are disabled in all the Site. To enable them, go to the Variables settings under Admin Configuration.';
 $string['configenablerssfeedsdisabled2'] = 'RSS feeds are currently disabled at site level. They may be enabled in Advanced features in the Site administration.';
-$string['configenablesafebrowserintegration'] = 'This adds the choice \'Require Safe Exam Browser\' to the \'Browser security\' field on the quiz settings form. See http://www.safeexambrowser.org/ for more information.';
+$string['configenablesafebrowserintegration'] = 'This adds the choice \'Require Safe Exam Browser\' to the \'Browser security\' field on the quiz settings form. See https://www.safeexambrowser.org/ for more information.';
 $string['configenablestats'] = 'If you choose \'yes\' here, Moodle\'s cronjob will process the logs and gather some statistics.  Depending on the amount of traffic on your site, this can take awhile. If you enable this, you will be able to see some interesting graphs and statistics about each of your courses, or on a sitewide basis.';
 $string['configenabletrusttext'] = 'By default Moodle will always thoroughly clean text that comes from users to remove any possible bad scripts, media etc that could be a security risk.  The Trusted Content system is a way of giving particular users that you trust the ability to include these advanced features in their content without interference.  To enable this system, you need to first enable this setting, and then grant the Trusted Content permission to a specific Moodle role.  Texts created or uploaded by such users will be marked as trusted and will not be cleaned before display.';
 $string['configenablewebservices'] = 'Web services enable other systems to log in to this Moodle and perform operations.  For extra security this feature should be disabled unless you are really using it.';
@@ -241,7 +239,7 @@
 $string['configextramemorylimit'] = 'Some scripts like search, backup/restore or cron require more memory. Set higher values for large sites.';
 $string['configfilterall'] = 'Filter all strings, including headings, titles, navigation bar and so on.  This is mostly useful when using the multilang filter, otherwise it will just create extra load on your site for little gain.';
 $string['configfiltermatchoneperpage'] = 'Automatic linking filters will only generate a single link for the first matching text instance found on the complete page. All others are ignored.';
-$string['configfiltermatchonepertext'] = 'Automatic linking filters will only generate a single link for the first matching text instance found in each item of text (e.g., resource, block) on the page. All others are ignored. This setting is ignored if the one per page setting is <i>yes</i>.';
+$string['configfiltermatchonepertext'] = 'Automatic linking filters will only generate a single link for the first matching text instance found in each item of text on the page. All others are ignored. This setting has no effect if \'Filter match once per page\' is enabled.';
 $string['configfilteruploadedfiles'] = 'Process all uploaded HTML and text files with the filters before displaying them, only uploaded HTML files or none at all.';
 $string['configforcelogin'] = 'Normally, the front page of the site and the course listings (but not courses) can be read by people without logging in to the site.  If you want to force people to log in before they do ANYTHING on the site, then you should enable this setting.';
 $string['configforceloginforprofiles'] = 'This setting forces people to log in as a real (non-guest) account before viewing any user\'s profile. If you disabled this setting, you may find that some users post advertising (spam) or other inappropriate content in their profiles, which is then visible to the whole world.';
@@ -252,7 +250,7 @@
 $string['configfullnamedisplay'] = 'This defines how names are shown when they are displayed in full. The default value, "language", leaves it to the string "fullnamedisplay" in the current language pack to decide. Some languages have different name display conventions.
 
 For most mono-lingual sites the most efficient setting is "firstname lastname", but you may choose to hide surnames altogether. Placeholders that can be used are: firstname, lastname, firstnamephonetic, lastnamephonetic, middlename, and alternatename.';
-$string['configgeoipfile'] = 'Location of GeoLite2 City binary data file. This file is not part of Moodle distribution and must be obtained separately from <a href="http://www.maxmind.com/">MaxMind</a>. You can either buy a commercial version or use the free version. Simply download <a href="http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz" >http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz</a> and extract it into "{$a}" directory on your server.';
+$string['configgeoipfile'] = 'Location of GeoLite2 City binary data file. This file is not part of Moodle distribution and must be obtained separately from <a href="https://www.maxmind.com/">MaxMind</a>. You can either buy a commercial version or use the free version. You\'ll need to register to download the City database file, which you can do at <a href="https://dev.maxmind.com/geoip/geoip2/geolite2/" >https://dev.maxmind.com/geoip/geoip2/geolite2/</a>. Once you\'ve registered and downloaded the file, extract it into "{$a}" directory on your server.';
 $string['configgetremoteaddrconf'] = 'If your server is behind a reverse proxy, you can use this setting to specify which HTTP headers can be trusted to contain the remote IP address. The headers are read in order, using the first one that is available.';
 $string['configgradebookroles'] = 'This setting allows you to control who appears on the gradebook.  Users need to have at least one of these roles in a course to be shown in the gradebook for that course.';
 $string['configgradeexport'] = 'Choose which gradebook export formats are your primary methods for exporting grades.  Chosen plugins will then set and use a "last exported" field for every grade.  For example, this might result in exported records being identified as being "new" or "updated".  If you are not sure about this then leave everything unchecked.';
@@ -456,7 +454,7 @@
 $string['defaultcity'] = 'Default city';
 $string['defaultcity_help'] = 'A city entered here will be the default city when creating new user accounts.';
 $string['defaultformatnotset'] = 'Error determining default course format. Please check site settings.';
-$string['defaulthomepage'] = 'Default home page for users';
+$string['defaulthomepage'] = 'Home page for users';
 $string['defaultrequestcategory'] = 'Default category for course requests';
 $string['defaultsettinginfo'] = 'Default: {$a}';
 $string['defaultuserroleid'] = 'Default role for all users';
@@ -520,7 +518,7 @@
 $string['enabled'] = 'Enabled';
 $string['enabledevicedetection'] = 'Enable device detection';
 $string['enableglobalsearch'] = 'Enable global search';
-$string['enableglobalsearch_desc'] = 'If enabled, data will be indexed and syncronised by a scheduled task.';
+$string['enableglobalsearch_desc'] = 'If enabled, data will be indexed and synchronised by a scheduled task.';
 $string['enablegravatar'] = 'Enable Gravatar';
 $string['enablegravatar_help'] = 'When enabled Moodle will attempt to fetch a user profile picture from Gravatar if the user has not uploaded an image.';
 $string['enablemobilewebservice'] = 'Enable web services for mobile devices';
@@ -654,11 +652,11 @@
 $string['ipblocker'] = 'IP blocker';
 $string['ipblockersyntax'] = 'Put every entry on one line. Valid entries are either full IP address (such as <b>192.168.10.1</b>) which matches a single host; or partial address (such as <b>192.168</b>) which matches any address starting with those numbers; or CIDR notation (such as <b>231.54.211.0/20</b>); or a range of IP addresses (such as <b>231.3.56.10-20</b>) where the range applies to the last part of the address. Text domain names (like \'example.com\') are not supported. Blank lines, and text following a "#" character are ignored.';
 $string['iplookup'] = 'IP address lookup';
-$string['iplookupgeoplugin'] = '<a href="http://www.geoplugin.com">geoPlugin</a> service is currently being used to look up geographical information. For more accurate results we recommend installing a local copy of the MaxMind GeoLite database.';
+$string['iplookupgeoplugin'] = 'The <a href="https://www.geoplugin.com">geoPlugin</a> service is currently being used to look up geographical information. For more accurate results we recommend installing a local copy of the MaxMind GeoLite database.';
 $string['iplookupinfo'] = 'By default Moodle uses the free online NetGeo (The Internet Geographic Database) server to lookup location of IP addresses, unfortunately this database is not maintained anymore and may return <em>wildly incorrect</em> data.
 It is recommended to install local copy of free GeoLite2 City database from MaxMind.<br />
 IP address location is displayed on simple map or using Google Maps. Please note that you need to have a Google account and apply for free Google Maps API key to enable interactive maps.';
-$string['iplookupmaxmindnote'] = 'This product includes GeoLite2 data created by MaxMind, available from <a href="http://www.maxmind.com">http://www.maxmind.com</a>.';
+$string['iplookupmaxmindnote'] = 'This product includes GeoLite2 data created by MaxMind, available from <a href="https://www.maxmind.com">https://www.maxmind.com</a>.';
 $string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. It is strongly recommended to migrate your site to HTTPS for increased security and improved integration with other systems.';
 $string['keeptagnamecase'] = 'Keep tag name casing';
 $string['lang'] = 'Default language';
@@ -755,6 +753,7 @@
 $string['maxusersperpage'] = ' Maximum users per page';
 $string['configmaxusersperpage'] = 'Maximum number of users displayed within user selector in course, group, cohort, webservice etc.';
 $string['mbstringrecommended'] = 'Installing the optional MBSTRING library is highly recommended in order to improve site performance, particularly if your site is supporting non-Latin languages.';
+$string['mbstringrequired'] = 'Installing the MBSTRING library is required in order to improve site performance, particularly if your site is supporting non-Latin languages.';
 $string['mediapluginavi'] = 'Enable .avi filter';
 $string['mediapluginflv'] = 'Enable .flv filter';
 $string['mediapluginimg'] = 'Enable auto-embedding of linked images';
@@ -937,7 +936,7 @@
 $string['profilefieldcolumns'] = 'Columns';
 $string['profilefieldispassword'] = 'Is this a password field?';
 $string['profilefieldlink'] = 'Link';
-$string['profilefieldlink_help'] = 'To transform the text into a link, enter a URL containing $$, where $$ will be replaced with the text. For example, to transform a Twitter ID to a link, enter http://twitter.com/$$.';
+$string['profilefieldlink_help'] = 'To transform the text into a link, enter a URL containing $$, where $$ will be replaced with the text. For example, to transform a Twitter ID to a link, enter https://twitter.com/$$.';
 $string['profilefieldlinktarget'] = 'Link target';
 $string['profilefieldmaxlength'] = 'Maximum length';
 $string['profilefieldrows'] = 'Rows';
@@ -1004,21 +1003,24 @@
 $string['recaptchaprivatekey'] = 'ReCAPTCHA secret key';
 $string['recaptchapublickey'] = 'ReCAPTCHA site key';
 $string['register'] = 'Register your site';
-$string['registermoodlenet'] = '<p>We\'d love to stay in touch and provide you with important things for your Moodle site!</p><p>By registering:</p><ul><li>You\'ll be one of the first to find out about important notifications such as security alerts and new Moodle releases.</li><li>You can access and activate mobile push notifications from your Moodle site through our free <a href="https://download.moodle.org/mobile/">Moodle app</a>.</li><li>You are contributing to our <a href="https://moodle.net/stats/">Moodle statistics</a> of the worldwide community, which help us improve Moodle and our community sites.</li><li>If you wish, your site can be included in the <a href="https://moodle.net/sites/">list of registered Moodle sites</a> in your country.</li></ul>';
+$string['registermoodlenet'] = '<p>We\'d love to stay in touch and provide you with important things for your Moodle site!</p><p>By registering:</p><ul><li>You can subscribe to receive notifications of new Moodle releases, security alerts and other important news.</li><li>You can access and activate mobile push notifications from your Moodle site through our free <a href="https://download.moodle.org/mobile/">Moodle app</a>.</li><li>You are contributing to our <a href="https://moodle.net/stats/">Moodle statistics</a> of the worldwide community, which help us improve Moodle and our community sites.</li><li>If you wish, your site can be included in the <a href="https://moodle.net/sites/">list of registered Moodle sites</a> in your country.</li></ul>';
 $string['registermoodleorg'] = 'When you register your site';
 $string['registermoodleorgli1'] = 'You are added to a low-volume mailing list for important notifications such as security alerts and new releases of Moodle.';
 $string['registermoodleorgli2'] = 'Statistics about your site will be added to the {$a} of the worldwide Moodle community.';
 $string['registerwithmoodleorg'] = 'Register your site';
 $string['registration'] = 'Registration';
-$string['registration_help'] = 'It is recommended that you register your site in order to receive security alerts and access to Moodle.net, our course sharing platform.';
+$string['registration_help'] = 'By registering:
+
+* You will receive security alerts
+* You can activate mobile app push notifications from your site
+* You are contributing to our Moodle statistics of the worldwide community';
 $string['registrationwarning'] = 'Your site is not yet registered.';
 $string['registrationwarningcontactadmin'] = 'Your site is not yet registered. Please notify your administrator.';
 $string['releasenoteslink'] = 'For information about this version of Moodle, please see the online <a target="_blank" href="{$a}">Release Notes</a>';
 $string['rememberusername'] = 'Remember username';
 $string['rememberusername_desc'] = 'Enable if you want to store permanent cookies with usernames during user login. Permanent cookies may be considered a privacy issue if used without consent.';
 $string['reportsmanage'] = 'Manage reports';
-$string['requiredentrieschanged'] = '<strong>IMPORTANT - PLEASE READ<br/>(This warning message will only be displayed during this upgrade)</strong><br/>Due to a bug fix, the behaviour of database activities using the \'Required entries\' and \'Required entries before viewing settings\' settings will change. A more detailed explanation of the changes can be read on <a href="http://moodle.org/mod/forum/discuss.php?d=110928" target="_blank">the database module forum</a>. The expected behavior of these settings can also be read on <a href="http://docs.moodle.org/en/Adding/editing_a_database#Required_entries" target="_blank">Moodle Docs</a>.
-<br/><br/>This change affects the following databases in your system: (Please save this list now, and after the upgrade, check that these activities still work the way that the teacher intends.)<br/><strong>{$a->text}</strong><br/>';
+$string['requiredentrieschanged'] = 'Note: After upgrading, the setting \'Required entries before viewing\' is now enforced in the following database activities:<br/>{$a->text}<br/>';
 $string['requiremodintro'] = 'Require activity description';
 $string['requiremodintro_desc'] = 'If enabled, users will be forced to enter a description for each activity.';
 $string['requires'] = 'Requires';
@@ -1295,6 +1297,7 @@
 $string['unicoderequired'] = 'It is required that you store all your data in Unicode format (UTF-8). New installations must be performed into databases that have their default character set as Unicode.  If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
 $string['uninstallplugin'] = 'Uninstall';
 $string['unlockaccount'] = 'Unlock account';
+$string['unoconvwarning'] = 'The version of unoconv you have installed is not supported.';
 $string['unsettheme'] = 'Unset theme';
 $string['unsupported'] = 'Unsupported';
 $string['unsupporteddbfileformat'] = 'Your database uses Antelope as the file format. Full UTF-8 support in MySQL and MariaDB requires the Barracuda file format. Please switch to the Barracuda file format. See the documentation <a href="https://docs.moodle.org/en/admin/environment/custom check/mysql full unicode support">MySQL full unicode support</a> for details.';
@@ -1306,6 +1309,7 @@
 $string['unsupportedphpversion71'] = 'PHP version 7.1 is not supported.';
 $string['unsupportedphpversion72'] = 'PHP version 7.2 is not supported.';
 $string['unsupportedphpversion73'] = 'PHP version 7.3 is not supported.';
+$string['unsupportedphpversion74'] = 'PHP version 7.4 is not supported.';
 $string['unsuspenduser'] = 'Activate user account';
 $string['updateaccounts'] = 'Update existing accounts';
 $string['updatecomponent'] = 'Update component';
@@ -1410,9 +1414,8 @@
 // Deprecated since Moodle 3.3.
 $string['loginpasswordautocomplete'] = 'Prevent password autocompletion on login form';
 $string['loginpasswordautocomplete_help'] = 'If enabled, users are not allowed to save their account password in their browser.';
-$string['unoconvwarning'] = 'The version of unoconv you have installed is not supported.';
 // Deprecated since Moodle 3.4
-$string['moodleorghubname'] = 'Moodle.net';
+$string['moodleorghubname'] = 'Moodle';
 $string['hubs'] = 'Hubs';
 $string['configloginhttps'] = 'Turning this on will make Moodle use a secure https connection just for the login page (providing a secure login), and then afterwards revert back to the normal http URL for general speed.  CAUTION: this setting REQUIRES https to be specifically enabled on the web server - if it is not then YOU COULD LOCK YOURSELF OUT OF YOUR SITE.';
 $string['loginhttps'] = 'Use HTTPS for logins';
diff --git a/lang/en/auth.php b/lang/en/auth.php
index 1233c20838d18..4f76b92687dbc 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -51,7 +51,7 @@
 $string['auth_remove_suspend'] = 'Suspend internal';
 $string['auth_remove_user'] = 'Specify what to do with internal user account during mass synchronisation when user was removed from external source. Only suspended users are automatically restored if they reappear in the external source.';
 $string['auth_remove_user_key'] = 'Removed ext user';
-$string['auth_sync_suspended']  = 'When enabled, the suspended attribute will be used to update the local user account\'s suspension status.';
+$string['auth_sync_suspended']  = 'If enabled, the suspended attribute will be used to update the local user account\'s suspension status.';
 $string['auth_sync_suspended_key'] = 'Synchronise local user suspension status';
 $string['auth_sync_script'] = 'User account synchronisation';
 $string['auth_updatelocal'] = 'Update local';
diff --git a/lang/en/availability.php b/lang/en/availability.php
index c92b544f827b8..e6620e2d95789 100644
--- a/lang/en/availability.php
+++ b/lang/en/availability.php
@@ -28,7 +28,7 @@
 $string['condition_group'] = 'Restriction set';
 $string['condition_group_info'] = 'Add a set of nested restrictions to apply complex logic.';
 $string['enableavailability'] = 'Enable restricted access';
-$string['enableavailability_desc'] = 'When enabled, this lets you set conditions (based on date, grade, or completion) that control whether an activity or resource can be accessed.';
+$string['enableavailability_desc'] = 'If enabled, conditions (based on date, grade, completion etc.) may be set to control whether an activity or resource can be accessed.';
 $string['error_list_nochildren'] = 'Restriction sets should contain at least one condition.';
 $string['hidden_marker'] = '(hidden otherwise)';
 $string['hidden_individual'] = 'Hidden entirely if user does not meet this condition';
diff --git a/lang/en/badges.php b/lang/en/badges.php
index 5072cd71fedfb..4512e98653ae6 100644
--- a/lang/en/badges.php
+++ b/lang/en/badges.php
@@ -111,7 +111,7 @@
 $string['backpackemailverificationpending'] = 'Verification pending';
 $string['backpackemailverifyemailbody'] = 'Hi,
 
-A new connection to your OpenBadges backpack has been requested from \'{$a->sitename}\' using your email address.
+A new connection to your badges backpack has been requested from \'{$a->sitename}\' using your email address.
 
 To confirm and activate the connection to your backpack, please go to
 
@@ -121,7 +121,7 @@
 
 If you need help, please contact the site administrator,
 {$a->admin}';
-$string['backpackemailverifyemailsubject'] = '{$a}: OpenBadges Backpack email verification';
+$string['backpackemailverifyemailsubject'] = '{$a}: Badges backpack email verification';
 $string['backpackemailverifypending'] = 'A verification email has been sent to <strong>{$a}</strong>. Click on the verification link in the email to activate your Backpack connection.';
 $string['backpackemailverifysuccess'] = 'Thanks for verifying your email address. You are now connected to your backpack.';
 $string['backpackemailverifytokenmismatch'] = 'The token in the link you clicked does not match the stored token. Make sure you clicked the link in most recent email you received.';
@@ -176,7 +176,7 @@
 $string['clearsettings'] = 'Clear settings';
 $string['completionnotenabled'] = 'Course completion is not enabled for this course, so it cannot be included in badge criteria. Course completion may be enabled in the course settings.';
 $string['completioninfo'] = 'This badge was issued for completing: ';
-$string['configenablebadges'] = 'When enabled, this feature lets you create badges and award them to site users.';
+$string['configenablebadges'] = 'If enabled, this feature lets you create badges and award them to site users.';
 $string['configuremessage'] = 'Badge message';
 $string['connect'] = 'Connect';
 $string['connected'] = 'Connected';
@@ -569,7 +569,6 @@
 // Deprecated since Moodle 3.6.
 $string['error:invalidbadgeurl'] = 'Invalid issuer URL format. The URL should have a prefix http:// or https://.';
 $string['backpackbadges'] = 'You have {$a->totalbadges} badge(s) displayed from {$a->totalcollections} collection(s). <a href="mybackpack.php">Change backpack settings</a>.';
-$string['error:nogroups'] = '<p>There are no public collections of badges available in your backpack. </p>
-<p>Only public collections are shown. <a href="http://backpack.openbadges.org">Visit your backpack</a> to create some public collections.</p>';
+$string['error:nogroups'] = '<p>There are no public collections of badges available in your backpack. </p> <p>Only public collections are shown. <a href="https://backpack.openbadges.org">Visit your backpack</a> to create some public collections.</p>';
 $string['nobackpackbadges'] = 'There are no badges in the collections you have selected. <a href="mybackpack.php">Add more collections</a>.';
 $string['nobackpackcollections'] = 'No badge collections have been selected. <a href="mybackpack.php">Add collections</a>.';
diff --git a/lang/en/calendar.php b/lang/en/calendar.php
index 8a0f70350e5a5..092ad4b90c35c 100644
--- a/lang/en/calendar.php
+++ b/lang/en/calendar.php
@@ -110,6 +110,7 @@
 $string['eventsdeleted'] = 'Events deleted';
 $string['eventsimported'] = 'Events imported: {$a}';
 $string['eventsource'] = 'Event source';
+$string['eventsskipped'] = 'Events skipped: {$a}';
 $string['eventsupdated'] = 'Events updated: {$a}';
 $string['eventsfor'] = '{$a} events';
 $string['eventskey'] = 'Events key';
@@ -258,6 +259,7 @@
 $string['user'] = 'User';
 $string['userevent'] = 'User event';
 $string['userevents'] = 'User events';
+$string['viewupcomingactivitiesdue'] = 'View the upcoming activities due';
 $string['wed'] = 'Wed';
 $string['wednesday'] = 'Wednesday';
 $string['weekly'] = 'Weekly';
diff --git a/lang/en/completion.php b/lang/en/completion.php
index 94894dfd2e0a6..23b5b007b8ca5 100644
--- a/lang/en/completion.php
+++ b/lang/en/completion.php
@@ -112,7 +112,7 @@
 $string['completionview'] = 'Require view';
 $string['completionview_desc'] = 'Student must view this activity to complete it';
 $string['configcompletiondefault'] = 'The default setting for completion tracking when creating new activities.';
-$string['configenablecompletion'] = 'When enabled, this lets you turn on completion tracking (progress) features at course level.';
+$string['configenablecompletion'] = 'If enabled, course and activity completion conditions may be set. Setting activity completion conditions is recommended so that meaningful data is displayed for users in their course overview on the Dashboard.';
 $string['confirmselfcompletion'] = 'Confirm self completion';
 $string['courseaggregation'] = 'Condition requires';
 $string['courseaggregation_all'] = 'ALL selected courses to be completed';
@@ -148,7 +148,7 @@
 $string['err_nocourses'] = 'Course completion is not enabled for any other courses, so none can be displayed. You can enable course completion in the course settings.';
 $string['err_nograde'] = 'A course pass grade has not been set for this course. To enable this criteria type you must create a pass grade for this course.';
 $string['err_noroles'] = 'There are no roles with the capability moodle/course:markcomplete in this course.';
-$string['err_nousers'] = 'There are no students on this course or group for whom completion information is displayed. (By default, completion information is displayed only for students, so if there are no students, you will see this error. Administrators can alter this option via the admin screens.)';
+$string['err_nousers'] = 'There are no students in this course or group for whom completion information is displayed. (Completion information is displayed only for users with the capability \'Be shown on completion reports\'. The capability is allowed for the default role of student only, so if there are no students, you will see this message.)';
 $string['err_settingslocked'] = 'One or more students have already completed a criterion so the settings have been locked. Unlocking the completion criteria settings will delete any existing user data and may cause confusion.';
 $string['err_system'] = 'An internal error occurred in the completion system. (System administrators can enable debugging information to see more detail.)';
 $string['eventcoursecompleted'] = 'Course completed';
diff --git a/lang/en/countries.php b/lang/en/countries.php
index 2c2e57cbcbdf2..9b206cd099791 100644
--- a/lang/en/countries.php
+++ b/lang/en/countries.php
@@ -25,7 +25,7 @@
 $string['AD'] = 'Andorra';
 $string['AE'] = 'United Arab Emirates';
 $string['AF'] = 'Afghanistan';
-$string['AG'] = 'Antigua And Barbuda';
+$string['AG'] = 'Antigua and Barbuda';
 $string['AI'] = 'Anguilla';
 $string['AL'] = 'Albania';
 $string['AM'] = 'Armenia';
@@ -38,7 +38,7 @@
 $string['AW'] = 'Aruba';
 $string['AX'] = 'Åland Islands';
 $string['AZ'] = 'Azerbaijan';
-$string['BA'] = 'Bosnia And Herzegovina';
+$string['BA'] = 'Bosnia and Herzegovina';
 $string['BB'] = 'Barbados';
 $string['BD'] = 'Bangladesh';
 $string['BE'] = 'Belgium';
@@ -50,8 +50,8 @@
 $string['BL'] = 'Saint Barthélemy';
 $string['BM'] = 'Bermuda';
 $string['BN'] = 'Brunei Darussalam';
-$string['BO'] = 'Bolivia, Plurinational State Of';
-$string['BQ'] = 'Bonaire, Sint Eustatius And Saba';
+$string['BO'] = 'Bolivia (Plurinational State of)';
+$string['BQ'] = 'Bonaire, Sint Eustatius and Saba';
 $string['BR'] = 'Brazil';
 $string['BS'] = 'Bahamas';
 $string['BT'] = 'Bhutan';
@@ -61,7 +61,7 @@
 $string['BZ'] = 'Belize';
 $string['CA'] = 'Canada';
 $string['CC'] = 'Cocos (Keeling) Islands';
-$string['CD'] = 'Congo, The Democratic Republic Of The';
+$string['CD'] = 'Congo (the Democratic Republic of the)';
 $string['CF'] = 'Central African Republic';
 $string['CG'] = 'Congo';
 $string['CH'] = 'Switzerland';
@@ -94,7 +94,7 @@
 $string['FI'] = 'Finland';
 $string['FJ'] = 'Fiji';
 $string['FK'] = 'Falkland Islands (Malvinas)';
-$string['FM'] = 'Micronesia, Federated States Of';
+$string['FM'] = 'Micronesia (Federated States of)';
 $string['FO'] = 'Faroe Islands';
 $string['FR'] = 'France';
 $string['GA'] = 'Gabon';
@@ -111,13 +111,13 @@
 $string['GP'] = 'Guadeloupe';
 $string['GQ'] = 'Equatorial Guinea';
 $string['GR'] = 'Greece';
-$string['GS'] = 'South Georgia And The South Sandwich Islands';
+$string['GS'] = 'South Georgia and the South Sandwich Islands';
 $string['GT'] = 'Guatemala';
 $string['GU'] = 'Guam';
 $string['GW'] = 'Guinea-Bissau';
 $string['GY'] = 'Guyana';
 $string['HK'] = 'Hong Kong';
-$string['HM'] = 'Heard Island And Mcdonald Islands';
+$string['HM'] = 'Heard Island and McDonald Islands';
 $string['HN'] = 'Honduras';
 $string['HR'] = 'Croatia';
 $string['HT'] = 'Haiti';
@@ -125,11 +125,11 @@
 $string['ID'] = 'Indonesia';
 $string['IE'] = 'Ireland';
 $string['IL'] = 'Israel';
-$string['IM'] = 'Isle Of Man';
+$string['IM'] = 'Isle of Man';
 $string['IN'] = 'India';
 $string['IO'] = 'British Indian Ocean Territory';
 $string['IQ'] = 'Iraq';
-$string['IR'] = 'Iran, Islamic Republic Of';
+$string['IR'] = 'Iran (Islamic Republic of)';
 $string['IS'] = 'Iceland';
 $string['IT'] = 'Italy';
 $string['JE'] = 'Jersey';
@@ -141,9 +141,9 @@
 $string['KH'] = 'Cambodia';
 $string['KI'] = 'Kiribati';
 $string['KM'] = 'Comoros';
-$string['KN'] = 'Saint Kitts And Nevis';
-$string['KP'] = 'Korea, Democratic People\'s Republic Of';
-$string['KR'] = 'Korea, Republic Of';
+$string['KN'] = 'Saint Kitts and Nevis';
+$string['KP'] = 'Korea (the Democratic People\'s Republic of)';
+$string['KR'] = 'Korea (the Republic of)';
 $string['KW'] = 'Kuwait';
 $string['KY'] = 'Cayman Islands';
 $string['KZ'] = 'Kazakhstan';
@@ -160,12 +160,12 @@
 $string['LY'] = 'Libya';
 $string['MA'] = 'Morocco';
 $string['MC'] = 'Monaco';
-$string['MD'] = 'Moldova, Republic Of';
+$string['MD'] = 'Moldova (the Republic of)';
 $string['ME'] = 'Montenegro';
-$string['MF'] = 'Saint Martin (French Part)';
+$string['MF'] = 'Saint Martin (French part)';
 $string['MG'] = 'Madagascar';
 $string['MH'] = 'Marshall Islands';
-$string['MK'] = 'Macedonia, The Former Yugoslav Republic Of';
+$string['MK'] = 'North Macedonia';
 $string['ML'] = 'Mali';
 $string['MM'] = 'Myanmar';
 $string['MN'] = 'Mongolia';
@@ -201,10 +201,10 @@
 $string['PH'] = 'Philippines';
 $string['PK'] = 'Pakistan';
 $string['PL'] = 'Poland';
-$string['PM'] = 'Saint Pierre And Miquelon';
+$string['PM'] = 'Saint Pierre and Miquelon';
 $string['PN'] = 'Pitcairn';
 $string['PR'] = 'Puerto Rico';
-$string['PS'] = 'Palestine, State Of';
+$string['PS'] = 'Palestine, State of';
 $string['PT'] = 'Portugal';
 $string['PW'] = 'Palau';
 $string['PY'] = 'Paraguay';
@@ -220,9 +220,9 @@
 $string['SD'] = 'Sudan';
 $string['SE'] = 'Sweden';
 $string['SG'] = 'Singapore';
-$string['SH'] = 'Saint Helena, Ascension And Tristan Da Cunha';
+$string['SH'] = 'Saint Helena, Ascension and Tristan da Cunha';
 $string['SI'] = 'Slovenia';
-$string['SJ'] = 'Svalbard And Jan Mayen';
+$string['SJ'] = 'Svalbard and Jan Mayen';
 $string['SK'] = 'Slovakia';
 $string['SL'] = 'Sierra Leone';
 $string['SM'] = 'San Marino';
@@ -230,12 +230,12 @@
 $string['SO'] = 'Somalia';
 $string['SR'] = 'Suriname';
 $string['SS'] = 'South Sudan';
-$string['ST'] = 'Sao Tome And Principe';
+$string['ST'] = 'Sao Tome and Principe';
 $string['SV'] = 'El Salvador';
-$string['SX'] = 'Sint Maarten (Dutch Part)';
+$string['SX'] = 'Sint Maarten (Dutch part)';
 $string['SY'] = 'Syrian Arab Republic';
-$string['SZ'] = 'Swaziland';
-$string['TC'] = 'Turks And Caicos Islands';
+$string['SZ'] = 'Eswatini';
+$string['TC'] = 'Turks and Caicos Islands';
 $string['TD'] = 'Chad';
 $string['TF'] = 'French Southern Territories';
 $string['TG'] = 'Togo';
@@ -247,24 +247,24 @@
 $string['TN'] = 'Tunisia';
 $string['TO'] = 'Tonga';
 $string['TR'] = 'Turkey';
-$string['TT'] = 'Trinidad And Tobago';
+$string['TT'] = 'Trinidad and Tobago';
 $string['TV'] = 'Tuvalu';
 $string['TW'] = 'Taiwan';
-$string['TZ'] = 'Tanzania, United Republic Of';
+$string['TZ'] = 'Tanzania, the United Republic of';
 $string['UA'] = 'Ukraine';
 $string['UG'] = 'Uganda';
 $string['UM'] = 'United States Minor Outlying Islands';
 $string['US'] = 'United States';
 $string['UY'] = 'Uruguay';
 $string['UZ'] = 'Uzbekistan';
-$string['VA'] = 'Holy See (Vatican City State)';
-$string['VC'] = 'Saint Vincent And The Grenadines';
-$string['VE'] = 'Venezuela, Bolivarian Republic Of';
-$string['VG'] = 'Virgin Islands, British';
-$string['VI'] = 'Virgin Islands, U.S.';
+$string['VA'] = 'Holy See';
+$string['VC'] = 'Saint Vincent and the Grenadines';
+$string['VE'] = 'Venezuela (Bolivarian Republic of)';
+$string['VG'] = 'Virgin Islands (British)';
+$string['VI'] = 'Virgin Islands (U.S.)';
 $string['VN'] = 'Viet Nam';
 $string['VU'] = 'Vanuatu';
-$string['WF'] = 'Wallis And Futuna';
+$string['WF'] = 'Wallis and Futuna';
 $string['WS'] = 'Samoa';
 $string['YE'] = 'Yemen';
 $string['YT'] = 'Mayotte';
diff --git a/lang/en/error.php b/lang/en/error.php
index 825a6b3529454..7fe328446dd4b 100644
--- a/lang/en/error.php
+++ b/lang/en/error.php
@@ -96,7 +96,7 @@
 $string['cannotfindlang'] = 'Cannot find "{$a}" language pack!';
 $string['cannotfindteacher'] = 'Cannot find teacher';
 $string['cannotfinduser'] = 'Cannot find user named "{$a}"';
-$string['cannotgeoplugin'] = 'Cannot connect to geoPlugin server at http://www.geoplugin.com, please check proxy settings or better install MaxMind GeoLite City data file';
+$string['cannotgeoplugin'] = 'Cannot connect to the geoPlugin server at https://www.geoplugin.com. Please check your proxy settings or install the MaxMind GeoLite City data file.';
 $string['cannotgetblock'] = 'Could not retrieve blocks from the database';
 $string['cannotgetcats'] = 'Cannot get category record';
 $string['cannotgetdata'] = 'Cannot get data';
@@ -169,7 +169,7 @@
 $string['cannotuseadminadminorteacher'] = 'You need to be a teacher or admin user to use this page';
 $string['cannotusepage'] = 'Only teachers and administrators can use this page';
 $string['cannotusepage2'] = 'Sorry, you may not use this page';
-$string['cannotviewcategory'] = 'You don\'t have permission to view courses here';
+$string['cannotviewcategory'] = 'You don\'t have permission to view this list of courses.';
 $string['cannotviewprofile'] = 'You cannot view the profile of this user';
 $string['cannotviewreport'] = 'You cannot view this report';
 $string['cannotwritefile'] = 'Cannot write to file ({$a})';
@@ -263,6 +263,7 @@
 $string['filternotenabled'] = 'Filter not enabled!';
 $string['filternotinstalled'] = 'Filter {$a} is not currently installed';
 $string['forumblockingtoomanyposts'] = 'You have exceeded the posting threshold set for this forum';
+$string['functionalityremoved'] = 'You are trying to access functionality that has been removed.';
 $string['generalexceptionmessage'] = 'Exception - {$a}';
 $string['gradepubdisable'] = 'Grade publishing disabled';
 $string['gradesneedregrading'] = 'The course grades need to be recalculated';
@@ -384,7 +385,7 @@
 $string['maxbytesfile'] = 'The file {$a->file} is too large. The maximum size you can upload is {$a->size}.';
 $string['maxareabytes'] = 'The file is larger than the space remaining in this area.';
 $string['messagingdisable'] = 'Messaging is disabled on this site';
-$string['mimetexisnotexist'] = 'Your system is not configured to run mimeTeX. You need to obtain the C source from <a href="http://www.forkosh.com/mimetex.zip">http://www.forkosh.com/mimetex.zip</a>, compile it and put the executable into your moodle/filter/tex/ directory.';
+$string['mimetexisnotexist'] = 'Your system is not configured to run mimeTeX. You need to obtain the C source from <a href="https://www.forkosh.com/mimetex.zip">https://www.forkosh.com/mimetex.zip</a>, compile it and put the executable into your moodle/filter/tex/ directory.';
 $string['mimetexnotexecutable'] = 'Custom mimetex is not executable!';
 $string['missingfield'] = 'Field "{$a}" is missing';
 $string['missingkeyinsql'] = 'ERROR: missing param "{$a}" in query';
diff --git a/lang/en/grading.php b/lang/en/grading.php
index d19e3ff610ff2..46e3c27eda1ad 100644
--- a/lang/en/grading.php
+++ b/lang/en/grading.php
@@ -30,7 +30,7 @@
 $string['changeactivemethod'] = 'Change active grading method to';
 $string['clicktoclose'] = 'click to close';
 $string['exc_gradingformelement'] = 'Unable to instantiate grading form element';
-$string['formnotavailable'] = 'Advanced grading method was selected to use but the grading form is not available yet. You may need to define it first via a link in the Administration block.';
+$string['formnotavailable'] = 'An advanced grading method was selected to use but the grading form is not available yet. You may need to define it first via a link in the actions menu or administration block.';
 $string['gradingformunavailable'] = 'Please note: the advanced grading form is not ready at the moment. Simple grading method will be used until the form has a valid status.';
 $string['gradingmanagement'] = 'Advanced grading';
 $string['gradingmanagementtitle'] = 'Advanced grading: {$a->component} ({$a->area})';
diff --git a/lang/en/group.php b/lang/en/group.php
index 9d448ec385d48..9f32f85f89049 100644
--- a/lang/en/group.php
+++ b/lang/en/group.php
@@ -196,3 +196,4 @@
 $string['usercount'] = 'User count';
 $string['usercounttotal'] = 'User count ({$a})';
 $string['usergroupmembership'] = 'Selected user\'s membership:';
+$string['memberofgroup'] = 'Group member of: {$a}';
diff --git a/lang/en/hub.php b/lang/en/hub.php
index e607eeed85325..d1ab5d37c2f04 100644
--- a/lang/en/hub.php
+++ b/lang/en/hub.php
@@ -82,7 +82,7 @@
 $string['errorcourseinfo'] = 'An error occurred when retrieving course metadata from {$a}. Please try again to retrieve the course metadata by reloading this page later. Otherwise you can decide to continue the registration process with the following default metadata. ';
 $string['errorcoursepublish'] = 'An error occurred during the course publication ({$a}). Please try again later.';
 $string['errorcoursewronglypublished'] = 'A publication error has been returned by Moodle.net. Please try again later.';
-$string['errorotherhubsnotsupported'] = 'This page can no longer be used for registration with sites other than Moodle.net';
+$string['errorotherhubsnotsupported'] = 'This page can no longer be used for registration with custom sites directories.';
 $string['errorregistration'] = 'An error occurred during registration, please try again later. ({$a})';
 $string['errorunpublishcourses'] = 'Due to an unexpected error, the courses could not be deleted from Moodle.net. Try again later (recommended) or contact Moodle.net administrator.';
 $string['errorws'] = '{$a}';
@@ -119,7 +119,7 @@
 $string['operation'] = 'Actions';
 $string['participantnumberaverage'] = 'Average number of participants ({$a})';
 $string['policyagreed'] = 'Privacy notice and data processing agreement';
-$string['policyagreeddesc'] = 'I agree to the <a href="{$a}" target="_blank">Privacy notice and data processing agreement</a> for Moodle.net';
+$string['policyagreeddesc'] = 'I agree to the <a href="{$a}" target="_blank">Privacy notice and data processing agreement</a>';
 $string['postaladdress'] = 'Postal address';
 $string['postaladdress_help'] = 'Postal address of this site, or of the entity represented by this site.';
 $string['postsnumber'] = 'Number of posts ({$a})';
@@ -140,6 +140,19 @@
 $string['registereduserdevices'] = 'Number of users with registered mobile devices ({$a})';
 $string['registeredactiveuserdevices'] = 'Number of active users with registered mobile devices which are receiving notifications ({$a})';
 $string['registersite'] = 'Register with {$a}';
+$string['registerwithmoodleorg'] = 'Register your site';
+$string['registerwithmoodleorgupdate'] = 'Update your site registration';
+$string['registerwithmoodleorgcomplete'] = 'Complete your site registration';
+$string['registerwithmoodleorginfo'] = 'We\'d love to stay in touch and provide you with important things for your Moodle site! By registering:
+
+* You can subscribe to receive notifications of new Moodle releases, security alerts and other important news.
+* You can access and activate mobile push notifications from your Moodle site through our free Moodle app.
+* You are contributing to our Moodle statistics of the worldwide community, which help us improve Moodle and our community sites.
+* If you wish, your site can be included in the list of registered Moodle sites in your country.';
+$string['registerwithmoodleorginfoapp'] = 'About the Moodle app';
+$string['registerwithmoodleorginfostats'] = 'Moodle statistics';
+$string['registerwithmoodleorginfosites'] = 'Other sites in my country';
+$string['registerwithmoodleorgremove'] = 'Unregistering your site';
 $string['registrationconfirmed'] = 'Site registration confirmed';
 $string['registrationconfirmedon'] = 'Thank you for registering your site. Registration information will be kept up to date by the \'Site registration\' scheduled task.';
 $string['removefromhub'] = 'Remove from Moodle.net';
@@ -161,10 +174,10 @@
 $string['sharepublication_help'] = 'A backup of this course will be available on Moodle.net for people to restore and use on their own site.';
 $string['siteadmin'] = 'Administrator';
 $string['siteadmin_help'] = 'The full name of the site administrator.';
-$string['sitecommnews'] = 'Updates about Moodle news and features';
-$string['sitecommnews_help'] = 'You have the option of subscribing to our low volume email list including a newsletter about happenings in the Moodle community. ';
-$string['sitecommnewsno'] = 'No, I do not want to receive any email from Moodle HQ';
-$string['sitecommnewsyes'] = 'Yes please, include me in Moodle’s regular e-newsletter updates';
+$string['sitecommnews'] = 'Moodle newsletter';
+$string['sitecommnews_help'] = 'You have the option of subscribing to our Moodle newsletter. You may unsubscribe at any time.';
+$string['sitecommnewsno'] = 'No, I do not wish to receive any emails';
+$string['sitecommnewsyes'] = 'Yes, I would like to receive the Moodle newsletter';
 $string['sitecountry'] = 'Country';
 $string['sitecountry_help'] = 'The country your organisation or institution is located in.';
 $string['sitedesc'] = 'Description';
@@ -186,8 +199,8 @@
 $string['siteprivacylinked'] = 'Display my site name with the link';
 $string['siteregistrationcontact'] = 'Display contact form';
 $string['siteregistrationcontact_help'] = 'If you allow it, other people in our Moodle community (who need a login account) can contact you via a form on our Moodle community site. However, they will never be able to see your email address.';
-$string['siteregistrationemail'] = 'Notifications about important security and technical issues.';
-$string['siteregistrationemail_help'] = 'You have the option of subscribing to our low volume email list for important news (on security issues or new releases).';
+$string['siteregistrationemail'] = 'Notifications of new Moodle releases, security alerts and other important news';
+$string['siteregistrationemail_help'] = 'You have the option of subscribing to our low-volume mailing list for notifications of new Moodle releases, security alerts and other important news. You may unsubscribe at any time.';
 $string['siteregistrationupdated'] = 'Site registration updated';
 $string['siterelease'] = 'Moodle release';
 $string['sitereleasenum'] = 'Moodle release ({$a})';
@@ -215,15 +228,16 @@
 $string['unregistrationerror'] = 'An error occurred when the site tried to unregister from Moodle.net: {$a}';
 $string['update'] = 'Update';
 $string['updatesite'] = 'Update registration on {$a}';
+$string['updatesiteregistration'] = 'Update registration';
 $string['updatestatus'] = 'Check it now.';
 $string['usedifferentemail'] = 'Use different email';
-$string['unregisterexplained'] = 'If the site with URL {$a} is registered on Moodle.net its registration will be removed.';
-$string['urlalreadyregistered'] = 'Your site seems to be already registered on Moodle.net, which means something has gone wrong. Please contact the Moodle.net administrator to reset your registration so you can try again.';
+$string['unregisterexplained'] = 'If the site with URL {$a} is registered, then its registration will be removed.';
+$string['urlalreadyregistered'] = 'Your site seems to be already registered, which means something has gone wrong. Please contact the Moodle.net administrator to reset your registration so you can try again.';
 $string['usersnumber'] = 'Number of users ({$a})';
 $string['wrongtoken'] = 'The registration failed for some unknown reason (network?). Please try again.';
 
 // Deprecated since Moodle 3.4.
-$string['registermoochtips'] = 'Register your site with Moodle to get security alerts and access to Moodle.net, our course sharing platform.';
+$string['registermoochtips'] = 'By registering, you will receive security alerts, can activate mobile app push notifications from your site, and are contributing to our Moodle statistics of the worldwide community.';
 $string['errorcronnoxmlrpc'] = 'XML-RPC must be enabled in order to update the registration.';
 $string['advertiseonhub'] = 'Share this course for people to join';
 $string['advertiseonmoodleorg'] = 'Advertise this course on moodle.org';
diff --git a/lang/en/install.php b/lang/en/install.php
index 98a021a587db1..cd7e2fbdfd107 100644
--- a/lang/en/install.php
+++ b/lang/en/install.php
@@ -144,6 +144,7 @@
 $string['inputwebadress'] = 'Web address :';
 $string['inputwebdirectory'] = 'Moodle directory:';
 $string['installation'] = 'Installation';
+$string['invaliddbprefix'] = 'Invalid prefix. The prefix can only consist of lower case letters and underscore.';
 $string['langdownloaderror'] = 'Unfortunately the language "{$a}" could not be downloaded. The installation process will continue in English.';
 $string['langdownloadok'] = 'The language "{$a}" was installed successfully. The installation process will continue in this language.';
 $string['memorylimit'] = 'Memory limit';
@@ -240,10 +241,7 @@
 $string['welcomep30'] = 'This release of the <strong>{$a->installername}</strong> includes the applications
     to create an environment in which <strong>Moodle</strong> will operate, namely:';
 $string['welcomep40'] = 'The package also includes <strong>Moodle {$a->moodlerelease} ({$a->moodleversion})</strong>.';
-$string['welcomep50'] = 'The use of all the applications in this package is governed by their respective
-    licences. The complete <strong>{$a->installername}</strong> package is
-    <a href="http://www.opensource.org/docs/definition_plain.html">open source</a> and is distributed
-    under the <a href="http://www.gnu.org/copyleft/gpl.html">GPL</a> license.';
+$string['welcomep50'] = 'The use of all the applications in this package is governed by their respective licences. The complete <strong>{$a->installername}</strong> package is <a href="https://www.opensource.org/docs/definition_plain.html">open source</a> and is distributed under the <a href="https://www.gnu.org/copyleft/gpl.html">GPL</a> license.';
 $string['welcomep60'] = 'The following pages will lead you through some easy to follow steps to
     configure and set up <strong>Moodle</strong> on your computer. You may accept the default
     settings or, optionally, amend them to suit your own needs.';
diff --git a/lang/en/message.php b/lang/en/message.php
index 8fd31fc766c3e..e7b4d215e478f 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -100,8 +100,8 @@
 $string['messageoutputs'] = 'Notification plugins';
 $string['messagepreferences'] = 'Message preferences';
 $string['message'] = 'Message';
-$string['messagecontactrequestsnotification'] = '{$a} wants to be added as a contact';
-$string['messagecontactrequestsnotificationsubject'] = '{$a} wants to be added as a contact';
+$string['messagecontactrequestsnotification'] = '{$a} is requesting to be added as a contact.';
+$string['messagecontactrequestsnotificationsubject'] = 'Contact request from {$a}';
 $string['messagedrawerviewcontact'] = 'User details for {$a}';
 $string['messagedrawerviewcontacts'] = 'Message contacts';
 $string['messagedrawerviewconversation'] = 'Conversation with {$a}';
diff --git a/lang/en/mnet.php b/lang/en/mnet.php
index 8bcdb2aa1d536..bb5711180a72d 100644
--- a/lang/en/mnet.php
+++ b/lang/en/mnet.php
@@ -58,7 +58,7 @@
 $string['duplicate_usernames'] = 'We failed to create an index on the columns "mnethostid" and "username" in your user table.<br />This can occur when you have <a href="{$a}" target="_blank">duplicate usernames in your user table</a>.<br />Your upgrade should still complete successfully. Click on the link above, and instructions on fixing this problem will appear in a new window. You can attend to that at the end of the upgrade.<br />';
 $string['enabled_for_all'] = '(This service has been enabled for all hosts).';
 $string['enterausername'] = 'Please enter a username, or a list of usernames separated by commas.';
-$string['error7020'] = 'This error normally occurs if the remote site has created a record for you with the wrong wwwroot, for example, http://yoursite.com instead of http://www.yoursite.com. You should contact the administrator of the remote site with your wwwroot (as specified in config.php) asking her to update her record for your host.';
+$string['error7020'] = 'This error normally occurs if the remote site has created a record for you with the wrong wwwroot, for example, https://yoursite.com instead of https://www.yoursite.com. Please contact the administrator of the remote site with your wwwroot (as specified in config.php) and ask them to update the record for your host.';
 $string['error7022'] = 'The message you sent to the remote site was encrypted properly, but not signed. This is very unexpected; you should probably file a bug if this occurs (giving as much information as possible about the application versions in question etc).';
 $string['error7023'] = 'The remote site has tried to decrypt your message with all the keys it has on record for your site. They have all failed. You might be able to fix this problem by manually re-keying with the remote site. This is unlikely to occur unless you\'ve been out of communication with the remote site for a few months.';
 $string['error7024'] = 'You send an unencrypted message to the remote site, but the remote site doesn\'t accept unencrypted communication from your site. This is very unexpected; you should probably file a bug if this occurs (giving as much information as possible about the application versions in question, etc.';
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index df841d662f3ca..a896601ede59c 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -194,7 +194,7 @@
 $string['backuploglaststatus'] = 'Last execution log';
 $string['backupmissinguserinfoperms'] = 'Note: This backup contains no user data. Exercise and Workshop activities will not be included in the backup, since these modules are not compatible with this type of backup.';
 $string['backupnext'] = 'Next backup';
-$string['backupnonisowarning'] = 'Warning: this backup is from a non-Unicode version of Moodle (pre 1.6).  If this backup contains any non-ISO-8859-1 texts then they may be CORRUPTED if you try to restore them to this Unicode version of Moodle.  See the <a href="http://docs.moodle.org/en/Backup_FAQ">Backup FAQ</a> for more information about how to recover this backup correctly.';
+$string['backupnonisowarning'] = 'Warning: this backup is from a non-Unicode version of Moodle (pre 1.6). If this backup contains any non-ISO-8859-1 texts then they may be CORRUPTED if you try to restore them to this Unicode version of Moodle. See the <a href="https://docs.moodle.org/en/Backup_FAQ">Backup FAQ</a> for more information about how to recover this backup correctly.';
 $string['backupnotyetrun'] = 'Automated backup pending';
 $string['backuporiginalname'] = 'Backup name';
 $string['backuproleassignments'] = 'Backup role assignments for these roles';
@@ -381,12 +381,11 @@
 $string['coursesmovedout'] = 'Courses moved out from {$a}';
 $string['coursespending'] = 'Courses pending approval';
 $string['coursesearch'] = 'Search courses';
-$string['coursesearch_help'] = '<p>You can search for multiple words at once and can refine your search as follows:</p>
-<ul>
-<li>word - find any match of this word within the text.</li>
-<li>+word - only exact matching words will be found.</li>
-<li>-word - don\'t include results containing this word.</li>
-</ul>';
+$string['coursesearch_help'] = 'You can search for multiple words at once and can refine your search as follows:
+
+* word - find any match of this word within the text
+* +word - only exact matching words will be found
+* -word - don\'t include results containing this word.';
 $string['coursestart'] = 'Course start';
 $string['coursesummary'] = 'Course summary';
 $string['coursesummary_help'] = 'The course summary is displayed in the list of courses. A course search searches course summary text in addition to course names.';
@@ -885,36 +884,24 @@
 $string['geolocation'] = 'latitude - longitude';
 $string['gettheselogs'] = 'Get these logs';
 $string['go'] = 'Go';
-$string['gpl'] = 'Copyright (C) 1999 onwards  Martin Dougiamas  (http://moodle.com)
+$string['gpl'] = 'Copyright (C) 1999 onwards Martin Dougiamas (https://moodle.com)
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-See the Moodle License information page for full details:
-http://docs.moodle.org/dev/License';
+See the Moodle License information page for full details: https://docs.moodle.org/dev/License';
 $string['gpllicense'] = 'GPL license';
-$string['gpl3'] = 'Copyright (C) 1999 onwards Martin Dougiamas (http://moodle.com)
+$string['gpl3'] = 'Copyright (C) 1999 onwards Martin Dougiamas (https://moodle.com)
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-See the Moodle License information page for full details:
-http://docs.moodle.org/dev/License';
+See the Moodle License information page for full details: https://docs.moodle.org/dev/License';
 $string['grade'] = 'Grade';
 $string['grades'] = 'Grades';
-$string['gravatarenabled'] = '<a href="http://www.gravatar.com/">Gravatar</a> has been enabled for this site. If you don\'t upload a profile picture Moodle will attempt to load a profile picture for you from Gravatar.';
+$string['gravatarenabled'] = '<a href="https://www.gravatar.com/">Gravatar</a> has been enabled for this site. If you don\'t upload a profile picture Moodle will attempt to load a profile picture for you from Gravatar.';
 $string['group'] = 'Group';
 $string['groupadd'] = 'Add new group';
 $string['groupaddusers'] = 'Add selected to group';
@@ -1153,7 +1140,7 @@
 $string['makeafolder'] = 'Create folder';
 $string['makeavailable'] = 'Make available';
 $string['makeeditable'] = 'If you make \'{$a}\' editable by the web server process (eg apache) then you could edit this file directly from this page';
-$string['makethismyhome'] = 'Make this my default home page';
+$string['makethismyhome'] = 'Make this my home page';
 $string['makeunavailable'] = 'Make unavailable';
 $string['manageblocks'] = 'Blocks';
 $string['managecategorythis'] = 'Manage this category';
@@ -1183,8 +1170,8 @@
 $string['maxnumcoursesincombo'] = 'Browse <a href="{$a->link}">{$a->numberofcourses} courses</a>.';
 $string['maxsize'] = 'Max size: {$a}';
 $string['maxsizeandareasize'] = 'Maximum size for new files: {$a->size}, overall limit: {$a->areasize}';
-$string['maxsizeandattachments'] = 'Maximum size for new files: {$a->size}, maximum attachments: {$a->attachments}';
-$string['maxsizeandattachmentsandareasize'] = 'Maximum size for new files: {$a->size}, maximum attachments: {$a->attachments}, overall limit: {$a->areasize}';
+$string['maxsizeandattachments'] = 'Maximum file size: {$a->size}, maximum number of files: {$a->attachments}';
+$string['maxsizeandattachmentsandareasize'] = 'Maximum file size: {$a->size}, maximum number of files: {$a->attachments}, maximum total size: {$a->areasize}';
 $string['memberincourse'] = 'People in the course';
 $string['messagebody'] = 'Message body';
 $string['messagedselectedusers'] = 'Selected users have been messaged and the recipient list has been reset.';
@@ -1639,9 +1626,9 @@
 <p>If you choose, you can allow your site name, country and URL to be added to the public list of Moodle Sites.</p>
 <p>All new registrations are verified manually before they are added to the list, but once you are added you can update your registration (and your entry on the public list) at any time by resubmitting this form.</p>';
 $string['registrationinfotitle'] = 'Registration information';
-$string['registrationno'] = 'No, I do not want to receive any email from Moodle HQ';
+$string['registrationno'] = 'No, I do not wish to receive any emails';
 $string['registrationsend'] = 'Send registration information to moodle.org';
-$string['registrationyes'] = 'Yes, notify me about important news (e.g. security issues or releases) ';
+$string['registrationyes'] = 'Yes, notify me of new Moodle releases, security alerts and other important news';
 $string['reject'] = 'Reject';
 $string['rejectdots'] = 'Reject...';
 $string['reload'] = 'Reload';
@@ -1821,6 +1808,7 @@
 $string['shortsitename'] = 'Short name for site (eg single word)';
 $string['show'] = 'Show';
 $string['showactions'] = 'Show actions';
+$string['showadvancededitor'] = 'Advanced';
 $string['showadvancedsettings'] = 'Show advanced settings';
 $string['showall'] = 'Show all {$a}';
 $string['showallcourses'] = 'Show all courses';
@@ -1833,7 +1821,7 @@
 $string['showdescription'] = 'Display description on course page';
 $string['showdescription_help'] = 'If enabled, the description above will be displayed on the course page just below the link to the activity or resource.';
 $string['showgrades'] = 'Show gradebook to students';
-$string['showgrades_help'] = 'Many activities in the course allow grades to be set. This setting determines whether a student can view a list of all their grades for the course via a grades link in the course administration block.';
+$string['showgrades_help'] = 'Many activities in the course allow grades to be set. This setting determines whether a student can view a list of all their grades for the course via a grades link in the navigation drawer or block.';
 $string['showingacourses'] = 'Showing all {$a} courses';
 $string['showingxofycourses'] = 'Showing courses {$a->start} to {$a->end} of {$a->total} courses';
 $string['showlistofcourses'] = 'Show list of courses';
@@ -1920,7 +1908,7 @@
 $string['statsreport11'] = 'Most active courses';
 $string['statsreport12'] = 'Most active courses (weighted)';
 $string['statsreport13'] = 'Most participatory courses (enrolments)';
-$string['statsreport14'] = 'Most participatory courses (views/posts)';
+$string['statsreport14'] = 'Most participatory courses (posts/views)';
 $string['statsreport2'] = 'Views (all roles)';
 $string['statsreport3'] = 'Posts (all roles)';
 $string['statsreport4'] = 'All activity (all roles)';
diff --git a/lang/en/my.php b/lang/en/my.php
index 216b1ab08d044..02b2a82651459 100644
--- a/lang/en/my.php
+++ b/lang/en/my.php
@@ -38,4 +38,4 @@
 $string['reseteveryonesprofile'] = 'Reset profile for all users';
 $string['resetpage'] = 'Reset page to default';
 $string['reseterror'] = 'There was an error resetting your page';
-$string['privacy:metadata:core_my:preference:user_home_page_preference'] = 'The user home page preference configured for the Dashboard page.';
+$string['privacy:metadata:core_my:preference:user_home_page_preference'] = 'The user home page preference.';
diff --git a/lang/en/question.php b/lang/en/question.php
index 7dc290e5ef76f..8663ab9ebebe1 100644
--- a/lang/en/question.php
+++ b/lang/en/question.php
@@ -283,7 +283,7 @@
 $string['questionname'] = 'Question name';
 $string['questionno'] = 'Question {$a}';
 $string['questionsaveerror'] = 'Errors occur during saving question - ({$a})';
-$string['questionsinuse'] = '(* Questions marked by an asterisk are already in use in some quizzes. These questions will not be deleted from these quizzes but only from the category list.)';
+$string['questionsinuse'] = '(* Questions marked with an asterisk are used somewhere, for example in a quiz. Therefore, if you proceed, these questions will not really be deleted, they will just be hidden.)';
 $string['questionsmovedto'] = 'Questions still in use moved to "{$a}" in the parent course category.';
 $string['questionsrescuedfrom'] = 'Questions saved from context {$a}.';
 $string['questionsrescuedfrominfo'] = 'These questions (some of which may be hidden) were saved when context {$a} was deleted because they are still used by some quizzes or other activities.';
diff --git a/lang/en/rating.php b/lang/en/rating.php
index 4e03d2fa5a700..6b351266d26ac 100644
--- a/lang/en/rating.php
+++ b/lang/en/rating.php
@@ -53,7 +53,7 @@
 $string['ratingtime'] = 'Restrict ratings to items with dates in this range:';
 $string['ratings'] = 'Ratings';
 $string['rolewarning'] = 'Roles with permission to rate';
-$string['rolewarning_help'] = 'To submit ratings users require the moodle/rating:rate capability and any module specific capabilities. Users assigned the following roles should be able to rate items. The list of roles may be amended via the permissions link in the administration block.';
+$string['rolewarning_help'] = 'To submit ratings users require the moodle/rating:rate capability and any module specific capabilities. Users assigned the following roles should be able to rate items. The list of roles may be amended via the permissions link in the actions menu or administration block, depending on the theme.';
 $string['scaleselectionrequired'] = 'When selecting a ratings aggregate type you must also select to use either a scale or set a maximum points.';
 $string['privacy:metadata:rating'] = 'The user-entered rating is stored alongside a mapping of the item which was rated.';
 $string['privacy:metadata:rating:userid'] = 'The user who made the rating.';
diff --git a/lang/en/repository.php b/lang/en/repository.php
index be5d95fe574ea..c01d5899959f9 100644
--- a/lang/en/repository.php
+++ b/lang/en/repository.php
@@ -63,8 +63,8 @@
 $string['configcacheexpire'] = 'The amount of time that file listings are cached locally (in seconds) when browsing external repositories.';
 $string['configgetfiletimeout'] = 'Timeout in seconds for downloading an external file into Moodle.';
 $string['configsaved'] = 'Configuration saved!';
-$string['configsyncfiletimeout'] = 'Timeout in seconds for syncronising the external file size.';
-$string['configsyncimagetimeout'] = 'Timeout in seconds for downloading an image file from external repository during syncronisation.';
+$string['configsyncfiletimeout'] = 'Timeout in seconds for synchronising the external file size.';
+$string['configsyncimagetimeout'] = 'Timeout in seconds for downloading an image file from external repository during synchronisation.';
 $string['confirmdelete'] = 'Are you sure you want to delete the repository {$a}? If you choose "Continue and download", file references to external contents will be downloaded to Moodle. This could take a long time to process.';
 $string['confirmdeletefile'] = 'Are you sure you want to delete this file?';
 $string['confirmrenamefile'] = 'Are you sure you want to rename/move this file? There are {$a} alias/shortcut files that use this file as their source. If you proceed then those aliases will be converted to true copies.';
diff --git a/lang/en/search.php b/lang/en/search.php
index 7d791e3a738b2..20c5ddd879186 100644
--- a/lang/en/search.php
+++ b/lang/en/search.php
@@ -118,7 +118,7 @@
 $string['search:section'] = 'Course sections';
 $string['search:user'] = 'Users';
 $string['searcharea'] = 'Search area';
-$string['searchareacategories'] = 'Seach area categories';
+$string['searchareacategories'] = 'Search area categories';
 $string['searching'] = 'Searching in ...';
 $string['searchnotpermitted'] = 'You are not allowed to do a search';
 $string['searchsetupdescription'] = 'The following steps help you to set up Moodle global search.';
diff --git a/lang/en/timezones.php b/lang/en/timezones.php
index 01a1feaec17c9..417a4fb108b2d 100644
--- a/lang/en/timezones.php
+++ b/lang/en/timezones.php
@@ -27,7 +27,7 @@
 $string['africa/accra'] = 'Africa/Accra';
 $string['africa/addis_ababa'] = 'Africa/Addis_Ababa';
 $string['africa/algiers'] = 'Africa/Algiers';
-$string['africa/asmera'] = 'Africa/Asmera';
+$string['africa/asmara'] = 'Africa/Asmara';
 $string['africa/bamako'] = 'Africa/Bamako';
 $string['africa/bangui'] = 'Africa/Bangui';
 $string['africa/banjul'] = 'Africa/Banjul';
@@ -48,6 +48,7 @@
 $string['africa/gaborone'] = 'Africa/Gaborone';
 $string['africa/harare'] = 'Africa/Harare';
 $string['africa/johannesburg'] = 'Africa/Johannesburg';
+$string['africa/juba'] = 'Africa/Juba';
 $string['africa/kampala'] = 'Africa/Kampala';
 $string['africa/khartoum'] = 'Africa/Khartoum';
 $string['africa/kigali'] = 'Africa/Kigali';
@@ -71,32 +72,35 @@
 $string['africa/ouagadougou'] = 'Africa/Ouagadougou';
 $string['africa/porto-novo'] = 'Africa/Porto-Novo';
 $string['africa/sao_tome'] = 'Africa/Sao_Tome';
-$string['africa/timbuktu'] = 'Africa/Timbuktu';
 $string['africa/tripoli'] = 'Africa/Tripoli';
 $string['africa/tunis'] = 'Africa/Tunis';
 $string['africa/windhoek'] = 'Africa/Windhoek';
 $string['america/adak'] = 'America/Adak';
-$string['america/anguilla'] = 'America/Anguilla';
 $string['america/anchorage'] = 'America/Anchorage';
+$string['america/anguilla'] = 'America/Anguilla';
 $string['america/antigua'] = 'America/Antigua';
 $string['america/araguaina'] = 'America/Araguaina';
 $string['america/argentina/buenos_aires'] = 'America/Argentina/Buenos_Aires';
 $string['america/argentina/catamarca'] = 'America/Argentina/Catamarca';
-$string['america/argentina/comodrivadavia'] = 'America/Argentina/ComodRivadavia';
 $string['america/argentina/cordoba'] = 'America/Argentina/Cordoba';
 $string['america/argentina/jujuy'] = 'America/Argentina/Jujuy';
 $string['america/argentina/la_rioja'] = 'America/Argentina/La_Rioja';
 $string['america/argentina/mendoza'] = 'America/Argentina/Mendoza';
 $string['america/argentina/rio_gallegos'] = 'America/Argentina/Rio_Gallegos';
+$string['america/argentina/salta'] = 'America/Argentina/Salta';
 $string['america/argentina/san_juan'] = 'America/Argentina/San_Juan';
+$string['america/argentina/san_luis'] = 'America/Argentina/San_Luis';
 $string['america/argentina/tucuman'] = 'America/Argentina/Tucuman';
 $string['america/argentina/ushuaia'] = 'America/Argentina/Ushuaia';
 $string['america/aruba'] = 'America/Aruba';
 $string['america/asuncion'] = 'America/Asuncion';
+$string['america/atikokan'] = 'America/Atikokan';
 $string['america/bahia'] = 'America/Bahia';
+$string['america/bahia_banderas'] = 'America/Bahia_Banderas';
 $string['america/barbados'] = 'America/Barbados';
 $string['america/belem'] = 'America/Belem';
 $string['america/belize'] = 'America/Belize';
+$string['america/blanc-sablon'] = 'America/Blanc-Sablon';
 $string['america/boa_vista'] = 'America/Boa_Vista';
 $string['america/bogota'] = 'America/Bogota';
 $string['america/boise'] = 'America/Boise';
@@ -106,7 +110,10 @@
 $string['america/caracas'] = 'America/Caracas';
 $string['america/cayenne'] = 'America/Cayenne';
 $string['america/cayman'] = 'America/Cayman';
+$string['america/chicago'] = 'America/Chicago';
+$string['america/chihuahua'] = 'America/Chihuahua';
 $string['america/costa_rica'] = 'America/Costa_Rica';
+$string['america/creston'] = 'America/Creston';
 $string['america/cuiaba'] = 'America/Cuiaba';
 $string['america/curacao'] = 'America/Curacao';
 $string['america/danmarkshavn'] = 'America/Danmarkshavn';
@@ -118,6 +125,7 @@
 $string['america/edmonton'] = 'America/Edmonton';
 $string['america/eirunepe'] = 'America/Eirunepe';
 $string['america/el_salvador'] = 'America/El_Salvador';
+$string['america/fort_nelson'] = 'America/Fort_Nelson';
 $string['america/fortaleza'] = 'America/Fortaleza';
 $string['america/glace_bay'] = 'America/Glace_Bay';
 $string['america/godthab'] = 'America/Godthab';
@@ -131,40 +139,50 @@
 $string['america/halifax'] = 'America/Halifax';
 $string['america/havana'] = 'America/Havana';
 $string['america/hermosillo'] = 'America/Hermosillo';
-$string['america/chicago'] = 'America/Chicago';
-$string['america/chihuahua'] = 'America/Chihuahua';
+$string['america/indiana/indianapolis'] = 'America/Indiana/Indianapolis';
 $string['america/indiana/knox'] = 'America/Indiana/Knox';
 $string['america/indiana/marengo'] = 'America/Indiana/Marengo';
-$string['america/indianapolis'] = 'America/Indianapolis';
+$string['america/indiana/petersburg'] = 'America/Indiana/Petersburg';
+$string['america/indiana/tell_city'] = 'America/Indiana/Tell_City';
 $string['america/indiana/vevay'] = 'America/Indiana/Vevay';
+$string['america/indiana/vincennes'] = 'America/Indiana/Vincennes';
+$string['america/indiana/winamac'] = 'America/Indiana/Winamac';
 $string['america/inuvik'] = 'America/Inuvik';
 $string['america/iqaluit'] = 'America/Iqaluit';
 $string['america/jamaica'] = 'America/Jamaica';
 $string['america/juneau'] = 'America/Juneau';
+$string['america/kentucky/louisville'] = 'America/Kentucky/Louisville';
 $string['america/kentucky/monticello'] = 'America/Kentucky/Monticello';
+$string['america/kralendijk'] = 'America/Kralendijk';
 $string['america/la_paz'] = 'America/La_Paz';
 $string['america/lima'] = 'America/Lima';
 $string['america/los_angeles'] = 'America/Los_Angeles';
-$string['america/louisville'] = 'America/Louisville';
+$string['america/lower_princes'] = 'America/Lower_Princes';
 $string['america/maceio'] = 'America/Maceio';
 $string['america/managua'] = 'America/Managua';
 $string['america/manaus'] = 'America/Manaus';
+$string['america/marigot'] = 'America/Marigot';
 $string['america/martinique'] = 'America/Martinique';
+$string['america/matamoros'] = 'America/Matamoros';
 $string['america/mazatlan'] = 'America/Mazatlan';
 $string['america/menominee'] = 'America/Menominee';
 $string['america/merida'] = 'America/Merida';
+$string['america/metlakatla'] = 'America/Metlakatla';
 $string['america/mexico_city'] = 'America/Mexico_City';
 $string['america/miquelon'] = 'America/Miquelon';
+$string['america/moncton'] = 'America/Moncton';
 $string['america/monterrey'] = 'America/Monterrey';
 $string['america/montevideo'] = 'America/Montevideo';
-$string['america/montreal'] = 'America/Montreal';
 $string['america/montserrat'] = 'America/Montserrat';
 $string['america/nassau'] = 'America/Nassau';
 $string['america/new_york'] = 'America/New_York';
 $string['america/nipigon'] = 'America/Nipigon';
 $string['america/nome'] = 'America/Nome';
 $string['america/noronha'] = 'America/Noronha';
+$string['america/north_dakota/beulah'] = 'America/North_Dakota/Beulah';
 $string['america/north_dakota/center'] = 'America/North_Dakota/Center';
+$string['america/north_dakota/new_salem'] = 'America/North_Dakota/New_Salem';
+$string['america/ojinaga'] = 'America/Ojinaga';
 $string['america/panama'] = 'America/Panama';
 $string['america/pangnirtung'] = 'America/Pangnirtung';
 $string['america/paramaribo'] = 'America/Paramaribo';
@@ -173,15 +191,20 @@
 $string['america/port_of_spain'] = 'America/Port_of_Spain';
 $string['america/porto_velho'] = 'America/Porto_Velho';
 $string['america/puerto_rico'] = 'America/Puerto_Rico';
+$string['america/punta_arenas'] = 'America/Punta_Arenas';
 $string['america/rainy_river'] = 'America/Rainy_River';
 $string['america/rankin_inlet'] = 'America/Rankin_Inlet';
 $string['america/recife'] = 'America/Recife';
 $string['america/regina'] = 'America/Regina';
+$string['america/resolute'] = 'America/Resolute';
 $string['america/rio_branco'] = 'America/Rio_Branco';
+$string['america/santarem'] = 'America/Santarem';
 $string['america/santiago'] = 'America/Santiago';
 $string['america/santo_domingo'] = 'America/Santo_Domingo';
 $string['america/sao_paulo'] = 'America/Sao_Paulo';
 $string['america/scoresbysund'] = 'America/Scoresbysund';
+$string['america/sitka'] = 'America/Sitka';
+$string['america/st_barthelemy'] = 'America/St_Barthelemy';
 $string['america/st_johns'] = 'America/St_Johns';
 $string['america/st_kitts'] = 'America/St_Kitts';
 $string['america/st_lucia'] = 'America/St_Lucia';
@@ -202,12 +225,15 @@
 $string['antarctica/casey'] = 'Antarctica/Casey';
 $string['antarctica/davis'] = 'Antarctica/Davis';
 $string['antarctica/dumontdurville'] = 'Antarctica/DumontDUrville';
+$string['antarctica/macquarie'] = 'Antarctica/Macquarie';
 $string['antarctica/mawson'] = 'Antarctica/Mawson';
 $string['antarctica/mcmurdo'] = 'Antarctica/McMurdo';
 $string['antarctica/palmer'] = 'Antarctica/Palmer';
 $string['antarctica/rothera'] = 'Antarctica/Rothera';
 $string['antarctica/syowa'] = 'Antarctica/Syowa';
+$string['antarctica/troll'] = 'Antarctica/Troll';
 $string['antarctica/vostok'] = 'Antarctica/Vostok';
+$string['arctic/longyearbyen'] = 'Arctic/Longyearbyen';
 $string['asia/aden'] = 'Asia/Aden';
 $string['asia/almaty'] = 'Asia/Almaty';
 $string['asia/amman'] = 'Asia/Amman';
@@ -215,34 +241,39 @@
 $string['asia/aqtau'] = 'Asia/Aqtau';
 $string['asia/aqtobe'] = 'Asia/Aqtobe';
 $string['asia/ashgabat'] = 'Asia/Ashgabat';
+$string['asia/atyrau'] = 'Asia/Atyrau';
 $string['asia/baghdad'] = 'Asia/Baghdad';
 $string['asia/bahrain'] = 'Asia/Bahrain';
 $string['asia/baku'] = 'Asia/Baku';
 $string['asia/bangkok'] = 'Asia/Bangkok';
+$string['asia/barnaul'] = 'Asia/Barnaul';
 $string['asia/beirut'] = 'Asia/Beirut';
 $string['asia/bishkek'] = 'Asia/Bishkek';
 $string['asia/brunei'] = 'Asia/Brunei';
-$string['asia/calcutta'] = 'Asia/Calcutta';
+$string['asia/chita'] = 'Asia/Chita';
+$string['asia/choibalsan'] = 'Asia/Choibalsan';
 $string['asia/colombo'] = 'Asia/Colombo';
 $string['asia/damascus'] = 'Asia/Damascus';
 $string['asia/dhaka'] = 'Asia/Dhaka';
 $string['asia/dili'] = 'Asia/Dili';
 $string['asia/dubai'] = 'Asia/Dubai';
 $string['asia/dushanbe'] = 'Asia/Dushanbe';
+$string['asia/famagusta'] = 'Asia/Famagusta';
 $string['asia/gaza'] = 'Asia/Gaza';
-$string['asia/harbin'] = 'Asia/Harbin';
+$string['asia/hebron'] = 'Asia/Hebron';
+$string['asia/ho_chi_minh'] = 'Asia/Ho_Chi_Minh';
 $string['asia/hong_kong'] = 'Asia/Hong_Kong';
 $string['asia/hovd'] = 'Asia/Hovd';
-$string['asia/choibalsan'] = 'Asia/Choibalsan';
-$string['asia/chongqing'] = 'Asia/Chongqing';
 $string['asia/irkutsk'] = 'Asia/Irkutsk';
+$string['asia/jakarta'] = 'Asia/Jakarta';
 $string['asia/jayapura'] = 'Asia/Jayapura';
 $string['asia/jerusalem'] = 'Asia/Jerusalem';
 $string['asia/kabul'] = 'Asia/Kabul';
 $string['asia/kamchatka'] = 'Asia/Kamchatka';
 $string['asia/karachi'] = 'Asia/Karachi';
-$string['asia/kashgar'] = 'Asia/Kashgar';
-$string['asia/katmandu'] = 'Asia/Katmandu';
+$string['asia/kathmandu'] = 'Asia/Kathmandu';
+$string['asia/khandyga'] = 'Asia/Khandyga';
+$string['asia/kolkata'] = 'Asia/Kolkata';
 $string['asia/krasnoyarsk'] = 'Asia/Krasnoyarsk';
 $string['asia/kuala_lumpur'] = 'Asia/Kuala_Lumpur';
 $string['asia/kuching'] = 'Asia/Kuching';
@@ -253,6 +284,7 @@
 $string['asia/manila'] = 'Asia/Manila';
 $string['asia/muscat'] = 'Asia/Muscat';
 $string['asia/nicosia'] = 'Asia/Nicosia';
+$string['asia/novokuznetsk'] = 'Asia/Novokuznetsk';
 $string['asia/novosibirsk'] = 'Asia/Novosibirsk';
 $string['asia/omsk'] = 'Asia/Omsk';
 $string['asia/oral'] = 'Asia/Oral';
@@ -260,42 +292,47 @@
 $string['asia/pontianak'] = 'Asia/Pontianak';
 $string['asia/pyongyang'] = 'Asia/Pyongyang';
 $string['asia/qatar'] = 'Asia/Qatar';
+$string['asia/qostanay'] = 'Asia/Qostanay';
 $string['asia/qyzylorda'] = 'Asia/Qyzylorda';
-$string['asia/rangoon'] = 'Asia/Rangoon';
 $string['asia/riyadh'] = 'Asia/Riyadh';
-$string['asia/saigon'] = 'Asia/Saigon';
 $string['asia/sakhalin'] = 'Asia/Sakhalin';
 $string['asia/samarkand'] = 'Asia/Samarkand';
 $string['asia/seoul'] = 'Asia/Seoul';
 $string['asia/shanghai'] = 'Asia/Shanghai';
 $string['asia/singapore'] = 'Asia/Singapore';
+$string['asia/srednekolymsk'] = 'Asia/Srednekolymsk';
 $string['asia/taipei'] = 'Asia/Taipei';
 $string['asia/tashkent'] = 'Asia/Tashkent';
 $string['asia/tbilisi'] = 'Asia/Tbilisi';
 $string['asia/tehran'] = 'Asia/Tehran';
 $string['asia/thimphu'] = 'Asia/Thimphu';
 $string['asia/tokyo'] = 'Asia/Tokyo';
+$string['asia/tomsk'] = 'Asia/Tomsk';
 $string['asia/ulaanbaatar'] = 'Asia/Ulaanbaatar';
 $string['asia/urumqi'] = 'Asia/Urumqi';
+$string['asia/ust-nera'] = 'Asia/Ust-Nera';
 $string['asia/vientiane'] = 'Asia/Vientiane';
 $string['asia/vladivostok'] = 'Asia/Vladivostok';
 $string['asia/yakutsk'] = 'Asia/Yakutsk';
+$string['asia/yangon'] = 'Asia/Yangon';
 $string['asia/yekaterinburg'] = 'Asia/Yekaterinburg';
 $string['asia/yerevan'] = 'Asia/Yerevan';
 $string['atlantic/azores'] = 'Atlantic/Azores';
 $string['atlantic/bermuda'] = 'Atlantic/Bermuda';
 $string['atlantic/canary'] = 'Atlantic/Canary';
 $string['atlantic/cape_verde'] = 'Atlantic/Cape_Verde';
-$string['atlantic/faeroe'] = 'Atlantic/Faeroe';
+$string['atlantic/faroe'] = 'Atlantic/Faroe';
 $string['atlantic/madeira'] = 'Atlantic/Madeira';
 $string['atlantic/reykjavik'] = 'Atlantic/Reykjavik';
 $string['atlantic/south_georgia'] = 'Atlantic/South_Georgia';
-$string['atlantic/stanley'] = 'Atlantic/Stanley';
 $string['atlantic/st_helena'] = 'Atlantic/St_Helena';
+$string['atlantic/stanley'] = 'Atlantic/Stanley';
 $string['australia/adelaide'] = 'Australia/Adelaide';
 $string['australia/brisbane'] = 'Australia/Brisbane';
 $string['australia/broken_hill'] = 'Australia/Broken_Hill';
+$string['australia/currie'] = 'Australia/Currie';
 $string['australia/darwin'] = 'Australia/Darwin';
+$string['australia/eucla'] = 'Australia/Eucla';
 $string['australia/hobart'] = 'Australia/Hobart';
 $string['australia/lindeman'] = 'Australia/Lindeman';
 $string['australia/lord_howe'] = 'Australia/Lord_Howe';
@@ -304,51 +341,69 @@
 $string['australia/sydney'] = 'Australia/Sydney';
 $string['europe/amsterdam'] = 'Europe/Amsterdam';
 $string['europe/andorra'] = 'Europe/Andorra';
+$string['europe/astrakhan'] = 'Europe/Astrakhan';
 $string['europe/athens'] = 'Europe/Athens';
-$string['europe/belfast'] = 'Europe/Belfast';
 $string['europe/belgrade'] = 'Europe/Belgrade';
 $string['europe/berlin'] = 'Europe/Berlin';
+$string['europe/bratislava'] = 'Europe/Bratislava';
 $string['europe/brussels'] = 'Europe/Brussels';
-$string['europe/budapest'] = 'Europe/Budapest';
 $string['europe/bucharest'] = 'Europe/Bucharest';
+$string['europe/budapest'] = 'Europe/Budapest';
+$string['europe/busingen'] = 'Europe/Busingen';
+$string['europe/chisinau'] = 'Europe/Chisinau';
 $string['europe/copenhagen'] = 'Europe/Copenhagen';
 $string['europe/dublin'] = 'Europe/Dublin';
 $string['europe/gibraltar'] = 'Europe/Gibraltar';
+$string['europe/guernsey'] = 'Europe/Guernsey';
 $string['europe/helsinki'] = 'Europe/Helsinki';
-$string['europe/chisinau'] = 'Europe/Chisinau';
+$string['europe/isle_of_man'] = 'Europe/Isle_of_Man';
 $string['europe/istanbul'] = 'Europe/Istanbul';
+$string['europe/jersey'] = 'Europe/Jersey';
 $string['europe/kaliningrad'] = 'Europe/Kaliningrad';
 $string['europe/kiev'] = 'Europe/Kiev';
+$string['europe/kirov'] = 'Europe/Kirov';
 $string['europe/lisbon'] = 'Europe/Lisbon';
+$string['europe/ljubljana'] = 'Europe/Ljubljana';
 $string['europe/london'] = 'Europe/London';
 $string['europe/luxembourg'] = 'Europe/Luxembourg';
 $string['europe/madrid'] = 'Europe/Madrid';
 $string['europe/malta'] = 'Europe/Malta';
+$string['europe/mariehamn'] = 'Europe/Mariehamn';
 $string['europe/minsk'] = 'Europe/Minsk';
 $string['europe/monaco'] = 'Europe/Monaco';
 $string['europe/moscow'] = 'Europe/Moscow';
 $string['europe/oslo'] = 'Europe/Oslo';
 $string['europe/paris'] = 'Europe/Paris';
+$string['europe/podgorica'] = 'Europe/Podgorica';
 $string['europe/prague'] = 'Europe/Prague';
 $string['europe/riga'] = 'Europe/Riga';
 $string['europe/rome'] = 'Europe/Rome';
 $string['europe/samara'] = 'Europe/Samara';
+$string['europe/san_marino'] = 'Europe/San_Marino';
+$string['europe/sarajevo'] = 'Europe/Sarajevo';
+$string['europe/saratov'] = 'Europe/Saratov';
 $string['europe/simferopol'] = 'Europe/Simferopol';
+$string['europe/skopje'] = 'Europe/Skopje';
 $string['europe/sofia'] = 'Europe/Sofia';
 $string['europe/stockholm'] = 'Europe/Stockholm';
 $string['europe/tallinn'] = 'Europe/Tallinn';
 $string['europe/tirane'] = 'Europe/Tirane';
+$string['europe/ulyanovsk'] = 'Europe/Ulyanovsk';
 $string['europe/uzhgorod'] = 'Europe/Uzhgorod';
 $string['europe/vaduz'] = 'Europe/Vaduz';
+$string['europe/vatican'] = 'Europe/Vatican';
 $string['europe/vienna'] = 'Europe/Vienna';
 $string['europe/vilnius'] = 'Europe/Vilnius';
+$string['europe/volgograd'] = 'Europe/Volgograd';
 $string['europe/warsaw'] = 'Europe/Warsaw';
+$string['europe/zagreb'] = 'Europe/Zagreb';
 $string['europe/zaporozhye'] = 'Europe/Zaporozhye';
 $string['europe/zurich'] = 'Europe/Zurich';
 $string['indian/antananarivo'] = 'Indian/Antananarivo';
-$string['indian/comoro'] = 'Indian/Comoro';
 $string['indian/chagos'] = 'Indian/Chagos';
 $string['indian/christmas'] = 'Indian/Christmas';
+$string['indian/cocos'] = 'Indian/Cocos';
+$string['indian/comoro'] = 'Indian/Comoro';
 $string['indian/kerguelen'] = 'Indian/Kerguelen';
 $string['indian/mahe'] = 'Indian/Mahe';
 $string['indian/maldives'] = 'Indian/Maldives';
@@ -357,6 +412,9 @@
 $string['indian/reunion'] = 'Indian/Reunion';
 $string['pacific/apia'] = 'Pacific/Apia';
 $string['pacific/auckland'] = 'Pacific/Auckland';
+$string['pacific/bougainville'] = 'Pacific/Bougainville';
+$string['pacific/chatham'] = 'Pacific/Chatham';
+$string['pacific/chuuk'] = 'Pacific/Chuuk';
 $string['pacific/easter'] = 'Pacific/Easter';
 $string['pacific/efate'] = 'Pacific/Efate';
 $string['pacific/enderbury'] = 'Pacific/Enderbury';
@@ -368,7 +426,6 @@
 $string['pacific/guadalcanal'] = 'Pacific/Guadalcanal';
 $string['pacific/guam'] = 'Pacific/Guam';
 $string['pacific/honolulu'] = 'Pacific/Honolulu';
-$string['pacific/chatham'] = 'Pacific/Chatham';
 $string['pacific/kiritimati'] = 'Pacific/Kiritimati';
 $string['pacific/kosrae'] = 'Pacific/Kosrae';
 $string['pacific/kwajalein'] = 'Pacific/Kwajalein';
@@ -382,14 +439,33 @@
 $string['pacific/pago_pago'] = 'Pacific/Pago_Pago';
 $string['pacific/palau'] = 'Pacific/Palau';
 $string['pacific/pitcairn'] = 'Pacific/Pitcairn';
-$string['pacific/ponape'] = 'Pacific/Ponape';
+$string['pacific/pohnpei'] = 'Pacific/Pohnpei';
 $string['pacific/port_moresby'] = 'Pacific/Port_Moresby';
 $string['pacific/rarotonga'] = 'Pacific/Rarotonga';
 $string['pacific/saipan'] = 'Pacific/Saipan';
 $string['pacific/tahiti'] = 'Pacific/Tahiti';
 $string['pacific/tarawa'] = 'Pacific/Tarawa';
 $string['pacific/tongatapu'] = 'Pacific/Tongatapu';
-$string['pacific/truk'] = 'Pacific/Truk';
 $string['pacific/wake'] = 'Pacific/Wake';
 $string['pacific/wallis'] = 'Pacific/Wallis';
+$string['utc'] = 'UTC';
+// The following identifiers have been previous removed from TimeDateZone::listIdentifiers and are no longer used.
+// Deprecated since Moodle 3.9.
+$string['africa/asmera'] = 'Africa/Asmera';
+$string['africa/timbuktu'] = 'Africa/Timbuktu';
+$string['america/argentina/comodrivadavia'] = 'America/Argentina/ComodRivadavia';
+$string['america/indianapolis'] = 'America/Indianapolis';
+$string['america/louisville'] = 'America/Louisville';
+$string['america/montreal'] = 'America/Montreal';
+$string['asia/calcutta'] = 'Asia/Calcutta';
+$string['asia/chongqing'] = 'Asia/Chongqing';
+$string['asia/harbin'] = 'Asia/Harbin';
+$string['asia/kashgar'] = 'Asia/Kashgar';
+$string['asia/katmandu'] = 'Asia/Katmandu';
+$string['asia/rangoon'] = 'Asia/Rangoon';
+$string['asia/saigon'] = 'Asia/Saigon';
+$string['atlantic/faeroe'] = 'Atlantic/Faeroe';
+$string['europe/belfast'] = 'Europe/Belfast';
+$string['pacific/ponape'] = 'Pacific/Ponape';
+$string['pacific/truk'] = 'Pacific/Truk';
 $string['pacific/yap'] = 'Pacific/Yap';
diff --git a/lang/en/user.php b/lang/en/user.php
index 56777bb11e1aa..aefc750d36740 100644
--- a/lang/en/user.php
+++ b/lang/en/user.php
@@ -47,7 +47,7 @@
 $string['privacy:metadata:devicename'] = 'The device name, occam or iPhone etc..';
 $string['privacy:metadata:devicetablesummary'] = 'This table stores user\'s mobile devices information in order to send PUSH notifications';
 $string['privacy:metadata:email'] = 'An email address for contact.';
-$string['privacy:metadata:emailstop'] = 'A preference to stop email being sent to the user.';
+$string['privacy:metadata:emailstop'] = 'A preference to disable notifications from being sent to the user.';
 $string['privacy:metadata:fieldid'] = 'The ID relating to the custom user field.';
 $string['privacy:metadata:filelink'] = 'There are multiple different files for the user stored in the files table.';
 $string['privacy:metadata:firstaccess'] = 'The time that this user first accessed the site.';
diff --git a/lib/accesslib.php b/lib/accesslib.php
index e80ba19c445f0..b3f9a41356ccd 100644
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -5254,6 +5254,15 @@ public function set_locked(bool $locked) {
         $this->_locked = $locked;
         $DB->set_field('context', 'locked', (int) $locked, ['id' => $this->id]);
         $this->mark_dirty();
+
+        if ($locked) {
+            $eventname = '\\core\\event\\context_locked';
+        } else {
+            $eventname = '\\core\\event\\context_unlocked';
+        }
+        $event = $eventname::create(['context' => $this, 'objectid' => $this->id]);
+        $event->trigger();
+
         self::reset_caches();
 
         return $this;
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 07f66e4aa9c2e..ef32223ccfd26 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2574,6 +2574,19 @@ public function output_html($data, $query='') {
         $editor->use_editor($this->get_id(), array('noclean'=>true));
         return parent::output_html($data, $query);
     }
+
+    /**
+     * Checks if data has empty html.
+     *
+     * @param string $data
+     * @return string Empty when no errors.
+     */
+    public function write_setting($data) {
+        if (trim(html_to_text($data)) === '') {
+            $data = '';
+        }
+        return parent::write_setting($data);
+    }
 }
 
 
@@ -8382,10 +8395,12 @@ function admin_get_root($reload=false, $requirefulltree=true) {
  * @return array $settingsoutput The names and values of the changed settings
  */
 function admin_apply_default_settings($node=null, $unconditional=true, $admindefaultsettings=array(), $settingsoutput=array()) {
+    $counter = 0;
 
     if (is_null($node)) {
         core_plugin_manager::reset_caches();
         $node = admin_get_root(true, true);
+        $counter = count($settingsoutput);
     }
 
     if ($node instanceof admin_category) {
@@ -8398,7 +8413,7 @@ function admin_apply_default_settings($node=null, $unconditional=true, $admindef
 
     } else if ($node instanceof admin_settingpage) {
         foreach ($node->settings as $setting) {
-            if (!$unconditional and !is_null($setting->get_setting())) {
+            if (!$unconditional && !is_null($setting->get_setting())) {
                 // Do not override existing defaults.
                 continue;
             }
@@ -8424,7 +8439,7 @@ function admin_apply_default_settings($node=null, $unconditional=true, $admindef
     }
 
     // Call this function recursively until all settings are processed.
-    if (($node instanceof admin_root) && (!empty($admindefaultsettings))) {
+    if (($node instanceof admin_root) && ($counter != count($settingsoutput))) {
         $settingsoutput = admin_apply_default_settings(null, $unconditional, $admindefaultsettings, $settingsoutput);
     }
     // Just in case somebody modifies the list of active plugins directly.
diff --git a/lib/adodb/drivers/adodb-mssql.inc.php b/lib/adodb/drivers/adodb-mssql.inc.php
index 068dffce0d956..3e6de38f7cf72 100644
--- a/lib/adodb/drivers/adodb-mssql.inc.php
+++ b/lib/adodb/drivers/adodb-mssql.inc.php
@@ -680,7 +680,9 @@ function Concat()
                 $arr = $args;
             }
 
-            array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+            array_walk($arr, function(&$v) {
+                $v = "CAST(" . $v . " AS VARCHAR(255))";
+            });
             $s = implode('+',$arr);
             if (sizeof($arr) > 0) return "$s";
 
diff --git a/lib/adodb/drivers/adodb-mssqlnative.inc.php b/lib/adodb/drivers/adodb-mssqlnative.inc.php
index 23eb2c03d4cec..e70219b19775e 100644
--- a/lib/adodb/drivers/adodb-mssqlnative.inc.php
+++ b/lib/adodb/drivers/adodb-mssqlnative.inc.php
@@ -527,7 +527,9 @@ function Concat()
 			$arr = $args;
 		}
 
-		array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+		array_walk($arr, function(&$v) {
+			$v = "CAST(" . $v . " AS VARCHAR(255))";
+		});
 		$s = implode('+',$arr);
 		if (sizeof($arr) > 0) return "$s";
 
diff --git a/lib/adodb/drivers/adodb-postgres8.inc.php b/lib/adodb/drivers/adodb-postgres8.inc.php
index 54b14abbce0a2..1c77796d7d712 100644
--- a/lib/adodb/drivers/adodb-postgres8.inc.php
+++ b/lib/adodb/drivers/adodb-postgres8.inc.php
@@ -20,6 +20,12 @@ class ADODB_postgres8 extends ADODB_postgres7
 {
 	var $databaseType = 'postgres8';
 
+	// From PostgreSQL 8.0 onwards, the adsrc column used in earlier versions to
+	// retrieve the default value is obsolete and should not be used (see #562).
+	var $metaDefaultsSQL = "SELECT d.adnum as num, pg_get_expr(d.adbin, d.adrelid) as def
+		FROM pg_attrdef d, pg_class c 
+		WHERE d.adrelid=c.oid AND c.relname='%s' 
+		ORDER BY d.adnum";
 
 	/**
 	 * Retrieve last inserted ID
diff --git a/lib/adodb/drivers/adodb-text.inc.php b/lib/adodb/drivers/adodb-text.inc.php
index 8844d20e14f91..56a523934019e 100644
--- a/lib/adodb/drivers/adodb-text.inc.php
+++ b/lib/adodb/drivers/adodb-text.inc.php
@@ -260,7 +260,7 @@ function _query($sql,$input_arr,$eval=false)
 					$projnames = array($n);
 
 					reset($where_arr);
-					while (list($k_a,$a) = each($where_arr)) {
+					foreach ($where_arr as $k_a => $a) {
 						if ($i == 0 && $this->_skiprow1) {
 							$projarray[] = array($n);
 							continue;
diff --git a/lib/adodb/readme_moodle.txt b/lib/adodb/readme_moodle.txt
index 00ff24052c0ac..8d900f5d56231 100644
--- a/lib/adodb/readme_moodle.txt
+++ b/lib/adodb/readme_moodle.txt
@@ -32,5 +32,7 @@ Our changes:
    Check if fixed upstream during the next upgrade and remove this note. (8638b3f1441d4b928)
  * MDL-58546 replaced each() with foreach for PHP 7.2 compatibility.
    pull request upstream: https://github.com/ADOdb/ADOdb/pull/373
+ * MDL-65920 solved PHP 7.2 deprecations; create_function() and each().
+ * MDL-67414 Fix to make the library PostgreSQL 12.x compliant (upstream: a4876f100602c2ce4).
 
-skodak, iarenaza, moodler, stronk7, abgreeve, lameze, ankitagarwal, marinaglancy
+skodak, iarenaza, moodler, stronk7, abgreeve, lameze, ankitagarwal, marinaglancy, matteo
diff --git a/lib/amd/build/form-autocomplete.min.js b/lib/amd/build/form-autocomplete.min.js
index 0ad553d2862b0..626ef92363016 100644
--- a/lib/amd/build/form-autocomplete.min.js
+++ b/lib/amd/build/form-autocomplete.min.js
@@ -1 +1 @@
-define(["jquery","core/log","core/str","core/templates","core/notification","core/loadingicon"],function(a,b,c,d,e,f){var g={DOWN:40,ENTER:13,SPACE:32,ESCAPE:27,COMMA:44,UP:38},h=a.now(),i=function(b,c){var d=a(document.getElementById(c.selectionId)),e=d.children("[aria-selected=true]").length;for(b%=e;b<0;)b+=e;var f=a(d.children("[aria-selected=true]").get(b)),g=c.selectionId+"-"+b;return d.children().attr("data-active-selection",!1).attr("id",""),f.attr("data-active-selection",!0).attr("id",g),d.attr("aria-activedescendant",g),a.Deferred().resolve()},j=function(b,c,f){var g="form-autocomplete-updateSelectionList-"+c.inputId;M.util.js_pending(g);var h=[],j=a(document.getElementById(c.selectionId)),k=j.attr("aria-activedescendant"),l=!1;k&&(l=a(document.getElementById(k)).attr("data-value")),f.children("option").each(function(b,c){if(a(c).prop("selected")){var d;d=a(c).data("html")?a(c).data("html"):a(c).html(),h.push({label:d,value:a(c).attr("value")})}});var m=a.extend({items:h},b,c);return d.render("core/form_autocomplete_selection",m).then(function(b,e){return d.replaceNodeContents(j,b,e),l!==!1&&j.children("[aria-selected=true]").each(function(b,d){a(d).attr("data-value")===l&&i(b,c)}),l}).then(function(){return M.util.js_complete(g)})["catch"](e.exception)},k=function(a){"undefined"!=typeof M.core_formchangechecker&&M.core_formchangechecker.set_form_changed(),a.change()},l=function(b,c,d,e){var f=a(d).attr("data-value");return b.multiple&&e.children("option").each(function(b,c){a(c).attr("value")==f&&(a(c).prop("selected",!1),a(c).attr("data-iscustom")&&a(c).remove())}),j(b,c,e).then(function(){k(e)})},m=function(b,c){var d=a(document.getElementById(c.inputId)),e=a(document.getElementById(c.suggestionsId)),f=e.children("[aria-hidden=false]").length;for(b%=f;b<0;)b+=f;var g=a(e.children("[aria-hidden=false]").get(b)),h=a(e.children("[role=option]")).index(g),i=c.suggestionsId+"-"+h;e.children().attr("aria-selected",!1).attr("id",""),g.attr("aria-selected",!0).attr("id",i),d.attr("aria-activedescendant",i);var j=g.offset().top-e.offset().top+e.scrollTop()-e.height()/2;return e.animate({scrollTop:j},100).promise()},n=function(b){var c=a(document.getElementById(b.suggestionsId)),d=c.children("[aria-selected=true]"),e=c.children("[aria-hidden=false]").index(d);return m(e+1,b)},o=function(b){var c=a(document.getElementById(b.selectionId)),d=c.children("[data-active-selection=true]");if(!d)return i(0,b);var e=c.children("[aria-selected=true]").index(d);return i(e-1,b)},p=function(b){var c=a(document.getElementById(b.selectionId)),d=c.children("[data-active-selection=true]"),e=0;return d?(e=c.children("[aria-selected=true]").index(d),e+=1):e=0,i(e,b)},q=function(b){var c=a(document.getElementById(b.suggestionsId)),d=c.children("[aria-selected=true]"),e=c.children("[aria-hidden=false]").index(d);return m(e-1,b)},r=function(b){var c=a(document.getElementById(b.inputId)),d=a(document.getElementById(b.suggestionsId));return c.attr("aria-expanded",!1).attr("aria-activedescendant",b.selectionId),d.hide().attr("aria-hidden",!0),a.Deferred().resolve()},s=function(b,f,g,h){var i="form-autocomplete-updateSuggestions-"+f.inputId;M.util.js_pending(i);var j=a(document.getElementById(f.inputId)),k=a(document.getElementById(f.suggestionsId)),l=!1,n=[];h.children("option").each(function(b,c){a(c).prop("selected")!==!0&&(n[n.length]={label:c.innerHTML,value:a(c).attr("value")})});var o=f.caseSensitive?g:g.toLocaleLowerCase(),p=a.extend({options:n},b,f),q=d.render("core/form_autocomplete_suggestions",p).then(function(e,g){return d.replaceNode(k,e,g),k=a(document.getElementById(f.suggestionsId)),k.show().attr("aria-hidden",!1),k.children().each(function(c,d){d=a(d),b.caseSensitive&&d.text().indexOf(o)>-1||!b.caseSensitive&&d.text().toLocaleLowerCase().indexOf(o)>-1?(d.show().attr("aria-hidden",!1),l=!0):d.hide().attr("aria-hidden",!0)}),j.attr("aria-expanded",!0),h.attr("data-notice")?k.html(h.attr("data-notice")):l?b.tags||m(0,f):c.get_string("nosuggestions","form").done(function(a){k.html(a)}),k}).then(function(){return M.util.js_complete(i)})["catch"](e.exception);return q},t=function(b,c,d){var e=a(document.getElementById(c.inputId)),f=e.val(),g=f.split(","),h=!1;return a.each(g,function(c,e){if(e=e.trim(),""!==e&&(b.multiple||d.children("option").prop("selected",!1),d.children("option").each(function(b,c){a(c).attr("value")==e&&(h=!0,a(c).prop("selected",!0))}),!h)){var f=a("<option>");f.append(document.createTextNode(e)),f.attr("value",e),d.append(f),f.prop("selected",!0),f.attr("data-iscustom",!0)}}),j(b,c,d).then(function(){k(d)}).then(function(){e.val("")}).then(function(){return r(c)})},u=function(b,c,d){var e=a(document.getElementById(c.inputId)),f=a(document.getElementById(c.suggestionsId)),g=f.children("[aria-selected=true]").attr("data-value");return b.multiple||d.children("option").prop("selected",!1),d.children("option").each(function(b,c){a(c).attr("value")==g&&a(c).prop("selected",!0)}),j(b,c,d).then(function(){k(d)}).then(function(){return b.closeSuggestionsOnSelect?(e.val(""),r(c)):(e.focus(),s(b,c,e.val(),d))})},v=function(b,c,d,e,g){var h=x("updateAjax"),i=a(document.getElementById(d.selectId)).parent();f.addIconToContainerRemoveOnCompletion(i,h);var j=a(b.currentTarget).val();return g.transport(c.selector,j,function(b){var f=g.processResults(c.selector,b),i=[];if(e.children("option").each(function(b,c){c=a(c),c.prop("selected")?i.push(String(c.attr("value"))):c.remove()}),!c.multiple&&0===e.children("option").length){var j=a("<option>");e.append(j)}a.isArray(f)?(a.each(f,function(b,c){if(i.indexOf(String(c.value))===-1){var d=a("<option>");d.append(c.label),d.attr("value",c.value),e.append(d)}}),e.attr("data-notice","")):e.attr("data-notice",f),h.resolve(s(c,d,"",e))},function(a){h.reject(a)}),h},w=function(b,c,d){var f=a(document.getElementById(c.inputId));if(f.on("keydown",function(e){var h=x("addNavigation-"+c.inputId+"-"+e.keyCode);switch(e.keyCode){case g.DOWN:return b.showSuggestions?("true"===f.attr("aria-expanded")?h.resolve(n(c)):!f.val()&&b.ajax?require([b.ajax],function(a){h.resolve(v(e,b,c,d,a))}):h.resolve(s(b,c,f.val(),d)),e.preventDefault(),!1):(h.resolve(),!0);case g.UP:return h.resolve(q(c)),e.preventDefault(),!1;case g.ENTER:var i=a(document.getElementById(c.suggestionsId));return"true"===f.attr("aria-expanded")&&i.children("[aria-selected=true]").length>0?h.resolve(u(b,c,d)):b.tags?h.resolve(t(b,c,d)):h.resolve(),e.preventDefault(),!1;case g.ESCAPE:return"true"===f.attr("aria-expanded")?h.resolve(r(c)):h.resolve(),e.preventDefault(),!1}return h.resolve(),!0}),f.on("keypress",function(a){return a.keyCode!==g.COMMA||(b.tags&&x("keypress-"+a.keyCode).resolve(t(b,c,d)),a.preventDefault(),!1)}),f.closest("form").on("submit",function(){return b.tags&&x("form-autocomplete-submit").resolve(t(b,c,d)),!0}),f.on("blur",function(){var e=x("form-autocomplete-blur");window.setTimeout(function(){var g=a(document.activeElement);g.attr("id")!=f.attr("id")&&a("#"+c.inputId).length&&(b.tags&&e.then(function(){return t(b,c,d)})["catch"](),e.then(function(){return r(c)})["catch"]()),e.resolve()},500)}),b.showSuggestions){var h=a(document.getElementById(c.downArrowId));h.on("click",function(a){var e=x("form-autocomplete-show-suggestions");f.focus(),!f.val()&&b.ajax?require([b.ajax],function(f){e.resolve(v(a,b,c,d,f))}):e.resolve(s(b,c,f.val(),d))})}var i=a(document.getElementById(c.suggestionsId));i.parent().prop("onclick",null).off("click"),i.parent().on("click","[role=option]",function(e){var f=x("form-autocomplete-parent"),g=a(e.currentTarget).closest("[role=option]"),h=a(document.getElementById(c.suggestionsId)),i=h.children("[aria-hidden=false]").index(g);m(i,c).then(function(){return u(b,c,d)}).then(function(){return f.resolve()})["catch"]()});var j=a(document.getElementById(c.selectionId));j.on("click","[role=listitem]",function(e){var f=x("form-autocomplete-clicks");f.resolve(l(b,c,a(e.currentTarget),d))}),j.on("keydown",function(e){var f=x("form-autocomplete-keydown-"+e.keyCode);switch(e.keyCode){case g.DOWN:return e.preventDefault(),f.resolve(p(c)),!1;case g.UP:return e.preventDefault(),f.resolve(o(c)),!1;case g.SPACE:case g.ENTER:var h=a(document.getElementById(c.selectionId)).children("[data-active-selection=true]");return h&&(e.preventDefault(),f.resolve(l(b,c,h,d))),!1}return f.resolve(),!0}),b.showSuggestions&&(b.ajax?require([b.ajax],function(a){var g=null,h=!1,i="autocomplete-throttledhandler",j=function(f){g=null,h=!0,v(f,b,c,d,a).then(function(){return null===g&&M.util.js_complete(i),h=!1,arguments[0]})["catch"](e.exception)},k=function(a){return window.clearTimeout(g),h?void(g=window.setTimeout(k.bind(this,a),100)):(null===g&&M.util.js_pending(i),void(g=window.setTimeout(j.bind(this,a),300)))};f.on("input",k)}):f.on("input",function(e){var f=a(e.currentTarget).val(),g=a(e.currentTarget).data("last-value");g!==f&&s(b,c,f,d),a(e.currentTarget).data("last-value",f)}))},x=function(b){var c="form-autocomplete:"+b;M.util.js_pending(c);var d=a.Deferred();return d.then(function(){return M.util.js_complete(c),arguments[0]})["catch"](e.exception),d};return{enhance:function(f,g,i,k,l,m,n,o){var p={selector:f,tags:!1,ajax:!1,placeholder:k,caseSensitive:!1,showSuggestions:!0,noSelectionString:n},q="autocomplete-setup-"+f;M.util.js_pending(q),"undefined"!=typeof g&&(p.tags=g),"undefined"!=typeof i&&(p.ajax=i),"undefined"!=typeof l&&(p.caseSensitive=l),"undefined"!=typeof m&&(p.showSuggestions=m),"undefined"==typeof n&&c.get_string("noselection","form").done(function(a){p.noSelectionString=a}).fail(e.exception);var r=a(f);if(!r)return b.debug("Selector not found: "+f),M.util.js_complete(q),!1;r.css("visibility","hidden").attr("aria-hidden",!0);var s={selectId:r.attr("id"),inputId:"form_autocomplete_input-"+h,suggestionsId:"form_autocomplete_suggestions-"+h,selectionId:"form_autocomplete_selection-"+h,downArrowId:"form_autocomplete_downarrow-"+h};h++,p.multiple=r.attr("multiple"),"undefined"!=typeof o?p.closeSuggestionsOnSelect=o:p.closeSuggestionsOnSelect=!p.multiple;var t=a("[for="+s.selectId+"]"),u=[];r.children("option").each(function(b,c){u[b]={label:c.innerHTML,value:a(c).attr("value")}});var v=a.extend({},p,s);v.options=u,v.items=[];var x="",y=d.render("core/form_autocomplete_input",v).then(function(a,b){return x+=b,a}),z=d.render("core/form_autocomplete_suggestions",v).then(function(a,b){return x+=b,a}),A=d.render("core/form_autocomplete_selection",v).then(function(a,b){return x+=b,a});return a.when(y,z,A).then(function(b,c,e){r.hide(),r.after(c),r.after(b),r.after(e),d.runTemplateJS(x),t.attr("for",s.inputId),w(p,s,r);var f=a(document.getElementById(s.suggestionsId));f.hide().attr("aria-hidden",!0)}).then(function(){return j(p,s,r)}).then(function(){return M.util.js_complete(q)})["catch"](function(a){M.util.js_complete(q),e.exception(a)})}}});
\ No newline at end of file
+define(["jquery","core/log","core/str","core/templates","core/notification","core/loadingicon"],function(a,b,c,d,e,f){var g={DOWN:40,ENTER:13,SPACE:32,ESCAPE:27,COMMA:44,UP:38},h=a.now(),i=function(b,c){var d=a(document.getElementById(c.selectionId)),e=d.children("[aria-selected=true]").length;for(b%=e;b<0;)b+=e;var f=a(d.children("[aria-selected=true]").get(b)),g=c.selectionId+"-"+b;return d.children().attr("data-active-selection",!1).attr("id",""),f.attr("data-active-selection",!0).attr("id",g),d.attr("aria-activedescendant",g),a.Deferred().resolve()},j=function(b,c,f){var g="form-autocomplete-updateSelectionList-"+c.inputId;M.util.js_pending(g);var h=[],j=a(document.getElementById(c.selectionId)),k=j.attr("aria-activedescendant"),l=!1;k&&(l=a(document.getElementById(k)).attr("data-value")),f.children("option").each(function(b,c){if(a(c).prop("selected")){var d;d=a(c).data("html")?a(c).data("html"):a(c).html(),""!==d&&h.push({label:d,value:a(c).attr("value")})}});var m=a.extend({items:h},b,c);return d.render("core/form_autocomplete_selection_items",m).then(function(b,e){return d.replaceNodeContents(j,b,e),l!==!1&&j.children("[aria-selected=true]").each(function(b,d){a(d).attr("data-value")===l&&i(b,c)}),l}).then(function(){return M.util.js_complete(g)})["catch"](e.exception)},k=function(a){"undefined"!=typeof M.core_formchangechecker&&M.core_formchangechecker.set_form_changed(),a.change()},l=function(b,c,d,e){var f=a(d).attr("data-value");return e.children("option").each(function(b,c){a(c).attr("value")==f&&(a(c).prop("selected",!1),a(c).attr("data-iscustom")&&a(c).remove())}),j(b,c,e).then(function(){k(e)})},m=function(b,c){var d=a(document.getElementById(c.inputId)),e=a(document.getElementById(c.suggestionsId)),f=e.children("[aria-hidden=false]").length;for(b%=f;b<0;)b+=f;var g=a(e.children("[aria-hidden=false]").get(b)),h=a(e.children("[role=option]")).index(g),i=c.suggestionsId+"-"+h;e.children().attr("aria-selected",!1).attr("id",""),g.attr("aria-selected",!0).attr("id",i),d.attr("aria-activedescendant",i);var j=g.offset().top-e.offset().top+e.scrollTop()-e.height()/2;return e.animate({scrollTop:j},100).promise()},n=function(b){var c=a(document.getElementById(b.suggestionsId)),d=c.children("[aria-selected=true]"),e=c.children("[aria-hidden=false]").index(d);return m(e+1,b)},o=function(b){var c=a(document.getElementById(b.selectionId)),d=c.children("[data-active-selection=true]");if(!d)return i(0,b);var e=c.children("[aria-selected=true]").index(d);return i(e-1,b)},p=function(b){var c=a(document.getElementById(b.selectionId)),d=c.children("[data-active-selection=true]"),e=0;return d?(e=c.children("[aria-selected=true]").index(d),e+=1):e=0,i(e,b)},q=function(b){var c=a(document.getElementById(b.suggestionsId)),d=c.children("[aria-selected=true]"),e=c.children("[aria-hidden=false]").index(d);return m(e-1,b)},r=function(b){var c=a(document.getElementById(b.inputId)),d=a(document.getElementById(b.suggestionsId));return c.attr("aria-expanded",!1).attr("aria-activedescendant",b.selectionId),d.hide().attr("aria-hidden",!0),a.Deferred().resolve()},s=function(b,f,g,h){var i="form-autocomplete-updateSuggestions-"+f.inputId;M.util.js_pending(i);var j=a(document.getElementById(f.inputId)),k=a(document.getElementById(f.suggestionsId)),l=!1,n=[];h.children("option").each(function(b,c){a(c).prop("selected")!==!0&&(n[n.length]={label:c.innerHTML,value:a(c).attr("value")})});var o=f.caseSensitive?g:g.toLocaleLowerCase(),p=a.extend({options:n},b,f),q=d.render("core/form_autocomplete_suggestions",p).then(function(e,g){return d.replaceNode(k,e,g),k=a(document.getElementById(f.suggestionsId)),k.show().attr("aria-hidden",!1),k.children().each(function(c,d){d=a(d),b.caseSensitive&&d.text().indexOf(o)>-1||!b.caseSensitive&&d.text().toLocaleLowerCase().indexOf(o)>-1?(d.show().attr("aria-hidden",!1),l=!0):d.hide().attr("aria-hidden",!0)}),j.attr("aria-expanded",!0),h.attr("data-notice")?k.html(h.attr("data-notice")):l?b.tags||m(0,f):c.get_string("nosuggestions","form").done(function(a){k.html(a)}),k}).then(function(){return M.util.js_complete(i)})["catch"](e.exception);return q},t=function(b,c,d){var e=a(document.getElementById(c.inputId)),f=e.val(),g=f.split(","),h=!1;return a.each(g,function(c,e){if(e=e.trim(),""!==e&&(b.multiple||d.children("option").prop("selected",!1),d.children("option").each(function(b,c){a(c).attr("value")==e&&(h=!0,a(c).prop("selected",!0))}),!h)){var f=a("<option>");f.append(document.createTextNode(e)),f.attr("value",e),d.append(f),f.prop("selected",!0),f.attr("data-iscustom",!0)}}),j(b,c,d).then(function(){k(d)}).then(function(){e.val("")}).then(function(){return r(c)})},u=function(b,c,d){var e=a(document.getElementById(c.inputId)),f=a(document.getElementById(c.suggestionsId)),g=f.children("[aria-selected=true]").attr("data-value");return b.multiple||d.children("option").prop("selected",!1),d.children("option").each(function(b,c){a(c).attr("value")==g&&a(c).prop("selected",!0)}),j(b,c,d).then(function(){k(d)}).then(function(){return b.closeSuggestionsOnSelect?(e.val(""),r(c)):(e.focus(),s(b,c,e.val(),d))})},v=function(b,c,d,e,g){var h=x("updateAjax"),i=a(document.getElementById(d.selectId)).parent();f.addIconToContainerRemoveOnCompletion(i,h);var j=a(b.currentTarget).val();return g.transport(c.selector,j,function(b){var f=g.processResults(c.selector,b),i=[];if(c.multiple||e.children("option").remove(),e.children("option").each(function(b,c){c=a(c),c.prop("selected")?i.push(String(c.attr("value"))):c.remove()}),!c.multiple&&0===e.children("option").length){var j=a("<option>");e.append(j)}a.isArray(f)?(a.each(f,function(b,c){if(i.indexOf(String(c.value))===-1){var d=a("<option>");d.append(c.label),d.attr("value",c.value),e.append(d)}}),e.attr("data-notice","")):e.attr("data-notice",f),h.resolve(s(c,d,"",e))},function(a){h.reject(a)}),h},w=function(b,c,d){var f=a(document.getElementById(c.inputId));if(f.on("keydown",function(e){var h=x("addNavigation-"+c.inputId+"-"+e.keyCode);switch(e.keyCode){case g.DOWN:return b.showSuggestions?("true"===f.attr("aria-expanded")?h.resolve(n(c)):!f.val()&&b.ajax?require([b.ajax],function(a){h.resolve(v(e,b,c,d,a))}):h.resolve(s(b,c,f.val(),d)),e.preventDefault(),!1):(h.resolve(),!0);case g.UP:return h.resolve(q(c)),e.preventDefault(),!1;case g.ENTER:var i=a(document.getElementById(c.suggestionsId));return"true"===f.attr("aria-expanded")&&i.children("[aria-selected=true]").length>0?h.resolve(u(b,c,d)):b.tags?h.resolve(t(b,c,d)):h.resolve(),e.preventDefault(),!1;case g.ESCAPE:return"true"===f.attr("aria-expanded")?h.resolve(r(c)):h.resolve(),e.preventDefault(),!1}return h.resolve(),!0}),f.on("keypress",function(a){return a.keyCode!==g.COMMA||(b.tags&&x("keypress-"+a.keyCode).resolve(t(b,c,d)),a.preventDefault(),!1)}),f.closest("form").on("submit",function(){return b.tags&&x("form-autocomplete-submit").resolve(t(b,c,d)),!0}),f.on("blur",function(){var e=x("form-autocomplete-blur");window.setTimeout(function(){var g=a(document.activeElement),h=a.Deferred();g.is(document.getElementById(c.suggestionsId))?f.focus():!g.is(f)&&a(document.getElementById(c.inputId)).length&&(b.tags&&h.then(function(){return t(b,c,d)})["catch"](),h.then(function(){return r(c)})["catch"]()),h.then(function(){return e.resolve()})["catch"](),h.resolve()},500)}),b.showSuggestions){var h=a(document.getElementById(c.downArrowId));h.on("click",function(a){var e=x("form-autocomplete-show-suggestions");f.focus(),!f.val()&&b.ajax?require([b.ajax],function(f){e.resolve(v(a,b,c,d,f))}):e.resolve(s(b,c,f.val(),d))})}var i=a(document.getElementById(c.suggestionsId));i.parent().prop("onclick",null).off("click"),i.parent().on("click","[role=option]",function(e){var f=x("form-autocomplete-parent"),g=a(e.currentTarget).closest("[role=option]"),h=a(document.getElementById(c.suggestionsId)),i=h.children("[aria-hidden=false]").index(g);m(i,c).then(function(){return u(b,c,d)}).then(function(){return f.resolve()})["catch"]()});var j=a(document.getElementById(c.selectionId));j.on("click","[role=listitem]",function(e){var f=x("form-autocomplete-clicks");f.resolve(l(b,c,a(e.currentTarget),d))}),j.on("keydown",function(e){var f=x("form-autocomplete-keydown-"+e.keyCode);switch(e.keyCode){case g.DOWN:return e.preventDefault(),f.resolve(p(c)),!1;case g.UP:return e.preventDefault(),f.resolve(o(c)),!1;case g.SPACE:case g.ENTER:var h=a(document.getElementById(c.selectionId)).children("[data-active-selection=true]");return h&&(e.preventDefault(),f.resolve(l(b,c,h,d))),!1}return f.resolve(),!0}),b.showSuggestions&&(b.ajax?require([b.ajax],function(a){var g=null,h=!1,i="autocomplete-throttledhandler",j=function(f){g=null,h=!0,v(f,b,c,d,a).then(function(){return null===g&&M.util.js_complete(i),h=!1,arguments[0]})["catch"](e.exception)},k=function(a){return window.clearTimeout(g),h?void(g=window.setTimeout(k.bind(this,a),100)):(null===g&&M.util.js_pending(i),void(g=window.setTimeout(j.bind(this,a),300)))};f.on("input",k)}):f.on("input",function(e){var f=a(e.currentTarget).val(),g=a(e.currentTarget).data("last-value");g!==f&&s(b,c,f,d),a(e.currentTarget).data("last-value",f)}))},x=function(b){var c="form-autocomplete:"+b;M.util.js_pending(c);var d=a.Deferred();return d.then(function(){return M.util.js_complete(c),arguments[0]})["catch"](e.exception),d};return{enhance:function(f,g,i,k,l,m,n,o){var p={selector:f,tags:!1,ajax:!1,placeholder:k,caseSensitive:!1,showSuggestions:!0,noSelectionString:n},q="autocomplete-setup-"+f;M.util.js_pending(q),"undefined"!=typeof g&&(p.tags=g),"undefined"!=typeof i&&(p.ajax=i),"undefined"!=typeof l&&(p.caseSensitive=l),"undefined"!=typeof m&&(p.showSuggestions=m),"undefined"==typeof n&&c.get_string("noselection","form").done(function(a){p.noSelectionString=a}).fail(e.exception);var r=a(f);if(!r)return b.debug("Selector not found: "+f),M.util.js_complete(q),!1;r.css("visibility","hidden").attr("aria-hidden",!0);var s={selectId:r.attr("id"),inputId:"form_autocomplete_input-"+h,suggestionsId:"form_autocomplete_suggestions-"+h,selectionId:"form_autocomplete_selection-"+h,downArrowId:"form_autocomplete_downarrow-"+h};h++,p.multiple=r.attr("multiple"),"undefined"!=typeof o?p.closeSuggestionsOnSelect=o:p.closeSuggestionsOnSelect=!p.multiple;var t=a("[for="+s.selectId+"]"),u=[];r.children("option").each(function(b,c){u[b]={label:c.innerHTML,value:a(c).attr("value")}});var v=a.extend({},p,s);v.options=u,v.items=[];var x="",y=d.render("core/form_autocomplete_input",v).then(function(a,b){return x+=b,a}),z=d.render("core/form_autocomplete_suggestions",v).then(function(a,b){return x+=b,a}),A=d.render("core/form_autocomplete_selection",v).then(function(a,b){return x+=b,a});return a.when(y,z,A).then(function(b,c,e){r.hide(),r.after(c),r.after(b),r.after(e),d.runTemplateJS(x),t.attr("for",s.inputId),w(p,s,r);var f=a(document.getElementById(s.suggestionsId));f.hide().attr("aria-hidden",!0)}).then(function(){return j(p,s,r)}).then(function(){return M.util.js_complete(q)})["catch"](function(a){M.util.js_complete(q),e.exception(a)})}}});
\ No newline at end of file
diff --git a/lib/amd/build/notification.min.js b/lib/amd/build/notification.min.js
index 9ed5a35605898..790d17d2fd6d4 100644
--- a/lib/amd/build/notification.min.js
+++ b/lib/amd/build/notification.min.js
@@ -1 +1 @@
-define(["core/yui","jquery","core/log"],function(a,b,c){var d={types:{success:"core/notification_success",info:"core/notification_info",warning:"core/notification_warning",error:"core/notification_error"},fieldName:"user-notifications",fetchNotifications:function(){require(["core/ajax"],function(a){var b=a.call([{methodname:"core_fetch_notifications",args:{contextid:d.contextid}}]);b[0].done(d.addNotifications)})},addNotifications:function(a){a||(a=[]),b.each(a,function(a,b){d.renderNotification(b.template,b.variables)})},setupTargetRegion:function(){var a=b("#"+d.fieldName);if(a.length)return!1;var c=b("<span>").attr("id",d.fieldName);return a=b("#region-main"),a.length?a.prepend(c):(a=b('[role="main"]'),a.length?a.prepend(c):(a=b("body"),a.prepend(c)))},addNotification:function(a){var c=d.types.error;return a=b.extend({closebutton:!0,announce:!0,type:"error"},a),a.template?(c=a.template,delete a.template):a.type&&("undefined"!=typeof d.types[a.type]&&(c=d.types[a.type]),delete a.type),d.renderNotification(c,a)},renderNotification:function(a,e){return"undefined"!=typeof e.message&&e.message?void require(["core/templates"],function(c){c.render(a,e).done(function(a,e){b("#"+d.fieldName).prepend(a),c.runTemplateJS(e)}).fail(d.exception)}):void c.debug("Notification received without content. Skipping.")},alert:function(b,c,d){a.use("moodle-core-notification-alert",function(){var a=new M.core.alert({title:b,message:c,yesLabel:d});a.show()})},confirm:function(b,c,d,e,f,g){a.use("moodle-core-notification-confirm",function(){var a=new M.core.confirm({title:b,question:c,yesLabel:d,noLabel:e});a.on("complete-yes",function(){f()}),g&&a.on("complete-no",function(){g()}),a.show()})},exception:function(b){if("undefined"==typeof b.stack&&(b.stack=""),b.debuginfo&&(b.stack+=b.debuginfo+"\n"),!b.backtrace&&b.stacktrace&&(b.backtrace=b.stacktrace),b.backtrace){b.stack+=b.backtrace;var c=b.backtrace.match(/line ([^ ]*) of/),d=b.backtrace.match(/ of ([^:]*): /);c&&c[1]&&(b.lineNumber=c[1]),d&&d[1]&&(b.fileName=d[1],b.fileName.length>30&&(b.fileName="..."+b.fileName.substr(b.fileName.length-27)))}"undefined"==typeof b.name&&b.errorcode&&(b.name=b.errorcode),a.use("moodle-core-notification-exception",function(){var a=new M.core.exception(b);a.show()})}};return{init:function(a,b){d.contextid=a,d.setupTargetRegion(),d.addNotifications(b),d.fetchNotifications()},fetchNotifications:d.fetchNotifications,addNotification:d.addNotification,alert:d.alert,confirm:d.confirm,exception:d.exception}});
\ No newline at end of file
+define(["core/yui","jquery","core/log","core/pending"],function(a,b,c,d){var e={types:{success:"core/notification_success",info:"core/notification_info",warning:"core/notification_warning",error:"core/notification_error"},fieldName:"user-notifications",fetchNotifications:function(){var a=new d("core/notification:fetchNotifications");require(["core/ajax"],function(b){var c=b.call([{methodname:"core_fetch_notifications",args:{contextid:e.contextid}}]);c[0].then(e.addNotifications).always(a.resolve)})},addNotifications:function(a){var c=new d("core/notification:addNotifications");a||(a=[]),b.each(a,function(a,b){e.renderNotification(b.template,b.variables)}),c.resolve()},setupTargetRegion:function(){var a=b("#"+e.fieldName);if(a.length)return!1;var c=b("<span>").attr("id",e.fieldName);return a=b("#region-main"),a.length?a.prepend(c):(a=b('[role="main"]'),a.length?a.prepend(c):(a=b("body"),a.prepend(c)))},addNotification:function(a){var c=new d("core/notification:addNotifications"),f=e.types.error;return a=b.extend({closebutton:!0,announce:!0,type:"error"},a),a.template?(f=a.template,delete a.template):a.type&&("undefined"!=typeof e.types[a.type]&&(f=e.types[a.type]),delete a.type),c.resolve(),e.renderNotification(f,a)},renderNotification:function(a,f){if("undefined"==typeof f.message||!f.message)return void c.debug("Notification received without content. Skipping.");var g=new d("core/notification:renderNotification");require(["core/templates"],function(c){c.render(a,f).then(function(a,d){b("#"+e.fieldName).prepend(a),c.runTemplateJS(d)}).always(g.resolve)["catch"](e.exception)})},alert:function(b,c,e){var f=new d("core/notification:alert");a.use("moodle-core-notification-alert",function(){var a=new M.core.alert({title:b,message:c,yesLabel:e});a.show(),f.resolve()})},confirm:function(b,c,e,f,g,h){var i=new d("core/notification:confirm");a.use("moodle-core-notification-confirm",function(){var a=new M.core.confirm({title:b,question:c,yesLabel:e,noLabel:f});a.on("complete-yes",function(){g()}),h&&a.on("complete-no",function(){h()}),a.show(),i.resolve()})},exception:function(b){var c=new d("core/notification:addNotifications");if("undefined"==typeof b.stack&&(b.stack=""),b.debuginfo&&(b.stack+=b.debuginfo+"\n"),!b.backtrace&&b.stacktrace&&(b.backtrace=b.stacktrace),b.backtrace){b.stack+=b.backtrace;var e=b.backtrace.match(/line ([^ ]*) of/),f=b.backtrace.match(/ of ([^:]*): /);e&&e[1]&&(b.lineNumber=e[1]),f&&f[1]&&(b.fileName=f[1],b.fileName.length>30&&(b.fileName="..."+b.fileName.substr(b.fileName.length-27)))}"undefined"==typeof b.name&&b.errorcode&&(b.name=b.errorcode),a.use("moodle-core-notification-exception",function(){var a=new M.core.exception(b);a.show(),c.resolve()})}};return{init:function(a,b){e.contextid=a,e.setupTargetRegion(),e.addNotifications(b),e.fetchNotifications()},fetchNotifications:e.fetchNotifications,addNotification:e.addNotification,alert:e.alert,confirm:e.confirm,exception:e.exception}});
\ No newline at end of file
diff --git a/lib/amd/build/paged_content_factory.min.js b/lib/amd/build/paged_content_factory.min.js
index 938b4424f9842..4f57eccb9e67a 100644
--- a/lib/amd/build/paged_content_factory.min.js
+++ b/lib/amd/build/paged_content_factory.min.js
@@ -1 +1 @@
-define(["jquery","core/templates","core/notification","core/paged_content","core/paged_content_events","core/pubsub","core/ajax"],function(a,b,c,d,e,f,g){var h={PAGED_CONTENT:"core/paged_content"},i={ITEMS_PER_PAGE_SINGLE:25,ITEMS_PER_PAGE_ARRAY:[25,50,100,0],MAX_PAGES:3},j=function(){return{pagingbar:!1,pagingdropdown:!1,skipjs:!0,ignorecontrolwhileloading:!0,controlplacementbottom:!1}},k=function(){return{showitemsperpageselector:!1,itemsperpage:35,previous:!0,next:!0,activepagenumber:1,hidecontrolonsinglepage:!0,pages:[]}},l=function(a,b){var c=1;if(a>0){var d=a%b;d?(a-=d,c=a/b+1):c=a/b}return c},m=function(b,c){null===c&&(c=i.ITEMS_PER_PAGE_SINGLE),a.isArray(c)&&(c=c[0]);var d=k();d.itemsperpage=c;for(var e=l(b,c),f=1;f<=e;f++){var g={number:f,page:""+f};1===f&&(g.active=!0),d.pages.push(g)}return d},n=function(b){if(a.isArray(b)){var c=b.map(function(a){return"number"==typeof a?{value:a,active:!1}:a}),d=c.filter(function(a){return a.active});return d.length||(c[0].active=!0),c}return b},o=function(b){null===b&&(b=i.ITEMS_PER_PAGE_ARRAY);var c=k();return c.itemsperpage=n(b),c.showitemsperpageselector=a.isArray(b),c},p=function(a,b){return a?m(a,b):o(b)},q=function(b,c){if(null===b&&(b=i.ITEMS_PER_PAGE_SINGLE),a.isArray(b))return{options:b};var d={options:[]},e=0,f=0,g=i.MAX_PAGES;c.hasOwnProperty("maxPages")&&(g=c.maxPages);for(var h=1;h<=g;h++){var j=0;h<=2?(j=b,f=b):(f=2*f,j=f),e+=j;var k={itemcount:j,content:e};1===h&&(k.active=!0),d.options.push(k)}return d},r=function(a,b,c){var d=j();return c.hasOwnProperty("ignoreControlWhileLoading")&&(d.ignorecontrolwhileloading=c.ignoreControlWhileLoading),c.hasOwnProperty("controlPlacementBottom")&&(d.controlplacementbottom=c.controlPlacementBottom),c.hasOwnProperty("hideControlOnSinglePage")&&(d.hidecontrolonsinglepage=c.hideControlOnSinglePage),c.hasOwnProperty("ariaLabels")&&(d.arialabels=c.ariaLabels),c.hasOwnProperty("dropdown")&&c.dropdown?d.pagingdropdown=q(b,c):d.pagingbar=p(a,b),d},s=function(a,b){return u(null,null,a,b)},t=function(a,b,c){return u(null,a,b,c)},u=function(e,f,g,i){i=i||{};var j=a.Deferred(),k=r(e,f,i);return b.render(h.PAGED_CONTENT,k).then(function(b,c){b=a(b);var e=b.attr("id");i.hasOwnProperty("eventNamespace")&&(e=i.eventNamespace);var f=b;d.init(f,g,e),y(e,i),j.resolve(b,c)}).fail(function(a){j.reject(a)}).fail(c.exception),j.promise()},v=function(a,b,c,d){"undefined"==typeof d&&(d={});var e=a.length;return u(e,b,function(b){var d=[];return b.forEach(function(b){var c=b.offset,f=b.limit?c+b.limit:e,g=a.slice(c,f);d.push(g)}),c(d)},d)},w=function(a,b){f.publish(a+e.ALL_ITEMS_LOADED,b)},x=function(a){var b=function(b){var c={preferences:[{type:a,value:b}]},d={methodname:"core_user_update_user_preferences",args:c};g.call([d])};return b},y=function(a,b){b.hasOwnProperty("persistentLimitKey")&&f.subscribe(a+e.SET_ITEMS_PER_PAGE_LIMIT,x(b.persistentLimitKey))};return{create:s,createWithLimit:t,createWithTotalAndLimit:u,createFromStaticList:v,createFromAjax:u,resetLastPageNumber:w}});
\ No newline at end of file
+define(["jquery","core/templates","core/notification","core/paged_content","core/paged_content_events","core/pubsub","core/ajax"],function(a,b,c,d,e,f,g){var h={PAGED_CONTENT:"core/paged_content"},i={ITEMS_PER_PAGE_SINGLE:25,ITEMS_PER_PAGE_ARRAY:[25,50,100,0],MAX_PAGES:3},j=function(){return{pagingbar:!1,pagingdropdown:!1,skipjs:!0,ignorecontrolwhileloading:!0,controlplacementbottom:!1}},k=function(){return{showitemsperpageselector:!1,itemsperpage:35,previous:!0,next:!0,activepagenumber:1,hidecontrolonsinglepage:!0,pages:[]}},l=function(a,b){var c=1;if(a>0){var d=a%b;d?(a-=d,c=a/b+1):c=a/b}return c},m=function(b,c){null===c&&(c=i.ITEMS_PER_PAGE_SINGLE),a.isArray(c)&&(c=c[0]);var d=k();d.itemsperpage=c;for(var e=l(b,c),f=1;f<=e;f++){var g={number:f,page:""+f};1===f&&(g.active=!0),d.pages.push(g)}return d.barsize=10,d},n=function(b){if(a.isArray(b)){var c=b.map(function(a){return"number"==typeof a?{value:a,active:!1}:a}),d=c.filter(function(a){return a.active});return d.length||(c[0].active=!0),c}return b},o=function(b){null===b&&(b=i.ITEMS_PER_PAGE_ARRAY);var c=k();return c.itemsperpage=n(b),c.showitemsperpageselector=a.isArray(b),c},p=function(a,b){return a?m(a,b):o(b)},q=function(b,c){if(null===b&&(b=i.ITEMS_PER_PAGE_SINGLE),a.isArray(b))return{options:b};var d={options:[]},e=0,f=0,g=i.MAX_PAGES;c.hasOwnProperty("maxPages")&&(g=c.maxPages);for(var h=1;h<=g;h++){var j=0;h<=2?(j=b,f=b):(f=2*f,j=f),e+=j;var k={itemcount:j,content:e};1===h&&(k.active=!0),d.options.push(k)}return d},r=function(a,b,c){var d=j();return c.hasOwnProperty("ignoreControlWhileLoading")&&(d.ignorecontrolwhileloading=c.ignoreControlWhileLoading),c.hasOwnProperty("controlPlacementBottom")&&(d.controlplacementbottom=c.controlPlacementBottom),c.hasOwnProperty("hideControlOnSinglePage")&&(d.hidecontrolonsinglepage=c.hideControlOnSinglePage),c.hasOwnProperty("ariaLabels")&&(d.arialabels=c.ariaLabels),c.hasOwnProperty("dropdown")&&c.dropdown?d.pagingdropdown=q(b,c):d.pagingbar=p(a,b),d},s=function(a,b){return u(null,null,a,b)},t=function(a,b,c){return u(null,a,b,c)},u=function(e,f,g,i){i=i||{};var j=a.Deferred(),k=r(e,f,i);return b.render(h.PAGED_CONTENT,k).then(function(b,c){b=a(b);var e=b.attr("id");i.hasOwnProperty("eventNamespace")&&(e=i.eventNamespace);var f=b;d.init(f,g,e),y(e,i),j.resolve(b,c)}).fail(function(a){j.reject(a)}).fail(c.exception),j.promise()},v=function(a,b,c,d){"undefined"==typeof d&&(d={});var e=a.length;return u(e,b,function(b){var d=[];return b.forEach(function(b){var c=b.offset,f=b.limit?c+b.limit:e,g=a.slice(c,f);d.push(g)}),c(d)},d)},w=function(a,b){f.publish(a+e.ALL_ITEMS_LOADED,b)},x=function(a){var b=function(b){var c={preferences:[{type:a,value:b}]},d={methodname:"core_user_update_user_preferences",args:c};g.call([d])};return b},y=function(a,b){b.hasOwnProperty("persistentLimitKey")&&f.subscribe(a+e.SET_ITEMS_PER_PAGE_LIMIT,x(b.persistentLimitKey))};return{create:s,createWithLimit:t,createWithTotalAndLimit:u,createFromStaticList:v,createFromAjax:u,resetLastPageNumber:w}});
\ No newline at end of file
diff --git a/lib/amd/build/paged_content_paging_bar.min.js b/lib/amd/build/paged_content_paging_bar.min.js
index 99ef99de133b3..01423d22a1711 100644
--- a/lib/amd/build/paged_content_paging_bar.min.js
+++ b/lib/amd/build/paged_content_paging_bar.min.js
@@ -1 +1 @@
-define(["jquery","core/custom_interaction_events","core/paged_content_events","core/str","core/pubsub"],function(a,b,c,d,e){var f={ROOT:'[data-region="paging-bar"]',PAGE:"[data-page]",PAGE_ITEM:'[data-region="page-item"]',PAGE_LINK:'[data-region="page-link"]',FIRST_BUTTON:'[data-control="first"]',LAST_BUTTON:'[data-control="last"]',NEXT_BUTTON:'[data-control="next"]',PREVIOUS_BUTTON:'[data-control="previous"]'},g=function(a,b){return a.find(f.PAGE_ITEM+'[data-page-number="'+b+'"]')},h=function(a){return a.find(f.NEXT_BUTTON)},i=function(a,b){a.attr("data-last-page-number",b)},j=function(a){return parseInt(a.attr("data-last-page-number"),10)},k=function(a){return parseInt(a.attr("data-active-page-number"),10)},l=function(a,b){a.attr("data-active-page-number",b)},m=function(a){var b=k(a);return!isNaN(b)&&0!=b},n=function(a,b){if(void 0!=b.attr("data-page"))return parseInt(b.attr("data-page-number"),10);var c=1,d=null;switch(b.attr("data-control")){case"first":c=1;break;case"last":c=j(a);break;case"next":d=k(a);var e=j(a);c=e?d&&d<e?d+1:e:d+1;break;case"previous":d=k(a),c=d&&d>1?d-1:1;break;default:c=1}return parseInt(c,10)},o=function(a){return parseInt(a.attr("data-items-per-page"),10)},p=function(a,b){a.attr("data-items-per-page",b)},q=function(a){a.removeClass("hidden")},r=function(a){a.addClass("hidden")},s=function(a){var b=a.find(f.NEXT_BUTTON),c=a.find(f.LAST_BUTTON);b.addClass("disabled"),b.attr("aria-disabled",!0),c.addClass("disabled"),c.attr("aria-disabled",!0)},t=function(a){var b=a.find(f.NEXT_BUTTON),c=a.find(f.LAST_BUTTON);b.removeClass("disabled"),b.removeAttr("aria-disabled"),c.removeClass("disabled"),c.removeAttr("aria-disabled")},u=function(a){var b=a.find(f.PREVIOUS_BUTTON),c=a.find(f.FIRST_BUTTON);b.addClass("disabled"),b.attr("aria-disabled",!0),c.addClass("disabled"),c.attr("aria-disabled",!0)},v=function(a){var b=a.find(f.PREVIOUS_BUTTON),c=a.find(f.FIRST_BUTTON);b.removeClass("disabled"),b.removeAttr("aria-disabled"),c.removeClass("disabled"),c.removeAttr("aria-disabled")},w=function(a){var b=a.attr("data-aria-label-components-pagination-item"),c=b.split(",").map(function(a){return a.trim()});return c},x=function(a){var b=a.attr("data-aria-label-components-pagination-active-item"),c=b.split(",").map(function(a){return a.trim()});return c},y=function(b,c){var d=0;l(b,0),c.each(function(c,e){var f=c+1;e=a(e),e.attr("data-page-number",f),d++,e.hasClass("active")&&l(b,f)}),i(b,d)},z=function(b){var c=w(b),e=x(b),g=k(b),h=b.find(f.PAGE_ITEM),i=h.map(function(d,f){f=a(f);var h=n(b,f);return h===g?{key:e[0],component:e[1],param:h}:{key:c[0],component:c[1],param:h}});d.get_strings(i).then(function(b){return h.each(function(c,d){d=a(d);var e=b[c];d.attr("aria-label",e),d.find(f.PAGE_LINK).attr("aria-label",e)}),b})["catch"](function(){})},A=function(a,b,d){var h=j(a),i=b==k(a),m=o(a),n=(b-1)*m;if(!i){a.find(f.PAGE_ITEM).removeClass("active").removeAttr("aria-current");var p=g(a,b);p.addClass("active"),p.attr("aria-current",!0),l(a,b)}h&&b>=h?s(a):t(a),b>1?v(a):u(a),z(a),e.publish(d+c.SHOW_PAGES,[{pageNumber:b,limit:m,offset:n}])},B=function(d,g){var h=d.attr("data-ignore-control-while-loading"),k=!1;""==h&&(h=!0),b.define(d,[b.events.activate]),d.on(b.events.activate,f.PAGE_ITEM,function(b,c){if(c.originalEvent.preventDefault(),c.originalEvent.stopPropagation(),!h||!k){var e=a(b.target).closest(f.PAGE_ITEM);if(!e.hasClass("disabled")){var i=n(d,e);A(d,i,g),k=!0}}}),e.subscribe(g+c.ALL_ITEMS_LOADED,function(a){k=!1;var b=j(d);(!b||a<b)&&i(d,a),1===a&&d.attr("data-hide-control-on-single-page")?(r(d),s(d),u(d)):(q(d),s(d))}),e.subscribe(g+c.PAGES_SHOWN,function(){k=!1}),e.subscribe(g+c.SET_ITEMS_PER_PAGE_LIMIT,function(a){p(d,a),i(d,0),l(d,0),q(d),A(d,1,g)})},C=function(b,c){b=a(b);var d=b.find(f.PAGE);if(y(b,d),B(b,c),m(b)){var e=k(b);g(b,e).click(),1==e&&u(b)}else h(b).click()};return{init:C,disableNextControlButtons:s,enableNextControlButtons:t,disablePreviousControlButtons:u,enablePreviousControlButtons:v,showPage:A,rootSelector:f.ROOT}});
\ No newline at end of file
+define(["jquery","core/custom_interaction_events","core/paged_content_events","core/str","core/pubsub"],function(a,b,c,d,e){var f={ROOT:'[data-region="paging-bar"]',PAGE:"[data-page]",PAGE_ITEM:'[data-region="page-item"]',PAGE_LINK:'[data-region="page-link"]',FIRST_BUTTON:'[data-control="first"]',LAST_BUTTON:'[data-control="last"]',NEXT_BUTTON:'[data-control="next"]',PREVIOUS_BUTTON:'[data-control="previous"]',DOTS_BUTTONS:"[data-dots]",BEGINNING_DOTS_BUTTON:'[data-dots="beginning"]',ENDING_DOTS_BUTTON:'[data-dots="ending"]'},g=function(a,b){return a.find(f.PAGE_ITEM+'[data-page-number="'+b+'"]')},h=function(a){return a.find(f.NEXT_BUTTON)},i=function(a,b){a.attr("data-last-page-number",b)},j=function(a){return parseInt(a.attr("data-last-page-number"),10)},k=function(a){return parseInt(a.attr("data-active-page-number"),10)},l=function(a,b){a.attr("data-active-page-number",b)},m=function(a){var b=k(a);return!isNaN(b)&&0!=b},n=function(a,b){if(void 0!=b.attr("data-page"))return parseInt(b.attr("data-page-number"),10);var c=1,d=null;switch(b.attr("data-control")){case"first":c=1;break;case"last":c=j(a);break;case"next":d=k(a);var e=j(a);c=e?d&&d<e?d+1:e:d+1;break;case"previous":d=k(a),c=d&&d>1?d-1:1;break;default:c=1}return parseInt(c,10)},o=function(a){return parseInt(a.attr("data-items-per-page"),10)},p=function(a,b){a.attr("data-items-per-page",b)},q=function(a){a.removeClass("hidden")},r=function(a){a.addClass("hidden")},s=function(a){var b=a.find(f.NEXT_BUTTON),c=a.find(f.LAST_BUTTON);b.addClass("disabled"),b.attr("aria-disabled",!0),c.addClass("disabled"),c.attr("aria-disabled",!0)},t=function(a){var b=a.find(f.NEXT_BUTTON),c=a.find(f.LAST_BUTTON);b.removeClass("disabled"),b.removeAttr("aria-disabled"),c.removeClass("disabled"),c.removeAttr("aria-disabled")},u=function(a){var b=a.find(f.PREVIOUS_BUTTON),c=a.find(f.FIRST_BUTTON);b.addClass("disabled"),b.attr("aria-disabled",!0),c.addClass("disabled"),c.attr("aria-disabled",!0)},v=function(b){var c=k(b),d=j(b),e=b.find(f.DOTS_BUTTONS),g=b.find(f.BEGINNING_DOTS_BUTTON),h=b.find(f.ENDING_DOTS_BUTTON),i=b.find(f.PAGE),l=parseInt(b.attr("data-bar-size"),10);if(l&&d>l){var m=Math.max(c-Math.round(l/2),1),n=m+l-1;n>=d&&(n=d,m=n-l+1),m>1?(q(g),m++):r(g),n<d?(q(h),n--):r(h),e.addClass("disabled"),e.attr("aria-disabled",!0),r(i),i.each(function(b,c){c=a(c),b+1>=m&&b+1<=n&&q(c)})}else r(e)},w=function(a){var b=a.find(f.PREVIOUS_BUTTON),c=a.find(f.FIRST_BUTTON);b.removeClass("disabled"),b.removeAttr("aria-disabled"),c.removeClass("disabled"),c.removeAttr("aria-disabled")},x=function(a){var b=a.attr("data-aria-label-components-pagination-item"),c=b.split(",").map(function(a){return a.trim()});return c},y=function(a){var b=a.attr("data-aria-label-components-pagination-active-item"),c=b.split(",").map(function(a){return a.trim()});return c},z=function(b,c){var d=0;l(b,0),c.each(function(c,e){var f=c+1;e=a(e),e.attr("data-page-number",f),d++,e.hasClass("active")&&l(b,f)}),i(b,d)},A=function(b){var c=x(b),e=y(b),g=k(b),h=b.find(f.PAGE_ITEM),i=h.map(function(d,f){f=a(f);var h=n(b,f);return h===g?{key:e[0],component:e[1],param:h}:{key:c[0],component:c[1],param:h}});d.get_strings(i).then(function(b){return h.each(function(c,d){d=a(d);var e=b[c];d.attr("aria-label",e),d.find(f.PAGE_LINK).attr("aria-label",e)}),b})["catch"](function(){})},B=function(a,b,d){var h=j(a),i=b==k(a),m=o(a),n=(b-1)*m;if(!i){a.find(f.PAGE_ITEM).removeClass("active").removeAttr("aria-current");var p=g(a,b);p.addClass("active"),p.attr("aria-current",!0),l(a,b),v(a)}h&&b>=h?s(a):t(a),b>1?w(a):u(a),A(a),e.publish(d+c.SHOW_PAGES,[{pageNumber:b,limit:m,offset:n}])},C=function(d,g){var h=d.attr("data-ignore-control-while-loading"),k=!1;""==h&&(h=!0),b.define(d,[b.events.activate]),d.on(b.events.activate,f.PAGE_ITEM,function(b,c){if(c.originalEvent.preventDefault(),c.originalEvent.stopPropagation(),!h||!k){var e=a(b.target).closest(f.PAGE_ITEM);if(!e.hasClass("disabled")){var i=n(d,e);B(d,i,g),k=!0}}}),e.subscribe(g+c.ALL_ITEMS_LOADED,function(a){k=!1;var b=j(d);(!b||a<b)&&i(d,a),1===a&&d.attr("data-hide-control-on-single-page")?(r(d),s(d),u(d)):(q(d),s(d))}),e.subscribe(g+c.PAGES_SHOWN,function(){k=!1}),e.subscribe(g+c.SET_ITEMS_PER_PAGE_LIMIT,function(a){p(d,a),i(d,0),l(d,0),q(d),B(d,1,g)})},D=function(b,c){b=a(b);var d=b.find(f.PAGE);if(z(b,d),C(b,c),m(b)){var e=k(b);g(b,e).click(),1==e&&u(b)}else h(b).click();v(b)};return{init:D,disableNextControlButtons:s,enableNextControlButtons:t,disablePreviousControlButtons:u,enablePreviousControlButtons:w,showPage:B,rootSelector:f.ROOT}});
\ No newline at end of file
diff --git a/lib/amd/build/permissionmanager.min.js b/lib/amd/build/permissionmanager.min.js
index 4a6c31bc1d1c9..0ed75d137688e 100644
--- a/lib/amd/build/permissionmanager.min.js
+++ b/lib/amd/build/permissionmanager.min.js
@@ -1 +1 @@
-define(["jquery","core/config","core/notification","core/templates","core/yui"],function(a,b,c,d,e){var f,g,h,i,j={ADDROLE:"a.allowlink, a.prohibitlink",REMOVEROLE:"a.preventlink, a.unprohibitlink",UNPROHIBIT:"a.unprohibitlink"},k=a.Event("rolesloaded"),l=null,m=function(){var d={contextid:f,getroles:1,sesskey:b.sesskey};a.post(h+"roles/ajax.php",d,null,"json").done(function(b){try{i=b,m=function(){a("body").trigger(k)},m()}catch(d){c.exception(d)}}).fail(function(a,b,d){c.exception(d)})},n=function(b,e,g){var j={contextid:f,roleid:e,sesskey:M.cfg.sesskey,action:g,capability:b.data("name")};a.post(h+"roles/ajax.php",j,null,"json").done(function(f){var g=f;try{var j={rolename:i[e],roleid:e,adminurl:h,imageurl:M.util.image_url("t/delete","moodle")};switch(g){case"allow":j.spanclass="allowed",j.linkclass="preventlink",j.action="prevent",j.icon="t/delete";break;case"prohibit":j.spanclass="forbidden",j.linkclass="unprohibitlink",j.action="unprohibit",j.icon="t/delete";break;case"prevent":return void b.find('a[data-role-id="'+e+'"]').first().closest(".allowed").remove();case"unprohibit":return void b.find('a[data-role-id="'+e+'"]').first().closest(".forbidden").remove();default:return}d.render("core/permissionmanager_role",j).done(function(c){if("allow"==g)a(c).insertBefore(b.find(".allowmore:first"));else if("prohibit"==g){a(c).insertBefore(b.find(".prohibitmore:first"));var d=b.find(".allowedroles").first().find('a[data-role-id="'+e+'"]');d&&d.first().closest(".allowed").remove()}l.hide()}).fail(c.exception)}catch(k){c.exception(k)}}).fail(function(a,b,d){c.exception(d)})},o=function(b){b.preventDefault(),e.use("moodle-core-notification-dialogue",function(){a("body").one("rolesloaded",function(){var e=a(b.currentTarget),f=e.data("action"),h=e.closest("tr.rolecap"),k={cap:h.data("humanname"),context:g},m=M.util.get_string("role"+f+"info","core_role",k);null===l&&(l=new M.core.dialogue({draggable:!0,modal:!0,closeButton:!0,width:"450px"})),l.set("headerContent",M.util.get_string("role"+f+"header","core_role"));var o,p,q=[];switch(f){case"allow":p=h.find(j.REMOVEROLE);break;case"prohibit":p=h.find(j.UNPROHIBIT)}for(o in i){var r="",s=p.filter("[data-role-id='"+o+"']").length;s&&(r="disabled");var t={roleid:o,rolename:i[o],disabled:r};q.push(t)}d.render("core/permissionmanager_panelcontent",{message:m,roles:q}).done(function(b){l.set("bodyContent",b),l.show(),a("div.role_buttons").delegate("input","click",function(b){var c=a(b.currentTarget).data("role-id");n(h,c,f)})}).fail(c.exception)})}),m()},p=function(b){b.preventDefault(),a("body").one("rolesloaded",function(){var d=a(b.currentTarget),e=d.data("action"),f=d.data("role-id"),h=d.closest("tr.rolecap"),j={role:i[f],cap:h.data("humanname"),context:g};c.confirm(M.util.get_string("confirmunassigntitle","core_role"),M.util.get_string("confirmrole"+e,"core_role",j),M.util.get_string("confirmunassignyes","core_role"),M.util.get_string("confirmunassignno","core_role"),function(){n(h,f,e)})}),m()};return{initialize:function(b){f=b.contextid,g=b.contextname,h=b.adminurl;var c=a("body");c.delegate(j.ADDROLE,"click",o),c.delegate(j.REMOVEROLE,"click",p)}}});
\ No newline at end of file
+define(["jquery","core/config","core/notification","core/templates","core/yui"],function(a,b,c,d,e){var f,g,h,i,j={ADDROLE:"a.allowlink, a.prohibitlink",REMOVEROLE:"a.preventlink, a.unprohibitlink",UNPROHIBIT:"a.unprohibitlink"},k=a.Event("rolesloaded"),l=null,m=function(){var d={contextid:f,getroles:1,sesskey:b.sesskey};a.post(h+"roles/ajax.php",d,null,"json").done(function(b){try{i=b,m=function(){a("body").trigger(k)},m()}catch(d){c.exception(d)}}).fail(function(a,b,d){c.exception(d)})},n=function(b,e,g){var j={contextid:f,roleid:e,sesskey:M.cfg.sesskey,action:g,capability:b.data("name")};a.post(h+"roles/ajax.php",j,null,"json").done(function(f){var g=f;try{var j={rolename:i[e],roleid:e,adminurl:h,imageurl:M.util.image_url("t/delete","moodle")};switch(g){case"allow":j.spanclass="allowed",j.linkclass="preventlink",j.action="prevent",j.icon="t/delete",j.iconalt=M.util.get_string("deletexrole","core_role",i[e]);break;case"prohibit":j.spanclass="forbidden",j.linkclass="unprohibitlink",j.action="unprohibit",j.icon="t/delete",j.iconalt=M.util.get_string("deletexrole","core_role",i[e]);break;case"prevent":return void b.find('a[data-role-id="'+e+'"]').first().closest(".allowed").remove();case"unprohibit":return void b.find('a[data-role-id="'+e+'"]').first().closest(".forbidden").remove();default:return}d.render("core/permissionmanager_role",j).done(function(c){if("allow"==g)a(c).insertBefore(b.find(".allowmore:first"));else if("prohibit"==g){a(c).insertBefore(b.find(".prohibitmore:first"));var d=b.find(".allowedroles").first().find('a[data-role-id="'+e+'"]');d&&d.first().closest(".allowed").remove()}l.hide()}).fail(c.exception)}catch(k){c.exception(k)}}).fail(function(a,b,d){c.exception(d)})},o=function(b){b.preventDefault();var f=a(b.currentTarget);a("body").one("rolesloaded",function(){e.use("moodle-core-notification-dialogue",function(){var b=f.data("action"),e=f.closest("tr.rolecap"),h={cap:e.data("humanname"),context:g},k=M.util.get_string("role"+b+"info","core_role",h);null===l&&(l=new M.core.dialogue({draggable:!0,modal:!0,closeButton:!0,width:"450px"})),l.set("headerContent",M.util.get_string("role"+b+"header","core_role"));var m,o,p=[];switch(b){case"allow":o=e.find(j.REMOVEROLE);break;case"prohibit":o=e.find(j.UNPROHIBIT)}for(m in i){var q="",r=o.filter("[data-role-id='"+m+"']").length;r&&(q="disabled");var s={roleid:m,rolename:i[m],disabled:q};p.push(s)}d.render("core/permissionmanager_panelcontent",{message:k,roles:p}).done(function(c){l.set("bodyContent",c),l.show(),a("div.role_buttons").on("click","input",function(c){var d=a(c.currentTarget).data("role-id");n(e,d,b)})}).fail(c.exception)})}),m()},p=function(b){b.preventDefault();var d=a(b.currentTarget);a("body").one("rolesloaded",function(){var a=d.data("action"),b=d.data("role-id"),e=d.closest("tr.rolecap"),f={role:i[b],cap:e.data("humanname"),context:g};c.confirm(M.util.get_string("confirmunassigntitle","core_role"),M.util.get_string("confirmrole"+a,"core_role",f),M.util.get_string("confirmunassignyes","core_role"),M.util.get_string("confirmunassignno","core_role"),function(){n(e,b,a)})}),m()};return{initialize:function(b){f=b.contextid,g=b.contextname,h=b.adminurl;var c=a("body");c.on("click",j.ADDROLE,o),c.on("click",j.REMOVEROLE,p)}}});
\ No newline at end of file
diff --git a/lib/amd/build/pubsub.min.js b/lib/amd/build/pubsub.min.js
index 871bb59c16d97..baad22251cf49 100644
--- a/lib/amd/build/pubsub.min.js
+++ b/lib/amd/build/pubsub.min.js
@@ -1 +1 @@
-define([],function(){var a={},b=function(b,c){a[b]=a[b]||[],a[b].push(c)},c=function(b,c){if(a[b])for(var d=0;d<a[b].length;d++)if(a[b][d]===c){a[b].splice(d,1);break}},d=function(b,c){a[b]&&a[b].forEach(function(a){a(c)})};return{subscribe:b,unsubscribe:c,publish:d}});
\ No newline at end of file
+define(["core/pending"],function(a){var b={},c=function(a,c){b[a]=b[a]||[],b[a].push(c)},d=function(a,c){if(b[a])for(var d=0;d<b[a].length;d++)if(b[a][d]===c){b[a].splice(d,1);break}},e=function(c,d){var e=new a("Publishing "+c);b[c]&&b[c].forEach(function(a){a(d)}),e.resolve()};return{subscribe:c,unsubscribe:d,publish:e}});
\ No newline at end of file
diff --git a/lib/amd/build/tag.min.js b/lib/amd/build/tag.min.js
index 432ce1260fb7c..dd6f25cfb72d3 100644
--- a/lib/amd/build/tag.min.js
+++ b/lib/amd/build/tag.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/templates","core/notification","core/str","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f,g){return{initTagindexPage:function(){a("body").delegate(".tagarea[data-ta] a[data-quickload=1]","click",function(d){d.preventDefault();var e=a(this),f=e[0].search.replace(/^\?/,""),g=e.closest(".tagarea[data-ta]"),h=f.split("&").reduce(function(a,b){var c=b.split("=");return a[c[0]]=decodeURIComponent(c[1]),a},{}),i=b.call([{methodname:"core_tag_get_tagindex",args:{tagindex:h}}],!0);a.when.apply(a,i).done(function(a){c.render("core_tag/index",a).done(function(a){g.replaceWith(a)})})})},initManagePage:function(){a("body").on("updated","[data-inplaceeditable]",function(b){if(e.get_string("selecttag","core_tag",b.ajaxreturn.value).then(function(c){return a('label[for="tagselect'+b.ajaxreturn.itemid+'"]').html(c)}).fail(d.exception),e.get_string("now").done(function(c){a(b.target).closest("tr").find("td.col-timemodified").html(c)}),"tagflag"===b.ajaxreturn.itemtype){var c=a(b.target).closest("tr");"0"===b.ajaxreturn.value?c.removeClass("flagged-tag"):c.addClass("flagged-tag")}}),a(".tag-management-table").delegate("a.tagdelete","click",function(b){b.preventDefault();var c=a(this).attr("href");e.get_strings([{key:"delete"},{key:"confirmdeletetag",component:"tag"},{key:"yes"},{key:"no"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],function(){window.location.href=c})})}),a("#tag-management-delete").click(function(b){var c=a(this).closest("form").get(0),f=a(c).find("input[type=checkbox]:checked").length;if(f){var g=a("<input type='hidden'/>").attr("name",this.name);b.preventDefault(),e.get_strings([{key:"delete"},{key:"confirmdeletetags",component:"tag"},{key:"yes"},{key:"no"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],function(){g.appendTo(c),c.submit()})})}}),a("#tag-management-combine").click(function(b){b.preventDefault();var h=a(this).closest("form").get(0),i=a(h).find("input[type=checkbox]:checked");if(i.length<=1)return void e.get_strings([{key:"combineselected",component:"tag"},{key:"selectmultipletags",component:"tag"},{key:"ok"}]).done(function(a){d.alert(a[0],a[1],a[2])});var j=a("<input type='hidden'/>").attr("name",this.name),k="",l=[];i.each(function(){var b=a(this).val(),c=a(".inplaceeditable[data-itemtype=tagname][data-itemid="+b+"]").attr("data-value");l.push({id:b,name:c})}),e.get_strings([{key:"combineselected",component:"tag"},{key:"continue"}]).then(function(a){var b=a[0];k=a[1];var d={tags:l};return f.create({title:b,body:c.render("core_tag/combine_tags",d),type:f.types.SAVE_CANCEL})}).then(function(b){b.setSaveButtonText(k),b.getRoot().on(g.save,function(b){b.preventDefault(),j.appendTo(h);var c=a("input[name=maintag]:checked","#combinetags_form").val();a("<input type='hidden'/>").attr("name","maintag").attr("value",c).appendTo(h),h.submit()}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.show(),a("#combinetags_form input[type=radio]").first().focus().prop("checked",!0)})["catch"](d.exception)}),a("body").on("updatefailed","[data-inplaceeditable][data-itemtype=tagname]",function(b){var c=b.exception,f=b.newvalue,g=a(b.target).attr("data-itemid");"namesalreadybeeingused"===c.errorcode&&(b.preventDefault(),e.get_strings([{key:"nameuseddocombine",component:"tag"},{key:"yes"},{key:"cancel"}]).done(function(a){d.confirm(b.message,a[0],a[1],a[2],function(){window.location.href=window.location.href+"&newname="+encodeURIComponent(f)+"&tagid="+encodeURIComponent(g)+"&action=renamecombine&sesskey="+M.cfg.sesskey})}))}),a("body").on("click","a[data-action=addstandardtag]",function(b){b.preventDefault();var h="";e.get_strings([{key:"addotags",component:"tag"},{key:"continue"}]).then(function(a){var b=a[0];h=a[1];var d={actionurl:window.location.href,sesskey:M.cfg.sesskey};return f.create({title:b,body:c.render("core_tag/add_tags",d),type:f.types.SAVE_CANCEL})}).then(function(b){b.setSaveButtonText(h),b.getRoot().on(g.save,function(b){var c=a(b.currentTarget).find("#id_tagslist"),d=c.val().trim();c.val(d);var e=a("#addtags_form");return e.on("submit",function(b){var c=a("#addtags_form");c[0].checkValidity()===!1&&(b.preventDefault(),b.stopPropagation()),c.addClass("was-validated"),a('[data-region="tagslistinput"]').addClass("error");var d=a("#id_tagslist_error_message");d.removeAttr("hidden"),d.addClass("help-block")}),e.submit(),!1}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.show()})["catch"](d.exception)})},initManageCollectionsPage:function(){a("body").on("updated","[data-inplaceeditable]",function(b){var c,d,e,f=b.ajaxreturn;"core_tag"===f.component&&"tagareaenable"===f.itemtype&&(c=a(this).attr("data-itemid"),a(".tag-collections-table ul[data-collectionid] li[data-areaid="+c+"]").hide(),e=f.value,"1"===e?(a(this).closest("tr").removeClass("dimmed_text"),d=a(this).closest("tr").find('[data-itemtype="tagareacollection"]').attr("data-value"),a(".tag-collections-table ul[data-collectionid="+d+"] li[data-areaid="+c+"]").show()):a(this).closest("tr").addClass("dimmed_text")),"core_tag"===f.component&&"tagareacollection"===f.itemtype&&(c=a(this).attr("data-itemid"),a(".tag-collections-table ul[data-collectionid] li[data-areaid="+c+"]").hide(),d=a(this).attr("data-value"),e=a(this).closest("tr").find('[data-itemtype="tagareaenable"]').attr("data-value"),"1"===e&&a(".tag-collections-table ul[data-collectionid="+d+"] li[data-areaid="+c+"]").show())}),a("body").on("click",".addtagcoll > a",function(b){b.preventDefault();var h=[{key:"addtagcoll",component:"tag"},{key:"create"}],i=a(this).attr("data-url"),j="";e.get_strings(h).then(function(a){var b=a[0];j=a[1];var d={actionurl:i,sesskey:M.cfg.sesskey};return f.create({title:b,body:c.render("core_tag/add_tag_collection",d),type:f.types.SAVE_CANCEL})}).then(function(b){b.setSaveButtonText(j),b.getRoot().on(g.save,function(b){var c=a(b.currentTarget).find("#addtagcoll_name"),d=c.val().trim();c.val(d);var e=a("#addtagcoll_form");return e.on("submit",function(b){e[0].checkValidity()===!1&&(b.preventDefault(),b.stopPropagation()),e.addClass("was-validated"),a('[data-region="addtagcoll_nameinput"]').addClass("error");var c=a("#id_addtagcoll_name_error_message");c.removeAttr("hidden"),c.addClass("help-block")}),e.submit(),!1}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.show()})["catch"](d.exception)}),a("body").on("click",".tag-collections-table .action_delete",function(b){b.preventDefault();var c=a(this).attr("data-url")+"&sesskey="+M.cfg.sesskey;e.get_strings([{key:"delete"},{key:"suredeletecoll",component:"tag",param:a(this).attr("data-collname")},{key:"yes"},{key:"no"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],function(){window.location.href=c})})})}}});
\ No newline at end of file
+define(["jquery","core/ajax","core/templates","core/notification","core/str","core/modal_factory","core/modal_events","core/pending"],function(a,b,c,d,e,f,g,h){return{initTagindexPage:function(){a("body").delegate(".tagarea[data-ta] a[data-quickload=1]","click",function(e){var f=new h("core/tag:initTagindexPage");e.preventDefault();var g=a(this),i=g[0].search.replace(/^\?/,""),j=g.closest(".tagarea[data-ta]"),k=i.split("&").reduce(function(a,b){var c=b.split("=");return a[c[0]]=decodeURIComponent(c[1]),a},{});b.call([{methodname:"core_tag_get_tagindex",args:{tagindex:k}}])[0].then(function(a){return c.render("core_tag/index",a)}).then(function(a,b){c.replaceNode(j,a,b)}).always(f.resolve)["catch"](d.exception)})},initManagePage:function(){a("body").on("updated","[data-inplaceeditable]",function(b){var c=new h("core/tag:initManagePage");if(e.get_strings([{key:"selecttag",component:"core_tag"},{key:"now",component:"core"}]).then(function(c){a('label[for="tagselect'+b.ajaxreturn.itemid+'"]').html(c[0]),a(b.target).closest("tr").find("td.col-timemodified").html(c[1])}).always(c.resolve)["catch"](d.exception),"tagflag"===b.ajaxreturn.itemtype){var f=a(b.target).closest("tr");"0"===b.ajaxreturn.value?f.removeClass("flagged-tag"):f.addClass("flagged-tag")}}),a(".tag-management-table").delegate("a.tagdelete","click",function(b){var c=new h("core/tag:tagdelete");b.preventDefault();var f=a(this).attr("href");e.get_strings([{key:"delete",component:"core"},{key:"confirmdeletetag",component:"tag"},{key:"yes",component:"core"},{key:"no",component:"core"}]).then(function(a){return d.confirm(a[0],a[1],a[2],a[3],function(){window.location.href=f})}).always(c.resolve)["catch"](d.exception)}),a("#tag-management-delete").click(function(b){var c=a(this).closest("form").get(0),f=a(c).find("input[type=checkbox]:checked").length;if(f){var g=new h("core/tag:tag-management-delete"),i=a("<input type='hidden'/>").attr("name",this.name);b.preventDefault(),e.get_strings([{key:"delete",component:"core"},{key:"confirmdeletetags",component:"tag"},{key:"yes",component:"core"},{key:"no",component:"core"}]).then(function(a){return d.confirm(a[0],a[1],a[2],a[3],function(){i.appendTo(c),c.submit()})}).always(g.resolve)["catch"](d.exception)}}),a("#tag-management-combine").click(function(b){var i=new h("core/tag:tag-management-combine");b.preventDefault();var j=a(this).closest("form").get(0),k=a(j).find("input[type=checkbox]:checked");if(k.length<=1)return void e.get_strings([{key:"combineselected",component:"tag"},{key:"selectmultipletags",component:"tag"},{key:"ok"}]).then(function(a){return d.alert(a[0],a[1],a[2])}).always(i.resolve)["catch"](d.exception);var l=a("<input type='hidden'/>").attr("name",this.name),m="",n=[];k.each(function(){var b=a(this).val(),c=a(".inplaceeditable[data-itemtype=tagname][data-itemid="+b+"]").attr("data-value");n.push({id:b,name:c})}),e.get_strings([{key:"combineselected",component:"tag"},{key:"continue",component:"core"}]).then(function(a){var b=a[0];m=a[1];var d={tags:n};return f.create({title:b,body:c.render("core_tag/combine_tags",d),type:f.types.SAVE_CANCEL})}).then(function(a){return a.setSaveButtonText(m),a}).then(function(b){b.getRoot().on(g.save,function(b){b.preventDefault(),l.appendTo(j);var c=a("input[name=maintag]:checked","#combinetags_form").val();a("<input type='hidden'/>").attr("name","maintag").attr("value",c).appendTo(j),j.submit()}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.show(),a("#combinetags_form input[type=radio]").first().focus().prop("checked",!0)}).always(i.resolve)["catch"](d.exception)}),a("body").on("updatefailed","[data-inplaceeditable][data-itemtype=tagname]",function(b){var c=b.exception,f=b.newvalue,g=a(b.target).attr("data-itemid");if("namesalreadybeeingused"===c.errorcode){var i=new h("core/tag:updatefailed");b.preventDefault(),e.get_strings([{key:"nameuseddocombine",component:"tag"},{key:"yes"},{key:"cancel"}]).then(function(a){return d.confirm(b.message,a[0],a[1],a[2],function(){window.location.href=window.location.href+"&newname="+encodeURIComponent(f)+"&tagid="+encodeURIComponent(g)+"&action=renamecombine&sesskey="+M.cfg.sesskey})}).always(i.resolve)["catch"](d.exception)}}),a("body").on("click","a[data-action=addstandardtag]",function(b){var i=new h("core/tag:addstandardtag");return b.preventDefault(),f.create({title:e.get_string("addotags","tag"),body:c.render("core_tag/add_tags",{actionurl:window.location.href,sesskey:M.cfg.sesskey}),type:f.types.SAVE_CANCEL}).then(function(b){b.setSaveButtonText(e.get_string("continue","core")),b.getRoot().on(g.save,function(b){var c=a(b.currentTarget).find("#id_tagslist"),d=c.val().trim();c.val(d);var e=a("#addtags_form");return e.on("submit",function(b){var c=a("#addtags_form");c[0].checkValidity()===!1&&(b.preventDefault(),b.stopPropagation()),c.addClass("was-validated"),a('[data-region="tagslistinput"]').addClass("error");var d=a("#id_tagslist_error_message");d.removeAttr("hidden"),d.addClass("help-block")}),e.submit(),!1}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.show()}).always(i.resolve)["catch"](d.exception)})},initManageCollectionsPage:function(){a("body").on("updated","[data-inplaceeditable]",function(b){var c,d,e,f=new h("core/tag:initManageCollectionsPage-updated"),g=b.ajaxreturn;"core_tag"===g.component&&"tagareaenable"===g.itemtype&&(c=a(this).attr("data-itemid"),a(".tag-collections-table ul[data-collectionid] li[data-areaid="+c+"]").hide(),e=g.value,"1"===e?(a(this).closest("tr").removeClass("dimmed_text"),d=a(this).closest("tr").find('[data-itemtype="tagareacollection"]').attr("data-value"),a(".tag-collections-table ul[data-collectionid="+d+"] li[data-areaid="+c+"]").show()):a(this).closest("tr").addClass("dimmed_text")),"core_tag"===g.component&&"tagareacollection"===g.itemtype&&(c=a(this).attr("data-itemid"),a(".tag-collections-table ul[data-collectionid] li[data-areaid="+c+"]").hide(),d=a(this).attr("data-value"),e=a(this).closest("tr").find('[data-itemtype="tagareaenable"]').attr("data-value"),"1"===e&&a(".tag-collections-table ul[data-collectionid="+d+"] li[data-areaid="+c+"]").show()),f.resolve()}),a("body").on("click",".addtagcoll > a",function(b){var i=new h("core/tag:initManageCollectionsPage-addtagcoll");b.preventDefault();var j=[{key:"addtagcoll",component:"tag"},{key:"create",component:"core"}],k=a(this).attr("data-url"),l="";e.get_strings(j).then(function(a){var b=a[0];l=a[1];var d={actionurl:k,sesskey:M.cfg.sesskey};return f.create({title:b,body:c.render("core_tag/add_tag_collection",d),type:f.types.SAVE_CANCEL})}).then(function(b){return b.setSaveButtonText(l),b.getRoot().on(g.save,function(b){var c=a(b.currentTarget).find("#addtagcoll_name"),d=c.val().trim();c.val(d);var e=a("#addtagcoll_form");return e.on("submit",function(b){e[0].checkValidity()===!1&&(b.preventDefault(),b.stopPropagation()),e.addClass("was-validated"),a('[data-region="addtagcoll_nameinput"]').addClass("error");var c=a("#id_addtagcoll_name_error_message");c.removeAttr("hidden"),c.addClass("help-block")}),e.submit(),!1}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.show(),b}).always(i.resolve)["catch"](d.exception)}),a("body").on("click",".tag-collections-table .action_delete",function(b){var c=new h("core/tag:initManageCollectionsPage-action_delete");b.preventDefault();var f=a(this).attr("data-url")+"&sesskey="+M.cfg.sesskey;e.get_strings([{key:"delete"},{key:"suredeletecoll",component:"tag",param:a(this).attr("data-collname")},{key:"yes"},{key:"no"}]).then(function(a){return d.confirm(a[0],a[1],a[2],a[3],function(){window.location.href=f})}).always(c.resolve)["catch"](d.exception)})}}});
\ No newline at end of file
diff --git a/lib/amd/build/templates.min.js b/lib/amd/build/templates.min.js
index 606dc855bddfc..e656c799f0d1a 100644
--- a/lib/amd/build/templates.min.js
+++ b/lib/amd/build/templates.min.js
@@ -1 +1 @@
-define(["core/mustache","jquery","core/ajax","core/str","core/notification","core/url","core/config","core/localstorage","core/icon_system","core/event","core/yui","core/log","core/truncate","core/user_date","core/pending"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o){var p=0,q={},r={},s={},t={},u=[],v=!1,w=function(a){if(a in r)return r[a];if(a in q)return r[a]=b.Deferred().resolve(q[a]).promise(),r[a];var c=h.get("core_template/"+a);return c?(q[a]=c,r[a]=b.Deferred().resolve(c).promise(),r[a]):null},x=function(){if(u.length&&!v){v=!0;var a=u.slice(),e=b.Deferred(),f=[],g=a.map(function(a){var c=a.component,i=a.name,j=a.searchKey,k=a.theme,l=a.deferred,m=null,n=w(j);if(n)m=n;else{f.push({methodname:"core_output_load_template_with_dependencies",args:{component:c,template:i,themename:k,lang:b("html").attr("lang").replace(/-/g,"_")}});var o=f.length-1;m=e.promise().then(function(a){return g[j]=a[o].then(function(a){var b=null;return a.templates.forEach(function(a){var d=[k,a.component,a.name].join("/");q[d]=a.value,h.set("core_template/"+d,a.value),a.component==c&&a.name==i&&(b=a.value)}),a.strings.length&&d.cache_strings(a.strings.map(function(a){return{component:a.component,key:a.name,value:a.value}})),b}),g[j]})}return m.then(function(a){return l.resolve(a)})["catch"](function(a){throw l.reject(a),a})});f.length?e.resolve(c.call(f,!0,!1)):e.resolve(),b.when.apply(null,g).then(function(){u.splice(0,a.length),v=!1,x()})["catch"](function(){u.splice(0,a.length),v=!1,x()})}},y=function(){this.requiredStrings=[],this.requiredJS=[],this.requiredDates=[],this.currentThemeName=""};y.prototype.requiredStrings=null,y.prototype.requiredDates=[],y.prototype.requiredJS=null,y.prototype.currentThemeName="",y.prototype.getTemplate=function(a){var c=this.currentThemeName,d=c+"/"+a,e=w(d);if(e)return e;var f=u.filter(function(a){return a.searchKey==d});if(f.length)return f[0].deferred.promise();var g=a.split("/"),h=g.shift(),i=g.shift(),j=b.Deferred();return u.push({component:h,name:i,theme:c,searchKey:d,deferred:j}),x(),j.promise()},y.prototype.partialHelper=function(a){var b=this.currentThemeName+"/"+a;return b in q||e.exception(new Error("Failed to pre-fetch the template: "+a)),q[b]},y.prototype.renderIcon=function(a,c,d){var f=g.iconsystemmodule,h=b.Deferred();return require([f],function(a){var b=new a;b instanceof i?(t=b,b.init().then(h.resolve)["catch"](e.exception)):h.reject("Invalid icon system specified"+g.iconsystemmodule)}),h.then(function(a){return this.getTemplate(a.getTemplateName())}.bind(this)).then(function(b){return t.renderIcon(a,c,d,b)})},y.prototype.pixHelper=function(a,b,c){var d=b.split(","),e="",f="",g="";d.length>0&&(e=c(d.shift().trim(),a)),d.length>0&&(f=c(d.shift().trim(),a)),d.length>0&&(g=c(d.join(",").trim(),a));var h=t.getTemplateName(),i=this.currentThemeName+"/"+h,j=q[i];return e=e.replace(/&#x2F;/gi,"/"),t.renderIcon(e,f,g,j)},y.prototype.jsHelper=function(a,b,c){return this.requiredJS.push(c(b,a)),""},y.prototype.stringHelper=function(a,b,c){var d=b.split(","),e="",f="",g="";d.length>0&&(e=d.shift().trim()),d.length>0&&(f=d.shift().trim()),d.length>0&&(g=d.join(",").trim()),""!==g&&(g=c(g,a)),0===g.indexOf("{")&&0!==g.indexOf("{{")&&(g=JSON.parse(g));var h=this.requiredStrings.length;return this.requiredStrings.push({key:e,component:f,param:g}),"[[_s"+h+"]]"},y.prototype.quoteHelper=function(a,b,c){var d=c(b.trim(),a);return d=d.replace('"','\\"').replace(/([\{\}]{2,3})/g,"{{=<% %>=}}$1<%={{ }}=%>"),'"'+d+'"'},y.prototype.shortenTextHelper=function(a,b,c){var d=/(.*?),(.*)/,e=b.match(d),f=e[1].trim(),g=e[2].trim(),h=c(g,a);return m.truncate(h,{length:f,words:!0,ellipsis:"..."})},y.prototype.userDateHelper=function(a,b,c){var d=/(.*?),(.*)/,e=b.match(d),f=c(e[1].trim(),a),g=c(e[2].trim(),a),h=this.requiredDates.length;return this.requiredDates.push({timestamp:f,format:g}),"[[_t_"+h+"]]"},y.prototype.addHelpers=function(a,b){this.currentThemeName=b,this.requiredStrings=[],this.requiredJS=[],a.uniqid=p++,a.str=function(){return this.stringHelper.bind(this,a)}.bind(this),a.pix=function(){return this.pixHelper.bind(this,a)}.bind(this),a.js=function(){return this.jsHelper.bind(this,a)}.bind(this),a.quote=function(){return this.quoteHelper.bind(this,a)}.bind(this),a.shortentext=function(){return this.shortenTextHelper.bind(this,a)}.bind(this),a.userdate=function(){return this.userDateHelper.bind(this,a)}.bind(this),a.globals={config:g},a.currentTheme=b},y.prototype.getJS=function(){var a="";return this.requiredJS.length>0&&(a=this.requiredJS.join(";\n")),a},y.prototype.treatStringsInContent=function(a,b){var c,d,e,f,g,h,i=/\[\[_s\d+\]\]/;do{for(c="",d=a.search(i);d>-1;){c+=a.substring(0,d),a=a.substr(d),e="",f=4,g=a.substr(f,1);do e+=g,f++,g=a.substr(f,1);while("]"!=g);h=b[parseInt(e,10)],"undefined"==typeof h&&(l.debug("Could not find string for pattern [[_s"+e+"]]."),h=""),c+=h,a=a.substr(6+e.length),d=a.search(i)}a=c+a,d=a.search(i)}while(d>-1);return a},y.prototype.treatDatesInContent=function(a,b){return b.forEach(function(b,c){var d="\\[\\[_t_"+c+"\\]\\]",e=new RegExp(d,"g");a=a.replace(e,b)}),a},y.prototype.doRender=function(c,e,f){this.currentThemeName=f;var g=t.getTemplateName(),h=new o("core/templates:doRender");return this.getTemplate(g).then(function(){this.addHelpers(e,f);var d=a.render(c,e,this.partialHelper.bind(this));return b.Deferred().resolve(d.trim(),this.getJS()).promise()}.bind(this)).then(function(a,c){return this.requiredStrings.length>0?d.get_strings(this.requiredStrings).then(function(d){return this.requiredDates=this.requiredDates.map(function(a){return{timestamp:this.treatStringsInContent(a.timestamp,d),format:this.treatStringsInContent(a.format,d)}}.bind(this)),a=this.treatStringsInContent(a,d),c=this.treatStringsInContent(c,d),b.Deferred().resolve(a,c).promise()}.bind(this)):b.Deferred().resolve(a,c).promise()}.bind(this)).then(function(a,c){return this.requiredDates.length>0?n.get(this.requiredDates).then(function(d){return a=this.treatDatesInContent(a,d),c=this.treatDatesInContent(c,d),b.Deferred().resolve(a,c).promise()}.bind(this)):b.Deferred().resolve(a,c).promise()}.bind(this)).then(function(a,c){return h.resolve(),b.Deferred().resolve(a,c).promise()})};var z=function(a){if(""!==a.trim()){var c=b("<script>").attr("type","text/javascript").html(a);b("head").append(c)}},A=function(a,c,d,e){var f=b(a);if(f.length){var g=b(c),h=null;e?(h=new k.NodeList(f.children().get()),h.destroy(!0),f.empty(),f.append(g)):(h=new k.NodeList(f.get()),h.destroy(!0),f.replaceWith(g)),z(d),j.notifyFilterContentUpdated(g)}};y.prototype.scanForPartials=function(b){var c=a.parse(b),d=[],e=function(a,b){var c,d;for(c=0;c<a.length;c++)d=a[c],">"!=d[0]&&"<"!=d[0]||b.push(d[1]),d.length>4&&e(d[4],b)};return e(c,d),d},y.prototype.cachePartials=function(a,c){var d=this.currentThemeName+"/"+a;return d in s?s[d]:(c=c||[d],s[d]=b.Deferred(),this.getTemplate(a).then(function(e){var f=this.scanForPartials(e),g=f.filter(function(b){return!(c.indexOf(this.currentThemeName+"/"+b)>=0)&&b!=a}.bind(this)),h=g.map(function(a){return c.push(this.currentThemeName+"/"+a),this.cachePartials(a,c)}.bind(this));return b.when.apply(b,h).then(function(){return s[d].resolve(e)})}.bind(this))["catch"](s[d].reject),s[d])},y.prototype.render=function(a,c,d){"undefined"==typeof d&&(d=g.theme),this.currentThemeName=d;var f=g.iconsystemmodule,h=b.Deferred();return require([f],function(a){var b=new a;b instanceof i?(t=b,b.init().then(h.resolve)["catch"](e.exception)):h.reject("Invalid icon system specified"+g.iconsystem)}),h.then(function(){return this.cachePartials(a)}.bind(this)).then(function(a){return this.doRender(a,c,d)}.bind(this))};var B=function(a,c,d){var e=b(a);e.length&&(e.prepend(c),z(d),j.notifyFilterContentUpdated(e))},C=function(a,c,d){var e=b(a);e.length&&(e.append(c),z(d),j.notifyFilterContentUpdated(e))};return{render:function(a,b,c){var d=new y;return d.render(a,b,c)},renderPix:function(a,b,c){var d=new y;return d.renderIcon(a,b,c)},runTemplateJS:z,replaceNodeContents:function(a,b,c){A(a,b,c,!0)},replaceNode:function(a,b,c){A(a,b,c,!1)},prependNodeContents:function(a,b,c){B(a,b,c)},appendNodeContents:function(a,b,c){C(a,b,c)}}});
\ No newline at end of file
+define(["core/mustache","jquery","core/ajax","core/str","core/notification","core/url","core/config","core/localstorage","core/icon_system","core/event","core/yui","core/log","core/truncate","core/user_date","core/pending"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o){var p=0,q={},r={},s={},t={},u=[],v=!1,w=["js"],x=function(a){if(a in r)return r[a];if(a in q)return r[a]=b.Deferred().resolve(q[a]).promise(),r[a];var c=h.get("core_template/"+a);return c?(q[a]=c,r[a]=b.Deferred().resolve(c).promise(),r[a]):null},y=function(){if(u.length&&!v){v=!0;var a=u.slice(),e=b.Deferred(),f=[],g=a.map(function(a){var c=a.component,i=a.name,j=a.searchKey,k=a.theme,l=a.deferred,m=null,n=x(j);if(n)m=n;else{f.push({methodname:"core_output_load_template_with_dependencies",args:{component:c,template:i,themename:k,lang:b("html").attr("lang").replace(/-/g,"_")}});var o=f.length-1;m=e.promise().then(function(a){return g[j]=a[o].then(function(a){var b=null;return a.templates.forEach(function(a){var d=[k,a.component,a.name].join("/");q[d]=a.value,h.set("core_template/"+d,a.value),a.component==c&&a.name==i&&(b=a.value)}),a.strings.length&&d.cache_strings(a.strings.map(function(a){return{component:a.component,key:a.name,value:a.value}})),b}),g[j]})}return m.then(function(a){return l.resolve(a)})["catch"](function(a){throw l.reject(a),a})});f.length?e.resolve(c.call(f,!0,!1)):e.resolve(),b.when.apply(null,g).then(function(){u.splice(0,a.length),v=!1,y()})["catch"](function(){u.splice(0,a.length),v=!1,y()})}},z=function(){this.requiredStrings=[],this.requiredJS=[],this.requiredDates=[],this.currentThemeName=""};z.prototype.requiredStrings=null,z.prototype.requiredDates=[],z.prototype.requiredJS=null,z.prototype.currentThemeName="",z.prototype.getTemplate=function(a){var c=this.currentThemeName,d=c+"/"+a,e=x(d);if(e)return e;var f=u.filter(function(a){return a.searchKey==d});if(f.length)return f[0].deferred.promise();var g=a.split("/"),h=g.shift(),i=g.shift(),j=b.Deferred();return u.push({component:h,name:i,theme:c,searchKey:d,deferred:j}),y(),j.promise()},z.prototype.partialHelper=function(a){var b=this.currentThemeName+"/"+a;return b in q||e.exception(new Error("Failed to pre-fetch the template: "+a)),q[b]},z.prototype.renderIcon=function(a,c,d){var f=g.iconsystemmodule,h=b.Deferred();return require([f],function(a){var b=new a;b instanceof i?(t=b,b.init().then(h.resolve)["catch"](e.exception)):h.reject("Invalid icon system specified"+g.iconsystemmodule)}),h.then(function(a){return this.getTemplate(a.getTemplateName())}.bind(this)).then(function(b){return t.renderIcon(a,c,d,b)})},z.prototype.pixHelper=function(a,b,c){var d=b.split(","),e="",f="",g="";d.length>0&&(e=c(d.shift().trim(),a)),d.length>0&&(f=c(d.shift().trim(),a)),d.length>0&&(g=c(d.join(",").trim(),a));var h=t.getTemplateName(),i=this.currentThemeName+"/"+h,j=q[i];return e=e.replace(/&#x2F;/gi,"/"),t.renderIcon(e,f,g,j)},z.prototype.jsHelper=function(a,b,c){return this.requiredJS.push(c(b,a)),""},z.prototype.stringHelper=function(a,b,c){var d=b.split(","),e="",f="",g="";d.length>0&&(e=d.shift().trim()),d.length>0&&(f=d.shift().trim()),d.length>0&&(g=d.join(",").trim()),""!==g&&(g=c(g,a)),0===g.indexOf("{")&&0!==g.indexOf("{{")&&(g=JSON.parse(g));var h=this.requiredStrings.length;return this.requiredStrings.push({key:e,component:f,param:g}),"[[_s"+h+"]]"},z.prototype.quoteHelper=function(a,b,c){var d=c(b.trim(),a);return d=d.replace(/"/g,'\\"').replace(/([\{\}]{2,3})/g,"{{=<% %>=}}$1<%={{ }}=%>").replace(/(\r\n|\r|\n)/g,"&#x0a;"),'"'+d+'"'},z.prototype.shortenTextHelper=function(a,b,c){var d=/(.*?),(.*)/,e=b.match(d),f=e[1].trim(),g=e[2].trim(),h=c(g,a);return m.truncate(h,{length:f,words:!0,ellipsis:"..."})},z.prototype.userDateHelper=function(a,b,c){var d=/(.*?),(.*)/,e=b.match(d),f=c(e[1].trim(),a),g=c(e[2].trim(),a),h=this.requiredDates.length;return this.requiredDates.push({timestamp:f,format:g}),"[[_t_"+h+"]]"},z.prototype.addHelperFunction=function(a,b){return function(){return function(c,d){var e=w.reduce(function(a,c){return b.hasOwnProperty(c)&&(a[c]=b[c]),a},{});w.forEach(function(a){b[a]=function(){return""}});var f=a.apply(this,[b,c,d]);for(var g in e)b[g]=e[g];return f}.bind(this)}.bind(this)},z.prototype.addHelpers=function(a,b){this.currentThemeName=b,this.requiredStrings=[],this.requiredJS=[],a.uniqid=p++,a.str=this.addHelperFunction(this.stringHelper,a),a.pix=this.addHelperFunction(this.pixHelper,a),a.js=this.addHelperFunction(this.jsHelper,a),a.quote=this.addHelperFunction(this.quoteHelper,a),a.shortentext=this.addHelperFunction(this.shortenTextHelper,a),a.userdate=this.addHelperFunction(this.userDateHelper,a),a.globals={config:g},a.currentTheme=b},z.prototype.getJS=function(){var a="";return this.requiredJS.length>0&&(a=this.requiredJS.join(";\n")),a},z.prototype.treatStringsInContent=function(a,b){var c,d,e,f,g,h,i=/\[\[_s\d+\]\]/;do{for(c="",d=a.search(i);d>-1;){c+=a.substring(0,d),a=a.substr(d),e="",f=4,g=a.substr(f,1);do e+=g,f++,g=a.substr(f,1);while("]"!=g);h=b[parseInt(e,10)],"undefined"==typeof h&&(l.debug("Could not find string for pattern [[_s"+e+"]]."),h=""),c+=h,a=a.substr(6+e.length),d=a.search(i)}a=c+a,d=a.search(i)}while(d>-1);return a},z.prototype.treatDatesInContent=function(a,b){return b.forEach(function(b,c){var d="\\[\\[_t_"+c+"\\]\\]",e=new RegExp(d,"g");a=a.replace(e,b)}),a},z.prototype.doRender=function(c,e,f){this.currentThemeName=f;var g=t.getTemplateName(),h=new o("core/templates:doRender");return this.getTemplate(g).then(function(){this.addHelpers(e,f);var d=a.render(c,e,this.partialHelper.bind(this));return b.Deferred().resolve(d.trim(),this.getJS()).promise()}.bind(this)).then(function(a,c){return this.requiredStrings.length>0?d.get_strings(this.requiredStrings).then(function(d){return this.requiredDates=this.requiredDates.map(function(a){return{timestamp:this.treatStringsInContent(a.timestamp,d),format:this.treatStringsInContent(a.format,d)}}.bind(this)),a=this.treatStringsInContent(a,d),c=this.treatStringsInContent(c,d),b.Deferred().resolve(a,c).promise()}.bind(this)):b.Deferred().resolve(a,c).promise()}.bind(this)).then(function(a,c){return this.requiredDates.length>0?n.get(this.requiredDates).then(function(d){return a=this.treatDatesInContent(a,d),c=this.treatDatesInContent(c,d),b.Deferred().resolve(a,c).promise()}.bind(this)):b.Deferred().resolve(a,c).promise()}.bind(this)).then(function(a,c){return h.resolve(),b.Deferred().resolve(a,c).promise()})};var A=function(a){if(""!==a.trim()){var c=b("<script>").attr("type","text/javascript").html(a);b("head").append(c)}},B=function(a,c,d,e){var f=b(a);if(f.length){var g=b(c),h=null;e?(h=new k.NodeList(f.children().get()),h.destroy(!0),f.empty(),f.append(g)):(h=new k.NodeList(f.get()),h.destroy(!0),f.replaceWith(g)),A(d),j.notifyFilterContentUpdated(g)}};z.prototype.scanForPartials=function(b){var c=a.parse(b),d=[],e=function(a,b){var c,d;for(c=0;c<a.length;c++)d=a[c],">"!=d[0]&&"<"!=d[0]||b.push(d[1]),d.length>4&&e(d[4],b)};return e(c,d),d},z.prototype.cachePartials=function(a,c){var d=this.currentThemeName+"/"+a;return d in s?s[d]:(c=c||[d],s[d]=b.Deferred(),this.getTemplate(a).then(function(e){var f=this.scanForPartials(e),g=f.filter(function(b){return!(c.indexOf(this.currentThemeName+"/"+b)>=0)&&b!=a}.bind(this)),h=g.map(function(a){return c.push(this.currentThemeName+"/"+a),this.cachePartials(a,c)}.bind(this));return b.when.apply(b,h).then(function(){return s[d].resolve(e)})}.bind(this))["catch"](s[d].reject),s[d])},z.prototype.render=function(a,c,d){"undefined"==typeof d&&(d=g.theme),this.currentThemeName=d;var f=g.iconsystemmodule,h=b.Deferred();return require([f],function(a){var b=new a;b instanceof i?(t=b,b.init().then(h.resolve)["catch"](e.exception)):h.reject("Invalid icon system specified"+g.iconsystem)}),h.then(function(){return this.cachePartials(a)}.bind(this)).then(function(a){return this.doRender(a,c,d)}.bind(this))};var C=function(a,c,d){var e=b(a);e.length&&(e.prepend(c),A(d),j.notifyFilterContentUpdated(e))},D=function(a,c,d){var e=b(a);e.length&&(e.append(c),A(d),j.notifyFilterContentUpdated(e))};return{render:function(a,b,c){var d=new z;return d.render(a,b,c)},renderPix:function(a,b,c){var d=new z;return d.renderIcon(a,b,c)},runTemplateJS:A,replaceNodeContents:function(a,b,c){B(a,b,c,!0)},replaceNode:function(a,b,c){B(a,b,c,!1)},prependNodeContents:function(a,b,c){C(a,b,c)},appendNodeContents:function(a,b,c){D(a,b,c)}}});
\ No newline at end of file
diff --git a/lib/amd/src/form-autocomplete.js b/lib/amd/src/form-autocomplete.js
index f46a3c044cf77..969367774b44e 100644
--- a/lib/amd/src/form-autocomplete.js
+++ b/lib/amd/src/form-autocomplete.js
@@ -107,13 +107,14 @@ function($, log, str, templates, notification, LoadingIcon) {
                 } else {
                     label = $(ele).html();
                 }
-                items.push({label: label, value: $(ele).attr('value')});
+                if (label !== '') {
+                    items.push({label: label, value: $(ele).attr('value')});
+                }
             }
         });
         var context = $.extend({items: items}, options, state);
-
         // Render the template.
-        return templates.render('core/form_autocomplete_selection', context)
+        return templates.render('core/form_autocomplete_selection_items', context)
         .then(function(html, js) {
             // Add it to the page.
             templates.replaceNodeContents(newSelection, html, js);
@@ -161,19 +162,16 @@ function($, log, str, templates, notification, LoadingIcon) {
     var deselectItem = function(options, state, item, originalSelect) {
         var selectedItemValue = $(item).attr('data-value');
 
-        // We can only deselect items if this is a multi-select field.
-        if (options.multiple) {
-            // Look for a match, and toggle the selected property if there is a match.
-            originalSelect.children('option').each(function(index, ele) {
-                if ($(ele).attr('value') == selectedItemValue) {
-                    $(ele).prop('selected', false);
-                    // We remove newly created custom tags from the suggestions list when they are deselected.
-                    if ($(ele).attr('data-iscustom')) {
-                        $(ele).remove();
-                    }
+        // Look for a match, and toggle the selected property if there is a match.
+        originalSelect.children('option').each(function(index, ele) {
+            if ($(ele).attr('value') == selectedItemValue) {
+                $(ele).prop('selected', false);
+                // We remove newly created custom tags from the suggestions list when they are deselected.
+                if ($(ele).attr('data-iscustom')) {
+                    $(ele).remove();
                 }
-            });
-        }
+            }
+        });
         // Rerender the selection list.
         return updateSelectionList(options, state, originalSelect)
         .then(function() {
@@ -571,6 +569,9 @@ function($, log, str, templates, notification, LoadingIcon) {
             var existingValues = [];
 
             // Now destroy all options that are not currently selected.
+            if (!options.multiple) {
+                originalSelect.children('option').remove();
+            }
             originalSelect.children('option').each(function(optionIndex, option) {
                 option = $(option);
                 if (!option.prop('selected')) {
@@ -718,24 +719,32 @@ function($, log, str, templates, notification, LoadingIcon) {
             window.setTimeout(function() {
                 // Get the current element with focus.
                 var focusElement = $(document.activeElement);
+                var timeoutPromise = $.Deferred();
 
-                // Only close the menu if the input hasn't regained focus, and if the element still exists.
+                // Only close the menu if the input hasn't regained focus and if the element still exists,
+                // and regain focus if the scrollbar is clicked.
                 // Due to the half a second delay, it is possible that the input element no longer exist
                 // by the time this code is being executed.
-                if (focusElement.attr('id') != inputElement.attr('id') && $('#' + state.inputId).length) {
+                if (focusElement.is(document.getElementById(state.suggestionsId))) {
+                    inputElement.focus(); // Probably the scrollbar is clicked. Regain focus.
+                } else if (!focusElement.is(inputElement) && $(document.getElementById(state.inputId)).length) {
                     if (options.tags) {
-                        pendingPromise.then(function() {
+                        timeoutPromise.then(function() {
                             return createItem(options, state, originalSelect);
                         })
                         .catch();
                     }
-                    pendingPromise.then(function() {
+                    timeoutPromise.then(function() {
                         return closeSuggestions(state);
                     })
                     .catch();
                 }
 
-                pendingPromise.resolve();
+                timeoutPromise.then(function() {
+                    return pendingPromise.resolve();
+                })
+                .catch();
+                timeoutPromise.resolve();
             }, 500);
         });
         if (options.showSuggestions) {
diff --git a/lib/amd/src/notification.js b/lib/amd/src/notification.js
index 601e50e6c80d5..3bbe59f309427 100644
--- a/lib/amd/src/notification.js
+++ b/lib/amd/src/notification.js
@@ -26,8 +26,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      2.9
  */
-define(['core/yui', 'jquery', 'core/log'],
-function(Y, $, log) {
+define(['core/yui', 'jquery', 'core/log', 'core/pending'],
+function(Y, $, log, Pending) {
     var notificationModule = {
         types: {
             'success':  'core/notification_success',
@@ -39,6 +39,8 @@ function(Y, $, log) {
         fieldName: 'user-notifications',
 
         fetchNotifications: function() {
+            var pendingPromise = new Pending('core/notification:fetchNotifications');
+
             require(['core/ajax'], function(ajax) {
                 var promises = ajax.call([{
                     methodname: 'core_fetch_notifications',
@@ -47,13 +49,17 @@ function(Y, $, log) {
                     }
                 }]);
 
+                // This currently fails when not logged in.
+                // eslint-disable-next-line promise/catch-or-return
                 promises[0]
-                    .done(notificationModule.addNotifications)
-                    ;
+                .then(notificationModule.addNotifications)
+                .always(pendingPromise.resolve);
             });
         },
 
         addNotifications: function(notifications) {
+            var pendingPromise = new Pending('core/notification:addNotifications');
+
             if (!notifications) {
                 notifications = [];
             }
@@ -61,6 +67,8 @@ function(Y, $, log) {
             $.each(notifications, function(i, notification) {
                 notificationModule.renderNotification(notification.template, notification.variables);
             });
+
+            pendingPromise.resolve();
         },
 
         setupTargetRegion: function() {
@@ -86,13 +94,15 @@ function(Y, $, log) {
         },
 
         addNotification: function(notification) {
+            var pendingPromise = new Pending('core/notification:addNotifications');
+
             var template = notificationModule.types.error;
 
             notification = $.extend({
-                    closebutton:    true,
-                    announce:       true,
-                    type:           'error'
-                }, notification);
+                closebutton:    true,
+                announce:       true,
+                type:           'error'
+            }, notification);
 
             if (notification.template) {
                 template = notification.template;
@@ -104,6 +114,8 @@ function(Y, $, log) {
                 delete notification.type;
             }
 
+            pendingPromise.resolve();
+
             return notificationModule.renderNotification(template, notification);
         },
 
@@ -112,18 +124,25 @@ function(Y, $, log) {
                 log.debug('Notification received without content. Skipping.');
                 return;
             }
+
+            var pendingPromise = new Pending('core/notification:renderNotification');
+
             require(['core/templates'], function(templates) {
                 templates.render(template, variables)
-                    .done(function(html, js) {
-                        $('#' + notificationModule.fieldName).prepend(html);
-                        templates.runTemplateJS(js);
-                    })
-                    .fail(notificationModule.exception)
-                    ;
+                .then(function(html, js) {
+                    $('#' + notificationModule.fieldName).prepend(html);
+                    templates.runTemplateJS(js);
+
+                    return;
+                })
+                .always(pendingPromise.resolve)
+                .catch(notificationModule.exception);
             });
         },
 
         alert: function(title, message, yesLabel) {
+            var pendingPromise = new Pending('core/notification:alert');
+
             // Here we are wrapping YUI. This allows us to start transitioning, but
             // wait for a good alternative without having inconsistent dialogues.
             Y.use('moodle-core-notification-alert', function() {
@@ -134,10 +153,14 @@ function(Y, $, log) {
                 });
 
                 alert.show();
+
+                pendingPromise.resolve();
             });
         },
 
         confirm: function(title, question, yesLabel, noLabel, yesCallback, noCallback) {
+            var pendingPromise = new Pending('core/notification:confirm');
+
             // Here we are wrapping YUI. This allows us to start transitioning, but
             // wait for a good alternative without having inconsistent dialogues.
             Y.use('moodle-core-notification-confirm', function() {
@@ -157,10 +180,14 @@ function(Y, $, log) {
                     });
                 }
                 modal.show();
+
+                pendingPromise.resolve();
             });
         },
 
         exception: function(ex) {
+            var pendingPromise = new Pending('core/notification:addNotifications');
+
             // Fudge some parameters.
             if (typeof ex.stack == 'undefined') {
                 ex.stack = '';
@@ -193,6 +220,8 @@ function(Y, $, log) {
                 var modal = new M.core.exception(ex);
 
                 modal.show();
+
+                pendingPromise.resolve();
             });
         }
     };
diff --git a/lib/amd/src/paged_content_factory.js b/lib/amd/src/paged_content_factory.js
index 82671cf2b46ff..c37fde8dfe35b 100644
--- a/lib/amd/src/paged_content_factory.js
+++ b/lib/amd/src/paged_content_factory.js
@@ -144,6 +144,7 @@ function(
             context.pages.push(page);
         }
 
+        context.barsize = 10;
         return context;
     };
 
diff --git a/lib/amd/src/paged_content_paging_bar.js b/lib/amd/src/paged_content_paging_bar.js
index 4b693b797d12a..fed32da8f3d9e 100644
--- a/lib/amd/src/paged_content_paging_bar.js
+++ b/lib/amd/src/paged_content_paging_bar.js
@@ -20,21 +20,20 @@
  * @copyright  2018 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define(
-    [
-        'jquery',
-        'core/custom_interaction_events',
-        'core/paged_content_events',
-        'core/str',
-        'core/pubsub'
-    ],
-    function(
-        $,
-        CustomEvents,
-        PagedContentEvents,
-        Str,
-        PubSub
-    ) {
+define([
+    'jquery',
+    'core/custom_interaction_events',
+    'core/paged_content_events',
+    'core/str',
+    'core/pubsub'
+],
+function(
+    $,
+    CustomEvents,
+    PagedContentEvents,
+    Str,
+    PubSub
+) {
 
     var SELECTORS = {
         ROOT: '[data-region="paging-bar"]',
@@ -44,7 +43,10 @@ define(
         FIRST_BUTTON: '[data-control="first"]',
         LAST_BUTTON: '[data-control="last"]',
         NEXT_BUTTON: '[data-control="next"]',
-        PREVIOUS_BUTTON: '[data-control="previous"]'
+        PREVIOUS_BUTTON: '[data-control="previous"]',
+        DOTS_BUTTONS: '[data-dots]',
+        BEGINNING_DOTS_BUTTON: '[data-dots="beginning"]',
+        ENDING_DOTS_BUTTON: '[data-dots="ending"]',
     };
 
     /**
@@ -259,6 +261,61 @@ define(
         firstButton.attr('aria-disabled', true);
     };
 
+    /**
+     * Adjusts the size of the paging bar and hides unnecessary pages.
+     *
+     * @param {object} root The root element.
+     */
+    var adjustPagingBarSize = function(root) {
+        var activePageNumber = getActivePageNumber(root);
+        var lastPageNumber = getLastPageNumber(root);
+
+        var dotsButtons = root.find(SELECTORS.DOTS_BUTTONS);
+        var beginningDotsButton = root.find(SELECTORS.BEGINNING_DOTS_BUTTON);
+        var endingDotsButton = root.find(SELECTORS.ENDING_DOTS_BUTTON);
+
+        var pages = root.find(SELECTORS.PAGE);
+        var barSize = parseInt(root.attr('data-bar-size'), 10);
+
+        if (barSize && lastPageNumber > barSize) {
+
+            var minpage = Math.max(activePageNumber - Math.round(barSize / 2), 1);
+            var maxpage = minpage + barSize - 1;
+
+            if (maxpage >= lastPageNumber) {
+                maxpage = lastPageNumber;
+                minpage = maxpage - barSize + 1;
+            }
+
+            if (minpage > 1) {
+                show(beginningDotsButton);
+                minpage++;
+            } else {
+                hide(beginningDotsButton);
+            }
+            if (maxpage < lastPageNumber) {
+                show(endingDotsButton);
+                maxpage--;
+            } else {
+                hide(endingDotsButton);
+            }
+            dotsButtons.addClass('disabled');
+            dotsButtons.attr('aria-disabled', true);
+
+            hide(pages);
+
+            pages.each(function(index, page) {
+                page = $(page);
+                if ((index + 1) >= minpage && (index + 1) <= maxpage) {
+                    show(page);
+                }
+            });
+
+        } else {
+            hide(dotsButtons);
+        }
+    };
+
     /**
      * Enable the previous and first buttons in the paging bar.
      *
@@ -407,6 +464,8 @@ define(
             page.addClass('active');
             page.attr('aria-current', true);
             setActivePageNumber(root, pageNumber);
+
+            adjustPagingBarSize(root);
         }
 
         // Make sure the control buttons are disabled as the user navigates
@@ -546,6 +605,8 @@ define(
             // the next button. This allows the infinite pagination to work.
             getNextButton(root).click();
         }
+
+        adjustPagingBarSize(root);
     };
 
     return {
diff --git a/lib/amd/src/permissionmanager.js b/lib/amd/src/permissionmanager.js
index dcd8712bbbb9b..07721043e58eb 100644
--- a/lib/amd/src/permissionmanager.js
+++ b/lib/amd/src/permissionmanager.js
@@ -105,12 +105,14 @@ define(['jquery', 'core/config', 'core/notification', 'core/templates', 'core/yu
                         templatedata.linkclass = 'preventlink';
                         templatedata.action = 'prevent';
                         templatedata.icon = 't/delete';
+                        templatedata.iconalt = M.util.get_string('deletexrole', 'core_role', overideableroles[roleid]);
                         break;
                     case 'prohibit':
                         templatedata.spanclass = 'forbidden';
                         templatedata.linkclass = 'unprohibitlink';
                         templatedata.action = 'unprohibit';
                         templatedata.icon = 't/delete';
+                        templatedata.iconalt = M.util.get_string('deletexrole', 'core_role', overideableroles[roleid]);
                         break;
                     case 'prevent':
                         row.find('a[data-role-id="' + roleid + '"]').first().closest('.allowed').remove();
@@ -155,10 +157,11 @@ define(['jquery', 'core/config', 'core/notification', 'core/templates', 'core/yu
     var handleAddRole = function(e) {
         e.preventDefault();
 
+        var link = $(e.currentTarget);
+
         // TODO: MDL-57778 Convert to core/modal.
-        Y.use('moodle-core-notification-dialogue', function() {
-            $('body').one('rolesloaded', function() {
-                var link = $(e.currentTarget);
+        $('body').one('rolesloaded', function() {
+            Y.use('moodle-core-notification-dialogue', function() {
                 var action = link.data('action');
                 var row = link.closest('tr.rolecap');
                 var confirmationDetails = {
@@ -201,7 +204,7 @@ define(['jquery', 'core/config', 'core/notification', 'core/templates', 'core/yu
                 .done(function(content) {
                     panel.set('bodyContent', content);
                     panel.show();
-                    $('div.role_buttons').delegate('input', 'click', function(e) {
+                    $('div.role_buttons').on('click', 'input', function(e) {
                         var roleid = $(e.currentTarget).data('role-id');
                         changePermissions(row, roleid, action);
                     });
@@ -222,8 +225,8 @@ define(['jquery', 'core/config', 'core/notification', 'core/templates', 'core/yu
      */
     var handleRemoveRole = function(e) {
         e.preventDefault();
+        var link = $(e.currentTarget);
         $('body').one('rolesloaded', function() {
-            var link = $(e.currentTarget);
             var action = link.data('action');
             var roleid = link.data('role-id');
             var row = link.closest('tr.rolecap');
@@ -256,8 +259,8 @@ define(['jquery', 'core/config', 'core/notification', 'core/templates', 'core/yu
             contextname = args.contextname;
             adminurl = args.adminurl;
             var body = $('body');
-            body.delegate(SELECTORS.ADDROLE, 'click', handleAddRole);
-            body.delegate(SELECTORS.REMOVEROLE, 'click', handleRemoveRole);
+            body.on('click', SELECTORS.ADDROLE, handleAddRole);
+            body.on('click', SELECTORS.REMOVEROLE, handleRemoveRole);
         }
     };
 });
diff --git a/lib/amd/src/pubsub.js b/lib/amd/src/pubsub.js
index 7160c56397cb7..bbd7c96d8d675 100644
--- a/lib/amd/src/pubsub.js
+++ b/lib/amd/src/pubsub.js
@@ -20,7 +20,7 @@
  * @copyright  2018 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define([], function() {
+define(['core/pending'], function(Pending) {
 
     var events = {};
 
@@ -59,11 +59,13 @@ define([], function() {
      * @param {any} data The data to provide to the subscribed callbacks.
      */
     var publish = function(eventName, data) {
+        var pendingPromise = new Pending("Publishing " + eventName);
         if (events[eventName]) {
             events[eventName].forEach(function(callback) {
                 callback(data);
             });
         }
+        pendingPromise.resolve();
     };
 
     return {
diff --git a/lib/amd/src/tag.js b/lib/amd/src/tag.js
index e6b12f1b59780..2527032ad6f62 100644
--- a/lib/amd/src/tag.js
+++ b/lib/amd/src/tag.js
@@ -22,8 +22,25 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      3.0
  */
-define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str', 'core/modal_factory', 'core/modal_events'],
-        function($, ajax, templates, notification, str, ModalFactory, ModalEvents) {
+define([
+    'jquery',
+    'core/ajax',
+    'core/templates',
+    'core/notification',
+    'core/str',
+    'core/modal_factory',
+    'core/modal_events',
+    'core/pending',
+], function(
+    $,
+    ajax,
+    templates,
+    notification,
+    str,
+    ModalFactory,
+    ModalEvents,
+    Pending
+) {
     return /** @alias module:core/tag */ {
 
         /**
@@ -34,27 +51,31 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
         initTagindexPage: function() {
             // Click handler for changing tag type.
             $('body').delegate('.tagarea[data-ta] a[data-quickload=1]', 'click', function(e) {
+                var pendingPromise = new Pending('core/tag:initTagindexPage');
+
                 e.preventDefault();
-                var target = $(this),
-                    query = target[0].search.replace(/^\?/, ''),
-                    tagarea = target.closest('.tagarea[data-ta]'),
-                    args = query.split('&').reduce(function(s, c) {
+                var target = $(this);
+                var query = target[0].search.replace(/^\?/, '');
+                var tagarea = target.closest('.tagarea[data-ta]');
+                var args = query.split('&').reduce(function(s, c) {
                       var t = c.split('=');
                       s[t[0]] = decodeURIComponent(t[1]);
                       return s;
                     }, {});
 
-                var promises = ajax.call([{
+                ajax.call([{
                     methodname: 'core_tag_get_tagindex',
                     args: {tagindex: args}
-                }], true);
-
-                $.when.apply($, promises)
-                    .done(function(data) {
-                        templates.render('core_tag/index', data).done(function(html) {
-                            tagarea.replaceWith(html);
-                        });
-                    });
+                }])[0]
+                .then(function(data) {
+                    return templates.render('core_tag/index', data);
+                })
+                .then(function(html, js) {
+                    templates.replaceNode(tagarea, html, js);
+                    return;
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
             });
         },
 
@@ -64,17 +85,29 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
          * @method initManagePage
          */
         initManagePage: function() {
-
             // Set cell 'time modified' to 'now' when any of the element is updated in this row.
             $('body').on('updated', '[data-inplaceeditable]', function(e) {
-                str.get_string('selecttag', 'core_tag', e.ajaxreturn.value)
-                    .then(function(s) {
-                        return $('label[for="tagselect' + e.ajaxreturn.itemid + '"]').html(s);
-                    })
-                    .fail(notification.exception);
-                str.get_string('now').done(function(s) {
-                    $(e.target).closest('tr').find('td.col-timemodified').html(s);
-                });
+                var pendingPromise = new Pending('core/tag:initManagePage');
+
+                str.get_strings([
+                    {
+                        key: 'selecttag',
+                        component: 'core_tag',
+                    },
+                    {
+                        key: 'now',
+                        component: 'core',
+                    },
+                ])
+                .then(function(result) {
+                    $('label[for="tagselect' + e.ajaxreturn.itemid + '"]').html(result[0]);
+                    $(e.target).closest('tr').find('td.col-timemodified').html(result[1]);
+
+                    return;
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
+
                 if (e.ajaxreturn.itemtype === 'tagflag') {
                     var row = $(e.target).closest('tr');
                     if (e.ajaxreturn.value === '0') {
@@ -87,60 +120,76 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
 
             // Confirmation for single tag delete link.
             $('.tag-management-table').delegate('a.tagdelete', 'click', function(e) {
+                var pendingPromise = new Pending('core/tag:tagdelete');
+
                 e.preventDefault();
                 var href = $(this).attr('href');
                 str.get_strings([
-                        {key: 'delete'},
-                        {key: 'confirmdeletetag', component: 'tag'},
-                        {key: 'yes'},
-                        {key: 'no'},
-                    ]).done(function(s) {
-                        notification.confirm(s[0], s[1], s[2], s[3], function() {
-                            window.location.href = href;
-                        });
-                    }
-                );
+                    {key: 'delete', component: 'core'},
+                    {key: 'confirmdeletetag', component: 'tag'},
+                    {key: 'yes', component: 'core'},
+                    {key: 'no', component: 'core'},
+                ])
+                .then(function(s) {
+                    return notification.confirm(s[0], s[1], s[2], s[3], function() {
+                        window.location.href = href;
+                    });
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
             });
 
             // Confirmation for bulk tag delete button.
             $("#tag-management-delete").click(function(e) {
-                var form = $(this).closest('form').get(0),
-                    cnt = $(form).find("input[type=checkbox]:checked").length;
+                var form = $(this).closest('form').get(0);
+
+                var cnt = $(form).find("input[type=checkbox]:checked").length;
                 if (!cnt) {
                     return;
                 }
+
+                var pendingPromise = new Pending('core/tag:tag-management-delete');
                 var tempElement = $("<input type='hidden'/>").attr('name', this.name);
                 e.preventDefault();
                 str.get_strings([
-                        {key: 'delete'},
-                        {key: 'confirmdeletetags', component: 'tag'},
-                        {key: 'yes'},
-                        {key: 'no'},
-                    ]).done(function(s) {
-                        notification.confirm(s[0], s[1], s[2], s[3], function() {
-                            tempElement.appendTo(form);
-                            form.submit();
-                        });
-                    }
-                );
+                    {key: 'delete', component: 'core'},
+                    {key: 'confirmdeletetags', component: 'tag'},
+                    {key: 'yes', component: 'core'},
+                    {key: 'no', component: 'core'},
+                ])
+                .then(function(s) {
+                    return notification.confirm(s[0], s[1], s[2], s[3], function() {
+                        tempElement.appendTo(form);
+                        form.submit();
+                    });
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
             });
 
             // Confirmation for bulk tag combine button.
             $("#tag-management-combine").click(function(e) {
+                var pendingPromise = new Pending('core/tag:tag-management-combine');
+
                 e.preventDefault();
-                var form = $(this).closest('form').get(0),
-                    tags = $(form).find("input[type=checkbox]:checked");
+                var form = $(this).closest('form').get(0);
+                var tags = $(form).find("input[type=checkbox]:checked");
+
                 if (tags.length <= 1) {
                     str.get_strings([
                         {key: 'combineselected', component: 'tag'},
                         {key: 'selectmultipletags', component: 'tag'},
                         {key: 'ok'},
-                    ]).done(function(s) {
-                            notification.alert(s[0], s[1], s[2]);
-                        }
-                    );
+                    ])
+                    .then(function(s) {
+                        return notification.alert(s[0], s[1], s[2]);
+                    })
+                    .always(pendingPromise.resolve)
+                    .catch(notification.exception);
+
                     return;
                 }
+
                 var tempElement = $("<input type='hidden'/>").attr('name', this.name);
                 var saveButtonText = '';
                 var tagOptions = [];
@@ -155,8 +204,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
 
                 str.get_strings([
                     {key: 'combineselected', component: 'tag'},
-                    {key: 'continue'}
-                ]).then(function(langStrings) {
+                    {key: 'continue', component: 'core'}
+                ])
+                .then(function(langStrings) {
                     var modalTitle = langStrings[0];
                     saveButtonText = langStrings[1];
                     var templateContext = {
@@ -167,9 +217,14 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                         body: templates.render('core_tag/combine_tags', templateContext),
                         type: ModalFactory.types.SAVE_CANCEL
                     });
-                }).then(function(modal) {
+                })
+                .then(function(modal) {
                     modal.setSaveButtonText(saveButtonText);
 
+                    return modal;
+                })
+                .then(function(modal) {
+
                     // Handle save event.
                     modal.getRoot().on(ModalEvents.save, function(e) {
                         e.preventDefault();
@@ -196,7 +251,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
 
                     return;
 
-                }).catch(notification.exception);
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
             });
 
             // When user changes tag name to some name that already exists suggest to combine the tags.
@@ -205,43 +262,41 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                 var newvalue = e.newvalue; // The value that user tried to udpated the element to.
                 var tagid = $(e.target).attr('data-itemid');
                 if (exception.errorcode === 'namesalreadybeeingused') {
+                    var pendingPromise = new Pending('core/tag:updatefailed');
+
                     e.preventDefault(); // This will prevent default error dialogue.
                     str.get_strings([
                         {key: 'nameuseddocombine', component: 'tag'},
                         {key: 'yes'},
                         {key: 'cancel'},
-                    ]).done(function(s) {
-                        notification.confirm(e.message, s[0], s[1], s[2], function() {
+                    ])
+                    .then(function(s) {
+                        return notification.confirm(e.message, s[0], s[1], s[2], function() {
                             window.location.href = window.location.href + "&newname=" + encodeURIComponent(newvalue) +
                                 "&tagid=" + encodeURIComponent(tagid) +
                                 '&action=renamecombine&sesskey=' + M.cfg.sesskey;
                         });
-                    });
+                    })
+                    .always(pendingPromise.resolve)
+                    .catch(notification.exception);
                 }
             });
 
             // Form for adding standard tags.
             $('body').on('click', 'a[data-action=addstandardtag]', function(e) {
+                var pendingPromise = new Pending('core/tag:addstandardtag');
                 e.preventDefault();
 
-                var saveButtonText = '';
-                str.get_strings([
-                    {key: 'addotags', component: 'tag'},
-                    {key: 'continue'}
-                ]).then(function(langStrings) {
-                    var modalTitle = langStrings[0];
-                    saveButtonText = langStrings[1];
-                    var templateContext = {
+                return ModalFactory.create({
+                    title: str.get_string('addotags', 'tag'),
+                    body: templates.render('core_tag/add_tags', {
                         actionurl: window.location.href,
                         sesskey: M.cfg.sesskey
-                    };
-                    return ModalFactory.create({
-                        title: modalTitle,
-                        body: templates.render('core_tag/add_tags', templateContext),
-                        type: ModalFactory.types.SAVE_CANCEL
-                    });
-                }).then(function(modal) {
-                    modal.setSaveButtonText(saveButtonText);
+                    }),
+                    type: ModalFactory.types.SAVE_CANCEL
+                })
+                .then(function(modal) {
+                    modal.setSaveButtonText(str.get_string('continue', 'core'));
 
                     // Handle save event.
                     modal.getRoot().on(ModalEvents.save, function(e) {
@@ -285,7 +340,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
 
                     return;
 
-                }).catch(notification.exception);
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
             });
         },
 
@@ -296,6 +353,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
          */
         initManageCollectionsPage: function() {
             $('body').on('updated', '[data-inplaceeditable]', function(e) {
+                var pendingPromise = new Pending('core/tag:initManageCollectionsPage-updated');
+
                 var ajaxreturn = e.ajaxreturn,
                     areaid, collid, isenabled;
                 if (ajaxreturn.component === 'core_tag' && ajaxreturn.itemtype === 'tagareaenable') {
@@ -319,9 +378,13 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                         $(".tag-collections-table ul[data-collectionid=" + collid + "] li[data-areaid=" + areaid + "]").show();
                     }
                 }
+
+                pendingPromise.resolve();
             });
 
             $('body').on('click', '.addtagcoll > a', function(e) {
+                var pendingPromise = new Pending('core/tag:initManageCollectionsPage-addtagcoll');
+
                 e.preventDefault();
                 var keys = [
                     {
@@ -329,13 +392,15 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                         component: 'tag'
                     },
                     {
-                        key: 'create'
+                        key: 'create',
+                        component: 'core'
                     }
                 ];
 
                 var href = $(this).attr('data-url');
                 var saveButtonText = '';
-                str.get_strings(keys).then(function(langStrings) {
+                str.get_strings(keys)
+                .then(function(langStrings) {
                     var modalTitle = langStrings[0];
                     saveButtonText = langStrings[1];
                     var templateContext = {
@@ -347,7 +412,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                         body: templates.render('core_tag/add_tag_collection', templateContext),
                         type: ModalFactory.types.SAVE_CANCEL
                     });
-                }).then(function(modal) {
+                })
+                .then(function(modal) {
                     modal.setSaveButtonText(saveButtonText);
 
                     // Handle save event.
@@ -388,25 +454,31 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
 
                     modal.show();
 
-                    return;
+                    return modal;
 
-                }).catch(notification.exception);
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
             });
 
             $('body').on('click', '.tag-collections-table .action_delete', function(e) {
+                var pendingPromise = new Pending('core/tag:initManageCollectionsPage-action_delete');
+
                 e.preventDefault();
                 var href = $(this).attr('data-url') + '&sesskey=' + M.cfg.sesskey;
                 str.get_strings([
-                        {key: 'delete'},
-                        {key: 'suredeletecoll', component: 'tag', param: $(this).attr('data-collname')},
-                        {key: 'yes'},
-                        {key: 'no'},
-                    ]).done(function(s) {
-                        notification.confirm(s[0], s[1], s[2], s[3], function() {
-                            window.location.href = href;
-                        });
-                    }
-                );
+                    {key: 'delete'},
+                    {key: 'suredeletecoll', component: 'tag', param: $(this).attr('data-collname')},
+                    {key: 'yes'},
+                    {key: 'no'},
+                ])
+                .then(function(s) {
+                    return notification.confirm(s[0], s[1], s[2], s[3], function() {
+                        window.location.href = href;
+                    });
+                })
+                .always(pendingPromise.resolve)
+                .catch(notification.exception);
             });
         }
     };
diff --git a/lib/amd/src/templates.js b/lib/amd/src/templates.js
index 89212f070fa88..b97bf19cfefcc 100644
--- a/lib/amd/src/templates.js
+++ b/lib/amd/src/templates.js
@@ -65,6 +65,9 @@ define([
     /** @var {Bool} isLoadingTemplates - Whether templates are currently being loaded */
     var isLoadingTemplates = false;
 
+    /** @var {Array} blacklistedNestedHelpers - List of helpers that can't be called within other helpers */
+    var blacklistedNestedHelpers = ['js'];
+
     /**
      * Search the various caches for a template promise for the given search key.
      * The search key should be in the format <theme>/<component>/<template> e.g. boost/core/modal.
@@ -484,8 +487,9 @@ define([
         // Escape the {{ and the ".
         // This involves wrapping {{, and }} in change delimeter tags.
         content = content
-            .replace('"', '\\"')
+            .replace(/"/g, '\\"')
             .replace(/([\{\}]{2,3})/g, '{{=<% %>=}}$1<%={{ }}=%>')
+            .replace(/(\r\n|\r|\n)/g, '&#x0a;')
             ;
         return '"' + content + '"';
     };
@@ -543,6 +547,60 @@ define([
         return '[[_t_' + index + ']]';
     };
 
+    /**
+     * Return a helper function to be added to the context for rendering the a
+     * template.
+     *
+     * This will parse the provided text before giving it to the helper function
+     * in order to remove any blacklisted nested helpers to prevent one helper
+     * from calling another.
+     *
+     * In particular to prevent the JS helper from being called from within another
+     * helper because it can lead to security issues when the JS portion is user
+     * provided.
+     *
+     * @param  {function} helperFunction The helper function to add
+     * @param  {object} context The template context for the helper function
+     * @return {Function} To be set in the context
+     */
+    Renderer.prototype.addHelperFunction = function(helperFunction, context) {
+        return function() {
+            return function(sectionText, helper) {
+                // Override the blacklisted helpers in the template context with
+                // a function that returns an empty string for use when executing
+                // other helpers. This is to prevent these helpers from being
+                // executed as part of the rendering of another helper in order to
+                // prevent any potential security issues.
+                var originalHelpers = blacklistedNestedHelpers.reduce(function(carry, name) {
+                    if (context.hasOwnProperty(name)) {
+                        carry[name] = context[name];
+                    }
+
+                    return carry;
+                }, {});
+
+                blacklistedNestedHelpers.forEach(function(helperName) {
+                    context[helperName] = function() {
+                        return '';
+                    };
+                });
+
+                // Execute the helper with the modified context that doesn't include
+                // the blacklisted nested helpers. This prevents the blacklisted
+                // helpers from being called from within other helpers.
+                var result = helperFunction.apply(this, [context, sectionText, helper]);
+
+                // Restore the original helper implementation in the context so that
+                // any further rendering has access to them again.
+                for (var name in originalHelpers) {
+                    context[name] = originalHelpers[name];
+                }
+
+                return result;
+            }.bind(this);
+        }.bind(this);
+    };
+
     /**
      * Add some common helper functions to all context objects passed to templates.
      * These helpers match exactly the helpers available in php.
@@ -557,24 +615,12 @@ define([
         this.requiredStrings = [];
         this.requiredJS = [];
         context.uniqid = (uniqInstances++);
-        context.str = function() {
-          return this.stringHelper.bind(this, context);
-        }.bind(this);
-        context.pix = function() {
-          return this.pixHelper.bind(this, context);
-        }.bind(this);
-        context.js = function() {
-          return this.jsHelper.bind(this, context);
-        }.bind(this);
-        context.quote = function() {
-          return this.quoteHelper.bind(this, context);
-        }.bind(this);
-        context.shortentext = function() {
-          return this.shortenTextHelper.bind(this, context);
-        }.bind(this);
-        context.userdate = function() {
-          return this.userDateHelper.bind(this, context);
-        }.bind(this);
+        context.str = this.addHelperFunction(this.stringHelper, context);
+        context.pix = this.addHelperFunction(this.pixHelper, context);
+        context.js = this.addHelperFunction(this.jsHelper, context);
+        context.quote = this.addHelperFunction(this.quoteHelper, context);
+        context.shortentext = this.addHelperFunction(this.shortenTextHelper, context);
+        context.userdate = this.addHelperFunction(this.userDateHelper, context);
         context.globals = {config: config};
         context.currentTheme = themeName;
     };
diff --git a/lib/antivirus/clamav/db/upgrade.php b/lib/antivirus/clamav/db/upgrade.php
index 493f0fd5dcac6..189c81a5d26b4 100644
--- a/lib/antivirus/clamav/db/upgrade.php
+++ b/lib/antivirus/clamav/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_antivirus_clamav_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/authlib.php b/lib/authlib.php
index 4308a43d00ca0..2dd51cfcda621 100644
--- a/lib/authlib.php
+++ b/lib/authlib.php
@@ -766,6 +766,9 @@ public static function prepare_identity_providers_for_output($identityproviders,
      * @return string[] An array of strings with keys subject and message
      */
     public function get_password_change_info(stdClass $user) : array {
+
+        global $USER;
+
         $site = get_site();
         $systemcontext = context_system::instance();
 
@@ -776,13 +779,18 @@ public function get_password_change_info(stdClass $user) : array {
         $data->sitename  = format_string($site->fullname);
         $data->admin     = generate_email_signoff();
 
+        // This is a workaround as change_password_url() is designed to allow
+        // use of the $USER global. See MDL-66984.
+        $olduser = $USER;
+        $USER = $user;
         if ($this->can_change_password() and $this->change_password_url()) {
             // We have some external url for password changing.
-            $data->link = $this->change_password_url();
+            $data->link = $this->change_password_url()->out();
         } else {
             // No way to change password, sorry.
             $data->link = '';
         }
+        $USER = $olduser;
 
         if (!empty($data->link) and has_capability('moodle/user:changeownpassword', $systemcontext, $user->id)) {
             $subject = get_string('emailpasswordchangeinfosubject', '', format_string($site->fullname));
diff --git a/lib/badgeslib.php b/lib/badgeslib.php
index 986e503f80ea1..940d567ca972e 100644
--- a/lib/badgeslib.php
+++ b/lib/badgeslib.php
@@ -233,13 +233,16 @@ function badges_calculate_message_schedule($schedule) {
 
     switch ($schedule) {
         case BADGE_MESSAGE_DAILY:
-            $nextcron = time() + 60 * 60 * 24;
+            $tomorrow = new DateTime("1 day", core_date::get_server_timezone_object());
+            $nextcron = $tomorrow->getTimestamp();
             break;
         case BADGE_MESSAGE_WEEKLY:
-            $nextcron = time() + 60 * 60 * 24 * 7;
+            $nextweek = new DateTime("1 week", core_date::get_server_timezone_object());
+            $nextcron = $nextweek->getTimestamp();
             break;
         case BADGE_MESSAGE_MONTHLY:
-            $nextcron = time() + 60 * 60 * 24 * 7 * 30;
+            $nextmonth = new DateTime("1 month", core_date::get_server_timezone_object());
+            $nextcron = $nextmonth->getTimestamp();
             break;
     }
 
@@ -500,10 +503,13 @@ function badges_bake($hash, $badgeid, $userid = 0, $pathhash = false) {
             $contents = $file->get_content();
 
             $filehandler = new PNG_MetaDataHandler($contents);
-            $assertion = new moodle_url('/badges/assertion.php', array('b' => $hash));
-            if ($filehandler->check_chunks("tEXt", "openbadges")) {
-                // Add assertion URL tExt chunk.
-                $newcontents = $filehandler->add_chunks("tEXt", "openbadges", $assertion->out(false));
+            // For now, the site backpack OB version will be used as default.
+            $obversion = badges_open_badges_backpack_api();
+            $assertion = new core_badges_assertion($hash, $obversion);
+            $assertionjson = json_encode($assertion->get_badge_assertion());
+            if ($filehandler->check_chunks("iTXt", "openbadges")) {
+                // Add assertion URL iTXt chunk.
+                $newcontents = $filehandler->add_chunks("iTXt", "openbadges", $assertionjson);
                 $fileinfo = array(
                         'contextid' => $user_context->id,
                         'component' => 'badges',
@@ -856,45 +862,6 @@ function badges_get_badge_api_versions() {
     ];
 }
 
-/**
- * Called on install or upgrade to create default list of backpacks a user can connect to.
- *
- * @return void
- */
-function badges_install_default_backpacks() {
-    global $DB;
-
-    $record = new stdClass();
-    $record->backpackweburl = BADGE_BACKPACKWEBURL;
-    $record->backpackapiurl = BADGE_BACKPACKAPIURL;
-    $record->apiversion = OPEN_BADGES_V1;
-    $record->sortorder = 0;
-    $record->password = '';
-
-    $bpid = 0;
-    if (!($bp = $DB->get_record('badge_external_backpack', array('backpackapiurl' => $record->backpackapiurl)))) {
-        $bpid = $DB->insert_record('badge_external_backpack', $record);
-    } else {
-        $bpid = $bp->id;
-    }
-    set_config('badges_site_backpack', $bpid);
-
-    // All existing backpacks default to V1.
-    $DB->set_field('badge_backpack', 'externalbackpackid', $bpid);
-
-    $record = new stdClass();
-    $record->backpackapiurl = BADGRIO_BACKPACKAPIURL;
-    $record->backpackweburl = BADGRIO_BACKPACKWEBURL;
-    $record->apiversion = OPEN_BADGES_V2;
-    $record->sortorder = 1;
-    $record->password = '';
-
-    if (!$DB->record_exists('badge_external_backpack', array('backpackapiurl' => $record->backpackapiurl))) {
-        $DB->insert_record('badge_external_backpack', $record);
-    }
-
-}
-
 /**
  * Get the default issuer for a badge from this site.
  *
diff --git a/lib/behat/behat_base.php b/lib/behat/behat_base.php
index 750251bb7547f..729ac1eff9bc0 100644
--- a/lib/behat/behat_base.php
+++ b/lib/behat/behat_base.php
@@ -32,8 +32,12 @@
 use Behat\Mink\Exception\ExpectationException;
 use Behat\Mink\Exception\ElementNotFoundException;
 use Behat\Mink\Element\NodeElement;
+use Behat\Mink\Element\Element;
 use Behat\Mink\Session;
 
+require_once(__DIR__ . '/classes/component_named_selector.php');
+require_once(__DIR__ . '/classes/component_named_replacement.php');
+
 /**
  * Steps definitions base class.
  *
@@ -115,14 +119,6 @@ protected function locate_path($path) {
      * @return NodeElement
      */
     protected function find($selector, $locator, $exception = false, $node = false, $timeout = false) {
-
-        // Throw exception, so dev knows it is not supported.
-        if ($selector === 'named') {
-            $exception = 'Using the "named" selector is deprecated as of 3.1. '
-                .' Use the "named_partial" or use the "named_exact" selector instead.';
-            throw new ExpectationException($exception, $this->getSession());
-        }
-
         // Returns the first match.
         $items = $this->find_all($selector, $locator, $exception, $node, $timeout);
         return count($items) ? reset($items) : null;
@@ -137,12 +133,11 @@ protected function find($selector, $locator, $exception = false, $node = false,
      * @param string $selector The selector type (css, xpath, named...)
      * @param mixed $locator It depends on the $selector, can be the xpath, a name, a css locator...
      * @param Exception $exception Otherwise we throw expcetion with generic info
-     * @param NodeElement $node Spins around certain DOM node instead of the whole page
+     * @param NodeElement $container Restrict the search to just children of the specified container
      * @param int $timeout Forces a specific time out (in seconds). If 0 is provided the default timeout will be applied.
      * @return array NodeElements list
      */
-    protected function find_all($selector, $locator, $exception = false, $node = false, $timeout = false) {
-
+    protected function find_all($selector, $locator, $exception = false, $container = false, $timeout = false) {
         // Throw exception, so dev knows it is not supported.
         if ($selector === 'named') {
             $exception = 'Using the "named" selector is deprecated as of 3.1. '
@@ -152,7 +147,6 @@ protected function find_all($selector, $locator, $exception = false, $node = fal
 
         // Generic info.
         if (!$exception) {
-
             // With named selectors we can be more specific.
             if (($selector == 'named_exact') || ($selector == 'named_partial')) {
                 $exceptiontype = $locator[0];
@@ -171,12 +165,6 @@ protected function find_all($selector, $locator, $exception = false, $node = fal
             $exception = new ElementNotFoundException($this->getSession(), $exceptiontype, null, $exceptionlocator);
         }
 
-        $params = array('selector' => $selector, 'locator' => $locator);
-        // Pushing $node if required.
-        if ($node) {
-            $params['node'] = $node;
-        }
-
         // How much we will be waiting for the element to appear.
         if (!$timeout) {
             $timeout = self::get_timeout();
@@ -188,42 +176,83 @@ protected function find_all($selector, $locator, $exception = false, $node = fal
             $microsleep = true;
         }
 
+        // Normalise the values in order to perform the search.
+        [
+            'selector' => $selector,
+            'locator' => $locator,
+            'container' => $container,
+        ] = $this->normalise_selector($selector, $locator, $container ?: $this->getSession()->getPage());
+
         // Waits for the node to appear if it exists, otherwise will timeout and throw the provided exception.
         return $this->spin(
-            function($context, $args) {
+            function() use ($selector, $locator, $container) {
+                return $container->findAll($selector, $locator);
+            }, [], $timeout, $exception, $microsleep
+        );
+    }
 
-                // If no DOM node provided look in all the page.
-                if (empty($args['node'])) {
-                    return $context->getSession()->getPage()->findAll($args['selector'], $args['locator']);
-                }
+    /**
+     * Normalise the locator and selector.
+     *
+     * @param string $selector The type of thing to search
+     * @param mixed $locator The locator value. Can be an array, but is more likely a string.
+     * @param Element $container An optional container to search within
+     * @return array The selector, locator, and container to search within
+     */
+    public function normalise_selector(string $selector, $locator, Element $container): array {
+        // Check for specific transformations for this selector type.
+        $transformfunction = "transform_find_for_{$selector}";
+        if (method_exists('behat_selectors', $transformfunction)) {
+            // A selector-specific transformation exists.
+            // Perform initial transformation of the selector within the current container.
+            [
+                'selector' => $selector,
+                'locator' => $locator,
+                'container' => $container,
+            ] = behat_selectors::{$transformfunction}($this, $locator, $container);
+        }
 
-                // For nodes contained in other nodes we can not use the basic named selectors
-                // as they include unions and they would look for matches in the DOM root.
-                $elementxpath = $context->getSession()->getSelectorsHandler()->selectorToXpath($args['selector'], $args['locator']);
-
-                // Split the xpath in unions and prefix them with the container xpath.
-                $unions = explode('|', $elementxpath);
-                foreach ($unions as $key => $union) {
-                    $union = trim($union);
-
-                    // We are in the container node.
-                    if (strpos($union, '.') === 0) {
-                        $union = substr($union, 1);
-                    } else if (strpos($union, '/') !== 0) {
-                        // Adding the path separator in case it is not there.
-                        $union = '/' . $union;
-                    }
-                    $unions[$key] = $args['node']->getXpath() . $union;
+        // Normalise the css and xpath selector types.
+        if ('css_element' === $selector) {
+            $selector = 'css';
+        } else if ('xpath_element' === $selector) {
+            $selector = 'xpath';
+        }
+
+        // Convert to a named selector where the selector type is not a known selector.
+        $converttonamed = !$this->getSession()->getSelectorsHandler()->isSelectorRegistered($selector);
+        $converttonamed = $converttonamed && 'xpath' !== $selector;
+        if ($converttonamed) {
+            if (behat_partial_named_selector::is_deprecated_selector($selector)) {
+                if ($replacement = behat_partial_named_selector::get_deprecated_replacement($selector)) {
+                    error_log("The '{$selector}' selector has been replaced with {$replacement}");
+                    $selector = $replacement;
                 }
+            } else if (behat_exact_named_selector::is_deprecated_selector($selector)) {
+                if ($replacement = behat_exact_named_selector::get_deprecated_replacement($selector)) {
+                    error_log("The '{$selector}' selector has been replaced with {$replacement}");
+                    $selector = $replacement;
+                }
+            }
 
-                // We can not use usual Element::find() as it prefixes with DOM root.
-                return $context->getSession()->getDriver()->find(implode('|', $unions));
-            },
-            $params,
-            $timeout,
-            $exception,
-            $microsleep
-        );
+            $allowedpartialselectors = behat_partial_named_selector::get_allowed_selectors();
+            $allowedexactselectors = behat_exact_named_selector::get_allowed_selectors();
+            if (isset($allowedpartialselectors[$selector])) {
+                $locator = behat_selectors::normalise_named_selector($allowedpartialselectors[$selector], $locator);
+                $selector = 'named_partial';
+            } else if (isset($allowedexactselectors[$selector])) {
+                $locator = behat_selectors::normalise_named_selector($allowedexactselectors[$selector], $locator);
+                $selector = 'named_exact';
+            } else {
+                throw new ExpectationException("The '{$selector}' selector type is not registered.", $this->getSession()->getDriver());
+            }
+        }
+
+        return [
+            'selector' => $selector,
+            'locator' => $locator,
+            'container' => $container,
+        ];
     }
 
     /**
@@ -249,27 +278,14 @@ function($context, $args) {
      * @return NodeElement
      */
     public function __call($name, $arguments) {
-
-        if (substr($name, 0, 5) !== 'find_') {
-            throw new coding_exception('The "' . $name . '" method does not exist');
+        if (substr($name, 0, 5) === 'find_') {
+            return call_user_func_array([$this, 'find'], array_merge(
+                [substr($name, 5)],
+                $arguments
+            ));
         }
 
-        // Only the named selector identifier.
-        $cleanname = substr($name, 5);
-
-        // All named selectors shares the interface.
-        if (count($arguments) !== 1) {
-            throw new coding_exception('The "' . $cleanname . '" named selector needs the locator as it\'s single argument');
-        }
-
-        // Redirecting execution to the find method with the specified selector.
-        // It will detect if it's pointing to an unexisting named selector.
-        return $this->find('named_partial',
-            array(
-                $cleanname,
-                behat_context_helper::escape($arguments[0])
-            )
-        );
+        throw new coding_exception("The '{$name}' method does not exist");
     }
 
     /**
@@ -322,20 +338,11 @@ protected function spin($lambda, $args = false, $timeout = false, $exception = f
         if (!$timeout) {
             $timeout = self::get_timeout();
         }
-        if ($microsleep) {
-            // Will sleep 1/10th of a second by default for self::get_timeout() seconds.
-            $loops = $timeout * 10;
-        } else {
-            // Will sleep for self::get_timeout() seconds.
-            $loops = $timeout;
-        }
 
-        // DOM will never change on non-javascript case; do not wait or try again.
-        if (!$this->running_javascript()) {
-            $loops = 1;
-        }
+        $start = microtime(true);
+        $end = $start + $timeout;
 
-        for ($i = 0; $i < $loops; $i++) {
+        do {
             // We catch the exception thrown by the step definition to execute it again.
             try {
                 // We don't check with !== because most of the time closures will return
@@ -351,14 +358,13 @@ protected function spin($lambda, $args = false, $timeout = false, $exception = f
                 }
             }
 
-            if ($this->running_javascript()) {
-                if ($microsleep) {
-                    usleep(100000);
-                } else {
-                    sleep(1);
-                }
+            if (!$this->running_javascript()) {
+                break;
             }
-        }
+
+            usleep(100000);
+
+        } while (microtime(true) < $end);
 
         // Using coding_exception as is a development issue if no exception has been provided.
         if (!$exception) {
@@ -380,12 +386,7 @@ protected function spin($lambda, $args = false, $timeout = false, $exception = f
      * @return NodeElement
      */
     protected function get_selected_node($selectortype, $element) {
-
-        // Getting Mink selector and locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-
-        // Returns the NodeElement.
-        return $this->find($selector, $locator);
+        return $this->find($selectortype, $element);
     }
 
     /**
@@ -397,7 +398,6 @@ protected function get_selected_node($selectortype, $element) {
      * @return NodeElement
      */
     protected function get_text_selector_node($selectortype, $element) {
-
         // Getting Mink selector and locator.
         list($selector, $locator) = $this->transform_text_selector($selectortype, $element);
 
@@ -416,18 +416,13 @@ protected function get_text_selector_node($selectortype, $element) {
      * @return NodeElement
      */
     protected function get_node_in_container($selectortype, $element, $containerselectortype, $containerelement) {
-
         // Gets the container, it will always be text based.
         $containernode = $this->get_text_selector_node($containerselectortype, $containerelement);
 
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-
-        // Specific exception giving info about where can't we find the element.
         $locatorexceptionmsg = $element . '" in the "' . $containerelement. '" "' . $containerselectortype. '"';
         $exception = new ElementNotFoundException($this->getSession(), $selectortype, null, $locatorexceptionmsg);
 
-        // Looks for the requested node inside the container node.
-        return $this->find($selector, $locator, $exception, $containernode);
+        return $this->find($selectortype, $element, $exception, $containernode);
     }
 
     /**
@@ -446,14 +441,18 @@ protected function get_node_in_container($selectortype, $element, $containersele
      * @return array Contains the selector and the locator expected by Mink.
      */
     protected function transform_selector($selectortype, $element) {
-
         // Here we don't know if an allowed text selector is being used.
         $selectors = behat_selectors::get_allowed_selectors();
         if (!isset($selectors[$selectortype])) {
             throw new ExpectationException('The "' . $selectortype . '" selector type does not exist', $this->getSession());
         }
 
-        return behat_selectors::get_behat_selector($selectortype, $element, $this->getSession());
+        [
+            'selector' => $selector,
+            'locator' => $locator,
+        ] = $this->normalise_selector($selectortype, $element, $this->getSession()->getPage());
+
+        return [$selector, $locator];
     }
 
     /**
@@ -505,63 +504,68 @@ protected function is_in_app() : bool {
      * Spins around an element until it exists
      *
      * @throws ExpectationException
-     * @param string $element
+     * @param string $locator
      * @param string $selectortype
      * @return void
      */
-    protected function ensure_element_exists($element, $selectortype) {
-
-        // Getting the behat selector & locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-
+    protected function ensure_element_exists($locator, $selectortype) {
         // Exception if it timesout and the element is still there.
-        $msg = 'The "' . $element . '" element does not exist and should exist';
+        $msg = "The '{$locator}' element does not exist and should";
         $exception = new ExpectationException($msg, $this->getSession());
 
+        // Normalise the values in order to perform the search.
+        [
+            'selector' => $selector,
+            'locator' => $locator,
+            'container' => $container,
+        ] = $this->normalise_selector($selectortype, $locator, $this->getSession()->getPage());
+
         // It will stop spinning once the find() method returns true.
         $this->spin(
-            function($context, $args) {
-                // We don't use behat_base::find as it is already spinning.
-                if ($context->getSession()->getPage()->find($args['selector'], $args['locator'])) {
+            function() use ($selector, $locator, $container) {
+                if ($container->find($selector, $locator)) {
                     return true;
                 }
                 return false;
             },
-            array('selector' => $selector, 'locator' => $locator),
+            [],
             self::get_extended_timeout(),
             $exception,
             true
         );
-
     }
 
     /**
      * Spins until the element does not exist
      *
      * @throws ExpectationException
-     * @param string $element
+     * @param string $locator
      * @param string $selectortype
      * @return void
      */
-    protected function ensure_element_does_not_exist($element, $selectortype) {
-
-        // Getting the behat selector & locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-
+    protected function ensure_element_does_not_exist($locator, $selectortype) {
         // Exception if it timesout and the element is still there.
-        $msg = 'The "' . $element . '" element exists and should not exist';
+        $msg = "The '{$locator}' element exists and should not exist";
         $exception = new ExpectationException($msg, $this->getSession());
 
+        // Normalise the values in order to perform the search.
+        [
+            'selector' => $selector,
+            'locator' => $locator,
+            'container' => $container,
+        ] = $this->normalise_selector($selectortype, $locator, $this->getSession()->getPage());
+
         // It will stop spinning once the find() method returns false.
         $this->spin(
-            function($context, $args) {
-                // We don't use behat_base::find() as we are already spinning.
-                if (!$context->getSession()->getPage()->find($args['selector'], $args['locator'])) {
-                    return true;
+            function() use ($selector, $locator, $container) {
+                if ($container->find($selector, $locator)) {
+                    return false;
                 }
-                return false;
+                return true;
             },
-            array('selector' => $selector, 'locator' => $locator),
+            // Note: We cannot use $this because the find will then be $this->find(), which leads us to a nested spin().
+            // We cannot nest spins because the outer spin times out before the inner spin completes.
+            [],
             self::get_extended_timeout(),
             $exception,
             true
@@ -702,11 +706,11 @@ protected function resize_window($windowsize, $viewport = false) {
 
         switch ($windowsize) {
             case "small":
-                $width = 640;
-                $height = 480;
+                $width = 1024;
+                $height = 768;
                 break;
             case "medium":
-                $width = 1024;
+                $width = 1366;
                 $height = 768;
                 break;
             case "large":
@@ -813,8 +817,8 @@ public static function wait_for_pending_js_in_session(Session $session) {
         // number of JS pending code and JS completed code will not match and we will reach this point.
         throw new \Exception('Javascript code and/or AJAX requests are not ready after ' .
                 self::get_extended_timeout() .
-                ' seconds. There is a Javascript error or the code is extremely slow. ' .
-                'If you are using a slow machine, consider setting $CFG->behat_increasetimeout.');
+                ' seconds. There is a Javascript error or the code is extremely slow (' . $pending .
+                '). If you are using a slow machine, consider setting $CFG->behat_increasetimeout.');
     }
 
     /**
@@ -1044,6 +1048,56 @@ protected function js_trigger_click($node) {
         }
     }
 
+    /**
+     * Convert page names to URLs for steps like 'When I am on the "[page name]" page'.
+     *
+     * You should override this as appropriate for your plugin. The method
+     * {@link behat_navigation::resolve_core_page_url()} is a good example.
+     *
+     * Your overridden method should document the recognised page types with
+     * a table like this:
+     *
+     * Recognised page names are:
+     * | Page            | Description                                                    |
+     *
+     * @param string $page name of the page, with the component name removed e.g. 'Admin notification'.
+     * @return moodle_url the corresponding URL.
+     * @throws Exception with a meaningful error message if the specified page cannot be found.
+     */
+    protected function resolve_page_url(string $page): moodle_url {
+        throw new Exception('Component "' . get_class($this) .
+                '" does not support the generic \'When I am on the "' . $page .
+                '" page\' navigation step.');
+    }
+
+    /**
+     * Convert page names to URLs for steps like 'When I am on the "[identifier]" "[page type]" page'.
+     *
+     * A typical example might be:
+     *     When I am on the "Test quiz" "mod_quiz > Responses report" page
+     * which would cause this method in behat_mod_quiz to be called with
+     * arguments 'Responses report', 'Test quiz'.
+     *
+     * You should override this as appropriate for your plugin. The method
+     * {@link behat_navigation::resolve_core_page_instance_url()} is a good example.
+     *
+     * Your overridden method should document the recognised page types with
+     * a table like this:
+     *
+     * Recognised page names are:
+     * | Type      | identifier meaning | Description                                     |
+     *
+     * @param string $type identifies which type of page this is, e.g. 'Attempt review'.
+     * @param string $identifier identifies the particular page, e.g. 'Test quiz > student > Attempt 1'.
+     * @return moodle_url the corresponding URL.
+     * @throws Exception with a meaningful error message if the specified page cannot be found.
+     */
+    protected function resolve_page_instance_url(string $type, string $identifier): moodle_url {
+        throw new Exception('Component "' . get_class($this) .
+                '" does not support the generic \'When I am on the "' . $identifier .
+                '" "' . $type . '" page\' navigation step.');
+    }
+
     /**
      * Gets the required timeout in seconds.
      *
@@ -1093,4 +1147,58 @@ public static function get_reduced_timeout() : int {
     public static function get_extended_timeout() : int {
         return self::get_real_timeout(10);
     }
+
+    /**
+     * Return a list of the exact named selectors for the component.
+     *
+     * Named selectors are what make Behat steps like
+     *   Then I should see "Useful text" in the "General" "fieldset"
+     * work. Here, "fieldset" is the named selector, and "General" is the locator.
+     *
+     * If you override this method in your plugin (e.g. mod_mymod), to define
+     * new selectors specific to your plugin. For example, if you returned
+     *   new behat_component_named_selector('Thingy',
+     *           [".//some/xpath//img[contains(@alt, %locator%)]/.."])
+     * then
+     *   Then I should see "Useful text" in the "Whatever" "mod_mymod > Thingy"
+     * would work.
+     *
+     * This method should return a list of {@link behat_component_named_selector} and
+     * the docs on that class explain how it works.
+     *
+     * @return behat_component_named_selector[]
+     */
+    public static function get_exact_named_selectors(): array {
+        return [];
+    }
+
+    /**
+     * Return a list of the partial named selectors for the component.
+     *
+     * Like the exact named selectors above, but the locator only
+     * needs to match part of the text. For example, the standard
+     * "button" is a partial selector, so:
+     *   When I click "Save" "button"
+     * will activate "Save changes".
+     *
+     * @return behat_component_named_selector[]
+     */
+    public static function get_partial_named_selectors(): array {
+        return [];
+    }
+
+    /**
+     * Return a list of the Mink named replacements for the component.
+     *
+     * Named replacements allow you to define parts of an xpath that can be reused multiple times, or in multiple
+     * xpaths.
+     *
+     * This method should return a list of {@link behat_component_named_replacement} and the docs on that class explain
+     * how it works.
+     *
+     * @return behat_component_named_replacement[]
+     */
+    public static function get_named_replacements(): array {
+        return [];
+    }
 }
diff --git a/lib/behat/classes/behat_context_helper.php b/lib/behat/classes/behat_context_helper.php
index 8b050ccaa8f2e..f8d3eed37bdc9 100644
--- a/lib/behat/classes/behat_context_helper.php
+++ b/lib/behat/classes/behat_context_helper.php
@@ -90,35 +90,64 @@ public static function set_environment(Environment $environment) {
      * @return behat_base
      */
     public static function get($classname) {
-        $contexts = self::$environment->getContexts();
+        $definedclassname = self::get_theme_override($classname);
+        if ($definedclassname) {
+            return self::$environment->getContext($definedclassname);
+        }
+
+        // Just fall back on getContext to ensure that we throw the correct exception.
+        return self::$environment->getContext($classname);
+    }
 
-        foreach ($contexts as $context) {
-            if (is_a($context, $classname)) {
-                return $context;
-            }
+    /**
+     * Get the context for the specified component or subsystem.
+     *
+     * @param string $component The component or subsystem to find the context for
+     * @return behat_base|null
+     */
+    public static function get_component_context(string $component): ?behat_base {
+        $component = str_replace('core_', '', $component);
+
+        if ($classname = self::get_theme_override("behat_{$component}")) {
+            return self::get($classname);
         }
 
+        return null;
+    }
+
+    /**
+     * Check for any theme override of the specified class name.
+     *
+     * @param string $classname
+     * @return string|null
+     */
+    protected static function get_theme_override(string $classname): ?string {
         $suitename = self::$environment->getSuite()->getName();
         // If default suite, then get the default theme name.
         if ($suitename == 'default') {
             $suitename = theme_config::DEFAULT_THEME;
         }
-        $overridencontextname = 'behat_theme_'.$suitename.'_'.$classname;
-
-        // If contexts has not been checked before and doesn't exist then just use core one.
-        if (!isset(self::$nonexistingcontexts[$overridencontextname])) {
-            try {
-                $subcontext = self::$environment->getContext($overridencontextname);
-
-                return $subcontext;
-            } catch (Behat\Behat\Context\Exception\ContextNotFoundException $e) {
-                // If context not found then it's not overridden.
-                self::$nonexistingcontexts[$overridencontextname] = 1;
-            }
+
+        $overrideclassname = "behat_theme_{$suitename}_{$classname}";
+        if (self::$environment->hasContextClass($overrideclassname)) {
+            return $overrideclassname;
+        }
+
+        if (self::$environment->hasContextClass($classname)) {
+            return $classname;
         }
 
-        // Get the actual context.
-        return self::$environment->getContext($classname);
+        return null;
+    }
+
+    /**
+     * Return whether there is a context of the specified classname.
+     *
+     * @param string $classname
+     * @return bool
+     */
+    public static function has_context(string $classname): bool {
+        return self::$environment->hasContextClass($classname);
     }
 
     /**
diff --git a/lib/behat/classes/behat_core_generator.php b/lib/behat/classes/behat_core_generator.php
new file mode 100644
index 0000000000000..2e626fcab8d91
--- /dev/null
+++ b/lib/behat/classes/behat_core_generator.php
@@ -0,0 +1,783 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data generators for acceptance testing.
+ *
+ * @package   core
+ * @category  test
+ * @copyright 2012 David Monllaó
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
+
+defined('MOODLE_INTERNAL') || die();
+
+
+/**
+ * Behat data generator class for core entities.
+ *
+ * @package   core
+ * @category  test
+ * @copyright 2012 David Monllaó
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class behat_core_generator extends behat_generator_base {
+
+    protected function get_creatable_entities(): array {
+        return [
+            'users' => [
+                'datagenerator' => 'user',
+                'required' => ['username'],
+            ],
+            'categories' => [
+                'datagenerator' => 'category',
+                'required' => ['idnumber'],
+                'switchids' => ['category' => 'parent'],
+            ],
+            'courses' => [
+                'datagenerator' => 'course',
+                'required' => ['shortname'],
+                'switchids' => ['category' => 'category'],
+            ],
+            'groups' => [
+                'datagenerator' => 'group',
+                'required' => ['idnumber', 'course'],
+                'switchids' => ['course' => 'courseid'],
+            ],
+            'groupings' => [
+                'datagenerator' => 'grouping',
+                'required' => ['idnumber', 'course'],
+                'switchids' => ['course' => 'courseid'],
+            ],
+            'course enrolments' => [
+                'datagenerator' => 'enrol_user',
+                'required' => ['user', 'course', 'role'],
+                'switchids' => ['user' => 'userid', 'course' => 'courseid', 'role' => 'roleid'],
+            ],
+            'custom field categories' => [
+                'datagenerator' => 'custom_field_category',
+                'required' => ['name', 'component', 'area', 'itemid'],
+                'switchids' => [],
+            ],
+            'custom fields' => [
+                'datagenerator' => 'custom_field',
+                'required' => ['name', 'category', 'type', 'shortname'],
+                'switchids' => [],
+            ],
+            'permission overrides' => [
+                'datagenerator' => 'permission_override',
+                'required' => ['capability', 'permission', 'role', 'contextlevel', 'reference'],
+                'switchids' => ['role' => 'roleid'],
+            ],
+            'system role assigns' => [
+                'datagenerator' => 'system_role_assign',
+                'required' => ['user', 'role'],
+                'switchids' => ['user' => 'userid', 'role' => 'roleid'],
+            ],
+            'role assigns' => [
+                'datagenerator' => 'role_assign',
+                'required' => ['user', 'role', 'contextlevel', 'reference'],
+                'switchids' => ['user' => 'userid', 'role' => 'roleid'],
+            ],
+            'activities' => [
+                'datagenerator' => 'activity',
+                'required' => ['activity', 'idnumber', 'course'],
+                'switchids' => ['course' => 'course', 'gradecategory' => 'gradecat', 'grouping' => 'groupingid'],
+            ],
+            'blocks' => [
+                'datagenerator' => 'block_instance',
+                'required' => ['blockname', 'contextlevel', 'reference'],
+            ],
+            'group members' => [
+                'datagenerator' => 'group_member',
+                'required' => ['user', 'group'],
+                'switchids' => ['user' => 'userid', 'group' => 'groupid'],
+            ],
+            'grouping groups' => [
+                'datagenerator' => 'grouping_group',
+                'required' => ['grouping', 'group'],
+                'switchids' => ['grouping' => 'groupingid', 'group' => 'groupid'],
+            ],
+            'cohorts' => [
+                'datagenerator' => 'cohort',
+                'required' => ['idnumber'],
+            ],
+            'cohort members' => [
+                'datagenerator' => 'cohort_member',
+                'required' => ['user', 'cohort'],
+                'switchids' => ['user' => 'userid', 'cohort' => 'cohortid'],
+            ],
+            'roles' => [
+                'datagenerator' => 'role',
+                'required' => ['shortname'],
+            ],
+            'grade categories' => [
+                'datagenerator' => 'grade_category',
+                'required' => ['fullname', 'course'],
+                'switchids' => ['course' => 'courseid', 'gradecategory' => 'parent'],
+            ],
+            'grade items' => [
+                'datagenerator' => 'grade_item',
+                'required' => ['course'],
+                'switchids' => [
+                    'scale' => 'scaleid',
+                    'outcome' => 'outcomeid',
+                    'course' => 'courseid',
+                    'gradecategory' => 'categoryid',
+                ],
+            ],
+            'grade outcomes' => [
+                'datagenerator' => 'grade_outcome',
+                'required' => ['shortname', 'scale'],
+                'switchids' => ['course' => 'courseid', 'gradecategory' => 'categoryid', 'scale' => 'scaleid'],
+            ],
+            'scales' => [
+                'datagenerator' => 'scale',
+                'required' => ['name', 'scale'],
+                'switchids' => ['course' => 'courseid'],
+            ],
+            'question categories' => [
+                'datagenerator' => 'question_category',
+                'required' => ['name', 'contextlevel', 'reference'],
+                'switchids' => ['questioncategory' => 'parent'],
+            ],
+            'questions' => [
+                'datagenerator' => 'question',
+                'required' => ['qtype', 'questioncategory', 'name'],
+                'switchids' => ['questioncategory' => 'category', 'user' => 'createdby'],
+            ],
+            'tags' => [
+                'datagenerator' => 'tag',
+                'required' => ['name'],
+            ],
+            'events' => [
+                'datagenerator' => 'event',
+                'required' => ['name', 'eventtype'],
+                'switchids' => [
+                    'user' => 'userid',
+                    'course' => 'courseid',
+                    'category' => 'categoryid',
+                ],
+            ],
+            'message contacts' => [
+                'datagenerator' => 'message_contacts',
+                'required' => ['user', 'contact'],
+                'switchids' => ['user' => 'userid', 'contact' => 'contactid'],
+            ],
+            'private messages' => [
+                'datagenerator' => 'private_messages',
+                'required' => ['user', 'contact', 'message'],
+                'switchids' => ['user' => 'userid', 'contact' => 'contactid'],
+            ],
+            'favourite conversations' => [
+                'datagenerator' => 'favourite_conversations',
+                'required' => ['user', 'contact'],
+                'switchids' => ['user' => 'userid', 'contact' => 'contactid'],
+            ],
+            'group messages' => [
+                'datagenerator' => 'group_messages',
+                'required' => ['user', 'group', 'message'],
+                'switchids' => ['user' => 'userid', 'group' => 'groupid'],
+            ],
+            'muted group conversations' => [
+                'datagenerator' => 'mute_group_conversations',
+                'required' => ['user', 'group', 'course'],
+                'switchids' => ['user' => 'userid', 'group' => 'groupid', 'course' => 'courseid'],
+            ],
+            'muted private conversations' => [
+                'datagenerator' => 'mute_private_conversations',
+                'required' => ['user', 'contact'],
+                'switchids' => ['user' => 'userid', 'contact' => 'contactid'],
+            ],
+            'language customisations' => [
+                'datagenerator' => 'customlang',
+                'required' => ['component', 'stringid', 'value'],
+            ],
+            'analytics model' => [
+                'datagenerator' => 'analytics_model',
+                'required' => ['target', 'indicators', 'timesplitting', 'enabled'],
+            ],
+            'user preferences' => [
+                'datagenerator' => 'user_preferences',
+                'required' => array('user', 'preference', 'value'),
+                'switchids' => array('user' => 'userid')
+            ],
+        ];
+    }
+
+    /**
+     * If password is not set it uses the username.
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function preprocess_user($data) {
+        if (!isset($data['password'])) {
+            $data['password'] = $data['username'];
+        }
+        return $data;
+    }
+
+    /**
+     * If contextlevel and reference are specified for cohort, transform them to the contextid.
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function preprocess_cohort($data) {
+        if (isset($data['contextlevel'])) {
+            if (!isset($data['reference'])) {
+                throw new Exception('If field contextlevel is specified, field reference must also be present');
+            }
+            $context = $this->get_context($data['contextlevel'], $data['reference']);
+            unset($data['contextlevel']);
+            unset($data['reference']);
+            $data['contextid'] = $context->id;
+        }
+        return $data;
+    }
+
+    /**
+     * Preprocesses the creation of a grade item. Converts gradetype text to a number.
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function preprocess_grade_item($data) {
+        global $CFG;
+        require_once("$CFG->libdir/grade/constants.php");
+
+        if (isset($data['gradetype'])) {
+            $data['gradetype'] = constant("GRADE_TYPE_" . strtoupper($data['gradetype']));
+        }
+
+        if (!empty($data['category']) && !empty($data['courseid'])) {
+            $cat = grade_category::fetch(array('fullname' => $data['category'], 'courseid' => $data['courseid']));
+            if (!$cat) {
+                throw new Exception('Could not resolve category with name "' . $data['category'] . '"');
+            }
+            unset($data['category']);
+            $data['categoryid'] = $cat->id;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Adapter to modules generator.
+     *
+     * @throws Exception Custom exception for test writers
+     * @param array $data
+     * @return void
+     */
+    protected function process_activity($data) {
+        global $DB, $CFG;
+
+        // The the_following_exists() method checks that the field exists.
+        $activityname = $data['activity'];
+        unset($data['activity']);
+
+        // Convert scale name into scale id (negative number indicates using scale).
+        if (isset($data['grade']) && strlen($data['grade']) && !is_number($data['grade'])) {
+            $data['grade'] = - $this->get_scale_id($data['grade']);
+            require_once("$CFG->libdir/grade/constants.php");
+
+            if (!isset($data['gradetype'])) {
+                $data['gradetype'] = GRADE_TYPE_SCALE;
+            }
+        }
+
+        // We split $data in the activity $record and the course module $options.
+        $cmoptions = array();
+        $cmcolumns = $DB->get_columns('course_modules');
+        foreach ($cmcolumns as $key => $value) {
+            if (isset($data[$key])) {
+                $cmoptions[$key] = $data[$key];
+            }
+        }
+
+        // Custom exception.
+        try {
+            $this->datagenerator->create_module($activityname, $data, $cmoptions);
+        } catch (coding_exception $e) {
+            throw new Exception('\'' . $activityname . '\' activity can not be added using this step,' .
+                    ' use the step \'I add a "ACTIVITY_OR_RESOURCE_NAME_STRING" to section "SECTION_NUMBER"\' instead');
+        }
+    }
+
+    /**
+     * Add a block to a page.
+     *
+     * @param array $data should mostly match the fields of the block_instances table.
+     *     The block type is specified by blockname.
+     *     The parentcontextid is set from contextlevel and reference.
+     *     Missing values are filled in by testing_block_generator::prepare_record.
+     *     $data is passed to create_block as both $record and $options. Normally
+     *     the keys are different, so this is a way to let people set values in either place.
+     */
+    protected function process_block_instance($data) {
+
+        if (empty($data['blockname'])) {
+            throw new Exception('\'blocks\' requires the field \'block\' type to be specified');
+        }
+
+        if (empty($data['contextlevel'])) {
+            throw new Exception('\'blocks\' requires the field \'contextlevel\' to be specified');
+        }
+
+        if (!isset($data['reference'])) {
+            throw new Exception('\'blocks\' requires the field \'reference\' to be specified');
+        }
+
+        $context = $this->get_context($data['contextlevel'], $data['reference']);
+        $data['parentcontextid'] = $context->id;
+
+        // Pass $data as both $record and $options. I think that is unlikely to
+        // cause problems since the relevant key names are different.
+        // $options is not used in most blocks I have seen, but where it is, it is necessary.
+        $this->datagenerator->create_block($data['blockname'], $data, $data);
+    }
+
+    /**
+     * Creates language customisation.
+     *
+     * @throws Exception
+     * @throws dml_exception
+     * @param array $data
+     * @return void
+     */
+    protected function process_customlang($data) {
+        global $CFG, $DB, $USER;
+
+        require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/customlang/locallib.php');
+        require_once($CFG->libdir . '/adminlib.php');
+
+        if (empty($data['component'])) {
+            throw new Exception('\'customlang\' requires the field \'component\' type to be specified');
+        }
+
+        if (empty($data['stringid'])) {
+            throw new Exception('\'customlang\' requires the field \'stringid\' to be specified');
+        }
+
+        if (!isset($data['value'])) {
+            throw new Exception('\'customlang\' requires the field \'value\' to be specified');
+        }
+
+        $now = time();
+
+        tool_customlang_utils::checkout($USER->lang);
+
+        $record = $DB->get_record_sql("SELECT s.*
+                                         FROM {tool_customlang} s
+                                         JOIN {tool_customlang_components} c ON s.componentid = c.id
+                                        WHERE c.name = ? AND s.lang = ? AND s.stringid = ?",
+                array($data['component'], $USER->lang, $data['stringid']));
+
+        if (empty($data['value']) && !is_null($record->local)) {
+            $record->local = null;
+            $record->modified = 1;
+            $record->outdated = 0;
+            $record->timecustomized = null;
+            $DB->update_record('tool_customlang', $record);
+            tool_customlang_utils::checkin($USER->lang);
+        }
+
+        if (!empty($data['value']) && $data['value'] != $record->local) {
+            $record->local = $data['value'];
+            $record->modified = 1;
+            $record->outdated = 0;
+            $record->timecustomized = $now;
+            $DB->update_record('tool_customlang', $record);
+            tool_customlang_utils::checkin($USER->lang);
+        }
+    }
+
+    /**
+     * Adapter to enrol_user() data generator.
+     *
+     * @throws Exception
+     * @param array $data
+     * @return void
+     */
+    protected function process_enrol_user($data) {
+        global $SITE;
+
+        if (empty($data['roleid'])) {
+            throw new Exception('\'course enrolments\' requires the field \'role\' to be specified');
+        }
+
+        if (!isset($data['userid'])) {
+            throw new Exception('\'course enrolments\' requires the field \'user\' to be specified');
+        }
+
+        if (!isset($data['courseid'])) {
+            throw new Exception('\'course enrolments\' requires the field \'course\' to be specified');
+        }
+
+        if (!isset($data['enrol'])) {
+            $data['enrol'] = 'manual';
+        }
+
+        if (!isset($data['timestart'])) {
+            $data['timestart'] = 0;
+        }
+
+        if (!isset($data['timeend'])) {
+            $data['timeend'] = 0;
+        }
+
+        if (!isset($data['status'])) {
+            $data['status'] = null;
+        }
+
+        // If the provided course shortname is the site shortname we consider it a system role assign.
+        if ($data['courseid'] == $SITE->id) {
+            // Frontpage course assign.
+            $context = context_course::instance($data['courseid']);
+            role_assign($data['roleid'], $data['userid'], $context->id);
+
+        } else {
+            // Course assign.
+            $this->datagenerator->enrol_user($data['userid'], $data['courseid'], $data['roleid'], $data['enrol'],
+                    $data['timestart'], $data['timeend'], $data['status']);
+        }
+
+    }
+
+    /**
+     * Allows/denies a capability at the specified context
+     *
+     * @throws Exception
+     * @param array $data
+     * @return void
+     */
+    protected function process_permission_override($data) {
+
+        // Will throw an exception if it does not exist.
+        $context = $this->get_context($data['contextlevel'], $data['reference']);
+
+        switch ($data['permission']) {
+            case get_string('allow', 'role'):
+                $permission = CAP_ALLOW;
+                break;
+            case get_string('prevent', 'role'):
+                $permission = CAP_PREVENT;
+                break;
+            case get_string('prohibit', 'role'):
+                $permission = CAP_PROHIBIT;
+                break;
+            default:
+                throw new Exception('The \'' . $data['permission'] . '\' permission does not exist');
+                break;
+        }
+
+        if (is_null(get_capability_info($data['capability']))) {
+            throw new Exception('The \'' . $data['capability'] . '\' capability does not exist');
+        }
+
+        role_change_permission($data['roleid'], $context, $data['capability'], $permission);
+    }
+
+    /**
+     * Assigns a role to a user at system context
+     *
+     * Used by "system role assigns" can be deleted when
+     * system role assign will be deprecated in favour of
+     * "role assigns"
+     *
+     * @throws Exception
+     * @param array $data
+     * @return void
+     */
+    protected function process_system_role_assign($data) {
+
+        if (empty($data['roleid'])) {
+            throw new Exception('\'system role assigns\' requires the field \'role\' to be specified');
+        }
+
+        if (!isset($data['userid'])) {
+            throw new Exception('\'system role assigns\' requires the field \'user\' to be specified');
+        }
+
+        $context = context_system::instance();
+
+        $this->datagenerator->role_assign($data['roleid'], $data['userid'], $context->id);
+    }
+
+    /**
+     * Assigns a role to a user at the specified context
+     *
+     * @throws Exception
+     * @param array $data
+     * @return void
+     */
+    protected function process_role_assign($data) {
+
+        if (empty($data['roleid'])) {
+            throw new Exception('\'role assigns\' requires the field \'role\' to be specified');
+        }
+
+        if (!isset($data['userid'])) {
+            throw new Exception('\'role assigns\' requires the field \'user\' to be specified');
+        }
+
+        if (empty($data['contextlevel'])) {
+            throw new Exception('\'role assigns\' requires the field \'contextlevel\' to be specified');
+        }
+
+        if (!isset($data['reference'])) {
+            throw new Exception('\'role assigns\' requires the field \'reference\' to be specified');
+        }
+
+        // Getting the context id.
+        $context = $this->get_context($data['contextlevel'], $data['reference']);
+
+        $this->datagenerator->role_assign($data['roleid'], $data['userid'], $context->id);
+    }
+
+    /**
+     * Creates a role.
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_role($data) {
+
+        // We require the user to fill the role shortname.
+        if (empty($data['shortname'])) {
+            throw new Exception('\'role\' requires the field \'shortname\' to be specified');
+        }
+
+        $this->datagenerator->create_role($data);
+    }
+
+    /**
+     * Adds members to cohorts
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_cohort_member($data) {
+        cohort_add_member($data['cohortid'], $data['userid']);
+    }
+
+    /**
+     * Create a question category.
+     *
+     * @param array $data the row of data from the behat script.
+     */
+    protected function process_question_category($data) {
+        global $DB;
+
+        $context = $this->get_context($data['contextlevel'], $data['reference']);
+
+        // The way this class works, we have already looked up the given parent category
+        // name and found a matching category. However, it is possible, particularly
+        // for the 'top' category, for there to be several categories with the
+        // same name. So far one will have been picked at random, but we need
+        // the one from the right context. So, if we have the wrong category, try again.
+        // (Just fixing it here, rather than getting it right first time, is a bit
+        // of a bodge, but in general this class assumes that names are unique,
+        // and normally they are, so this was the easiest fix.)
+        if (!empty($data['parent'])) {
+            $foundparent = $DB->get_record('question_categories', ['id' => $data['parent']], '*', MUST_EXIST);
+            if ($foundparent->contextid != $context->id) {
+                $rightparentid = $DB->get_field('question_categories', 'id',
+                        ['contextid' => $context->id, 'name' => $foundparent->name]);
+                if (!$rightparentid) {
+                    throw new Exception('The specified question category with name "' . $foundparent->name .
+                            '" does not exist in context "' . $context->get_context_name() . '"."');
+                }
+                $data['parent'] = $rightparentid;
+            }
+        }
+
+        $data['contextid'] = $context->id;
+        $this->datagenerator->get_plugin_generator('core_question')->create_question_category($data);
+    }
+
+    /**
+     * Create a question.
+     *
+     * Creating questions relies on the question/type/.../tests/helper.php mechanism.
+     * We start with test_question_maker::get_question_form_data($data['qtype'], $data['template'])
+     * and then overlay the values from any other fields of $data that are set.
+     *
+     * @param array $data the row of data from the behat script.
+     */
+    protected function process_question($data) {
+        if (array_key_exists('questiontext', $data)) {
+            $data['questiontext'] = array(
+                    'text'   => $data['questiontext'],
+                    'format' => FORMAT_HTML,
+            );
+        }
+
+        if (array_key_exists('generalfeedback', $data)) {
+            $data['generalfeedback'] = array(
+                    'text'   => $data['generalfeedback'],
+                    'format' => FORMAT_HTML,
+            );
+        }
+
+        $which = null;
+        if (!empty($data['template'])) {
+            $which = $data['template'];
+        }
+
+        $this->datagenerator->get_plugin_generator('core_question')->create_question($data['qtype'], $which, $data);
+    }
+
+    /**
+     * Adds user to contacts
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_message_contacts($data) {
+        \core_message\api::add_contact($data['userid'], $data['contactid']);
+    }
+
+    /**
+     * Send a new message from user to contact in a private conversation
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_private_messages(array $data) {
+        if (empty($data['format'])) {
+            $data['format'] = 'FORMAT_PLAIN';
+        }
+
+        if (!$conversationid = \core_message\api::get_conversation_between_users([$data['userid'], $data['contactid']])) {
+            $conversation = \core_message\api::create_conversation(
+                    \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+                    [$data['userid'], $data['contactid']]
+            );
+            $conversationid = $conversation->id;
+        }
+        \core_message\api::send_message_to_conversation(
+                $data['userid'],
+                $conversationid,
+                $data['message'],
+                constant($data['format'])
+        );
+    }
+
+    /**
+     * Send a new message from user to a group conversation
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_group_messages(array $data) {
+        global $DB;
+
+        if (empty($data['format'])) {
+            $data['format'] = 'FORMAT_PLAIN';
+        }
+
+        $group = $DB->get_record('groups', ['id' => $data['groupid']]);
+        $coursecontext = context_course::instance($group->courseid);
+        if (!$conversation = \core_message\api::get_conversation_by_area('core_group', 'groups', $data['groupid'],
+                $coursecontext->id)) {
+            $members = $DB->get_records_menu('groups_members', ['groupid' => $data['groupid']], '', 'userid, id');
+            $conversation = \core_message\api::create_conversation(
+                    \core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP,
+                    array_keys($members),
+                    $group->name,
+                    \core_message\api::MESSAGE_CONVERSATION_ENABLED,
+                    'core_group',
+                    'groups',
+                    $group->id,
+                    $coursecontext->id);
+        }
+        \core_message\api::send_message_to_conversation(
+                $data['userid'],
+                $conversation->id,
+                $data['message'],
+                constant($data['format'])
+        );
+    }
+
+    /**
+     * Mark a private conversation as favourite for user
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_favourite_conversations(array $data) {
+        if (!$conversationid = \core_message\api::get_conversation_between_users([$data['userid'], $data['contactid']])) {
+            $conversation = \core_message\api::create_conversation(
+                    \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+                    [$data['userid'], $data['contactid']]
+            );
+            $conversationid = $conversation->id;
+        }
+        \core_message\api::set_favourite_conversation($conversationid, $data['userid']);
+    }
+
+    /**
+     * Mute an existing group conversation for user
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_mute_group_conversations(array $data) {
+        if (groups_is_member($data['groupid'], $data['userid'])) {
+            $context = context_course::instance($data['courseid']);
+            $conversation = \core_message\api::get_conversation_by_area(
+                    'core_group',
+                    'groups',
+                    $data['groupid'],
+                    $context->id
+            );
+            if ($conversation) {
+                \core_message\api::mute_conversation($data['userid'], $conversation->id);
+            }
+        }
+    }
+
+    /**
+     * Mute a private conversation for user
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_mute_private_conversations(array $data) {
+        if (!$conversationid = \core_message\api::get_conversation_between_users([$data['userid'], $data['contactid']])) {
+            $conversation = \core_message\api::create_conversation(
+                    \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+                    [$data['userid'], $data['contactid']]
+            );
+            $conversationid = $conversation->id;
+        }
+        \core_message\api::mute_conversation($data['userid'], $conversationid);
+    }
+
+    /**
+     * Set a preference value for user
+     *
+     * @param array $data
+     * @return void
+     */
+    protected function process_user_preferences(array $data) {
+        set_user_preference($data['preference'], $data['value'], $data['userid']);
+    }
+}
diff --git a/lib/behat/classes/behat_generator_base.php b/lib/behat/classes/behat_generator_base.php
new file mode 100644
index 0000000000000..98d16bc584ca6
--- /dev/null
+++ b/lib/behat/classes/behat_generator_base.php
@@ -0,0 +1,527 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Base class for data generators component support for acceptance testing.
+ *
+ * @package   core
+ * @category  test
+ * @copyright 2012 David Monllaó
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+use Behat\Gherkin\Node\TableNode as TableNode;
+use Behat\Behat\Tester\Exception\PendingException as PendingException;
+
+
+/**
+ * Class to quickly create Behat test data using component data generators.
+ *
+ * There is a subclass of class for each component that wants to be able to
+ * generate entities using the Behat step
+ *     Given the following "entity types" exist:
+ *       | test | data |
+ *
+ * For core entities, the entity type is like "courses" or "users" and
+ * generating those is handled by behat_core_generator. For other components
+ * the entity type is like "mod_quiz > User override" and that is handled by
+ * behat_mod_quiz_generator defined in mod/quiz/tests/generator/behat_mod_quiz_generator.php.
+ *
+ * The types of entities that can be generated are described by the array returned
+ * by the {@link get_generateable_entities()} method. The list in
+ * {@link behat_core_generator} is a good (if complex) example.
+ *
+ * How things work is best explained with a few examples. All this is implemented
+ * in the {@link generate_items()} method below, if you want to see every detail of
+ * how it works.
+ *
+ * Simple example from behat_core_generator:
+ * 'users' => [
+ *     'datagenerator' => 'user',
+ *     'required' => ['username'],
+ * ],
+ * The steps performed are:
+ *
+ * 1. 'datagenerator' => 'user' means that the word used in the method names below is 'user'.
+ *
+ * 2. Because 'required' is present, check the supplied data exists 'username' column is present
+ *    in the supplied data table and if not display an error.
+ *
+ * 3. Then for each row in the table as an array $elementdata (array keys are column names)
+ *    and process it as follows
+ *
+ * 4. (Not used in this example.)
+ *
+ * 5. If the method 'preprocess_user' exists, then call it to update $elementdata.
+ *    (It does, in this case it sets the password to the username, if password was not given.)
+ *
+ * We then do one of 4 things:
+ *
+ * 6a. If there is a method 'process_user' we call it. (It doesn't for user,
+ *     but there are other examples like process_enrol_user() in behat_core_generator.)
+ *
+ * 6b. (Not used in this example.)
+ *
+ * 6c. Else, if testing_data_generator::create_user exists, we call it with $elementdata. (it does.)
+ *
+ * 6d. If none of these three things work. an error is thrown.
+ *
+ * To understand the missing steps above, consider the example from behat_mod_quiz_generator:
+ * 'group override' => [
+ *      'datagenerator' => 'override',
+ *      'required' => ['quiz', 'group'],
+ *      'switchids' => ['quiz' => 'quiz', 'group' => 'groupid'],
+ * ],
+ * Processing is as above, except that:
+ *
+ * 1. Note 'datagenerator' is 'override' (not group_override). 'user override' maps to the
+ *    same datagenerator. This works fine.
+ *
+ * 4. Because 'switchids' is present, human-readable data in the table gets converted to ids.
+ *    They array key 'group' refers to a column which may be present in the table (it will be
+ *    here because it is required, but it does not have to be in general). If that column
+ *    is present and contains a value, then the method matching name like get_group_id() is
+ *    called with the value from that column in the data table. You must implement this
+ *    method. You can see several examples of this sort of method below.
+ *
+ *    If that method returns a group id, then $elementdata['group'] is unset and
+ *    $elementdata['groupid'] is set to the result of the get_group_id() call. 'groupid' here
+ *    because of the definition is 'switchids' => [..., 'group' => 'groupid'].
+ *    If get_group_id() cannot find the group, it should throw a helpful exception.
+ *
+ *    Similarly, 'quiz' (the quiz name) is looked up with a call to get_quiz_id(). Here, the
+ *    new array key set matches the old one removed. This is fine.
+ *
+ * 6b. We are in a plugin, so before checking whether testing_data_generator::create_override
+ *     exists we first check whether mod_quiz_generator::create_override() exists. It does,
+ *     and this is what gets called.
+ *
+ * This second example shows why the get_..._id methods for core entities are in this base
+ * class, not in behat_core_generator. Plugins may need to look up the ids of
+ * core entities.
+ *
+ * behat_core_generator is defined in lib/behat/classes/behat_core_generator.php
+ * and for components, behat_..._generator is defined in tests/generator/behat_..._generator.php
+ * inside the plugin. For example behat_mod_quiz_generator is defined in
+ * mod/quiz/tests/generator/behat_mod_quiz_generator.php.
+ *
+ * @package   core
+ * @category  test
+ * @copyright 2012 David Monllaó
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+abstract class behat_generator_base {
+
+    /**
+     * @var string the name of the component we belong to.
+     *
+     * This should probably only be used to make error messages clearer.
+     */
+    protected $component;
+
+    /**
+     * @var testing_data_generator the core data generator
+     */
+    protected $datagenerator;
+
+    /**
+     * @var testing_data_generator the data generator for this component.
+     */
+    protected $componentdatagenerator;
+
+    /**
+     * Constructor.
+     *
+     * @param string $component component name, to make error messages more readable.
+     */
+    public function __construct(string $component) {
+        $this->component = $component;
+    }
+
+    /**
+     * Get a list of the entities that can be created for this component.
+     *
+     * This function must be overridden in subclasses. See class comment
+     * above for a description of the data structure.
+     * See {@link behat_core_generator} for an example.
+     *
+     * @return array entity name => information about how to generate.
+     */
+    protected abstract function get_creatable_entities(): array;
+
+    /**
+     * Do the work to generate an entity.
+     *
+     * This is called by {@link behat_data_generators::the_following_entities_exist()}.
+     *
+     * @param string    $generatortype The name of the entity to create.
+     * @param TableNode $data from the step.
+     */
+    public function generate_items(string $generatortype, TableNode $data) {
+        // Now that we need them require the data generators.
+        require_once(__DIR__ . '/../../testing/generator/lib.php');
+
+        $elements = $this->get_creatable_entities();
+
+        if (!isset($elements[$generatortype])) {
+            throw new PendingException($this->name_for_errors($generatortype) .
+                    ' is not a known type of entity that can be generated.');
+        }
+        $entityinfo = $elements[$generatortype];
+
+        $this->datagenerator = testing_util::get_data_generator();
+        if ($this->component === 'core') {
+            $this->componentdatagenerator = $this->datagenerator;
+        } else {
+            $this->componentdatagenerator = $this->datagenerator->get_plugin_generator($this->component);
+        }
+
+        $generatortype = $entityinfo['datagenerator'];
+
+        foreach ($data->getHash() as $elementdata) {
+
+            // Check if all the required fields are there.
+            foreach ($entityinfo['required'] as $requiredfield) {
+                if (!isset($elementdata[$requiredfield])) {
+                    throw new Exception($this->name_for_errors($generatortype) .
+                            ' requires the field ' . $requiredfield . ' to be specified');
+                }
+            }
+
+            // Switch from human-friendly references to ids.
+            if (!empty($entityinfo['switchids'])) {
+                foreach ($entityinfo['switchids'] as $element => $field) {
+                    $methodname = 'get_' . $element . '_id';
+
+                    // Not all the switch fields are required, default vars will be assigned by data generators.
+                    if (isset($elementdata[$element])) {
+                        if (!method_exists($this, $methodname)) {
+                            throw new coding_exception('The generator for ' .
+                                    $this->name_for_errors($generatortype) .
+                                    ' entities specifies \'switchids\' => [..., \'' . $element .
+                                    '\' => \'' . $field . '\', ...] but the required method ' .
+                                    $methodname . '() has not been defined in ' .
+                                    get_class($this) . '.');
+                        }
+                        // Temp $id var to avoid problems when $element == $field.
+                        $id = $this->{$methodname}($elementdata[$element]);
+                        unset($elementdata[$element]);
+                        $elementdata[$field] = $id;
+                    }
+                }
+            }
+
+            // Preprocess the entities that requires a special treatment.
+            if (method_exists($this, 'preprocess_' . $generatortype)) {
+                $elementdata = $this->{'preprocess_' . $generatortype}($elementdata);
+            }
+
+            // Creates element.
+            if (method_exists($this, 'process_' . $generatortype)) {
+                // Use a method on this class to do the work.
+                $this->{'process_' . $generatortype}($elementdata);
+
+            } else if (method_exists($this->componentdatagenerator, 'create_' . $generatortype)) {
+                // Using the component't own data generator if it exists.
+                $this->componentdatagenerator->{'create_' . $generatortype}($elementdata);
+
+            } else if (method_exists($this->datagenerator, 'create_' . $generatortype)) {
+                // Use a method on the core data geneator, if there is one.
+                $this->datagenerator->{'create_' . $generatortype}($elementdata);
+
+            } else {
+                // Give up.
+                throw new PendingException($this->name_for_errors($generatortype) .
+                        ' data generator is not implemented');
+            }
+        }
+    }
+
+    /**
+     * Helper for formatting error messages.
+     *
+     * @param string $entitytype entity type without prefix, e.g. 'frog'.
+     * @return string either 'frog' for core entities, or 'mod_mymod > frog' for components.
+     */
+    protected function name_for_errors(string $entitytype): string {
+        if ($this->component === 'core') {
+            return '"' . $entitytype . '"';
+        } else {
+            return '"' . $this->component . ' > ' . $entitytype . '"';
+        }
+    }
+
+    /**
+     * Gets the grade category id from the grade category fullname
+     *
+     * @param string $fullname the grade category name.
+     * @return int corresponding id.
+     */
+    protected function get_gradecategory_id($fullname) {
+        global $DB;
+
+        if (!$id = $DB->get_field('grade_categories', 'id', array('fullname' => $fullname))) {
+            throw new Exception('The specified grade category with fullname "' . $fullname . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Gets the user id from it's username.
+     * @throws Exception
+     * @param string $username
+     * @return int
+     */
+    protected function get_user_id($username) {
+        global $DB;
+
+        if (!$id = $DB->get_field('user', 'id', array('username' => $username))) {
+            throw new Exception('The specified user with username "' . $username . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Gets the role id from it's shortname.
+     * @throws Exception
+     * @param string $roleshortname
+     * @return int
+     */
+    protected function get_role_id($roleshortname) {
+        global $DB;
+
+        if (!$id = $DB->get_field('role', 'id', array('shortname' => $roleshortname))) {
+            throw new Exception('The specified role with shortname "' . $roleshortname . '" does not exist');
+        }
+
+        return $id;
+    }
+
+    /**
+     * Gets the category id from it's idnumber.
+     * @throws Exception
+     * @param string $idnumber
+     * @return int
+     */
+    protected function get_category_id($idnumber) {
+        global $DB;
+
+        // If no category was specified use the data generator one.
+        if ($idnumber == false) {
+            return null;
+        }
+
+        if (!$id = $DB->get_field('course_categories', 'id', array('idnumber' => $idnumber))) {
+            throw new Exception('The specified category with idnumber "' . $idnumber . '" does not exist');
+        }
+
+        return $id;
+    }
+
+    /**
+     * Gets the course id from it's shortname.
+     * @throws Exception
+     * @param string $shortname
+     * @return int
+     */
+    protected function get_course_id($shortname) {
+        global $DB;
+
+        if (!$id = $DB->get_field('course', 'id', array('shortname' => $shortname))) {
+            throw new Exception('The specified course with shortname "' . $shortname . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Gets the group id from it's idnumber.
+     * @throws Exception
+     * @param string $idnumber
+     * @return int
+     */
+    protected function get_group_id($idnumber) {
+        global $DB;
+
+        if (!$id = $DB->get_field('groups', 'id', array('idnumber' => $idnumber))) {
+            throw new Exception('The specified group with idnumber "' . $idnumber . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Gets the grouping id from it's idnumber.
+     * @throws Exception
+     * @param string $idnumber
+     * @return int
+     */
+    protected function get_grouping_id($idnumber) {
+        global $DB;
+
+        // Do not fetch grouping ID for empty grouping idnumber.
+        if (empty($idnumber)) {
+            return null;
+        }
+
+        if (!$id = $DB->get_field('groupings', 'id', array('idnumber' => $idnumber))) {
+            throw new Exception('The specified grouping with idnumber "' . $idnumber . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Gets the cohort id from it's idnumber.
+     * @throws Exception
+     * @param string $idnumber
+     * @return int
+     */
+    protected function get_cohort_id($idnumber) {
+        global $DB;
+
+        if (!$id = $DB->get_field('cohort', 'id', array('idnumber' => $idnumber))) {
+            throw new Exception('The specified cohort with idnumber "' . $idnumber . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Gets the outcome item id from its shortname.
+     * @throws Exception
+     * @param string $shortname
+     * @return int
+     */
+    protected function get_outcome_id($shortname) {
+        global $DB;
+
+        if (!$id = $DB->get_field('grade_outcomes', 'id', array('shortname' => $shortname))) {
+            throw new Exception('The specified outcome with shortname "' . $shortname . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Get the id of a named scale.
+     * @param string $name the name of the scale.
+     * @return int the scale id.
+     */
+    protected function get_scale_id($name) {
+        global $DB;
+
+        if (!$id = $DB->get_field('scale', 'id', array('name' => $name))) {
+            throw new Exception('The specified scale with name "' . $name . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Get the id of a named question category (must be globally unique).
+     * Note that 'Top' is a special value, used when setting the parent of another
+     * category, meaning top-level.
+     *
+     * @param string $name the question category name.
+     * @return int the question category id.
+     */
+    protected function get_questioncategory_id($name) {
+        global $DB;
+
+        if ($name == 'Top') {
+            return 0;
+        }
+
+        if (!$id = $DB->get_field('question_categories', 'id', array('name' => $name))) {
+            throw new Exception('The specified question category with name "' . $name . '" does not exist');
+        }
+        return $id;
+    }
+
+    /**
+     * Gets the internal context id from the context reference.
+     *
+     * The context reference changes depending on the context
+     * level, it can be the system, a user, a category, a course or
+     * a module.
+     *
+     * @throws Exception
+     * @param string $levelname The context level string introduced by the test writer
+     * @param string $contextref The context reference introduced by the test writer
+     * @return context
+     */
+    protected function get_context($levelname, $contextref) {
+        global $DB;
+
+        // Getting context levels and names (we will be using the English ones as it is the test site language).
+        $contextlevels = context_helper::get_all_levels();
+        $contextnames = array();
+        foreach ($contextlevels as $level => $classname) {
+            $contextnames[context_helper::get_level_name($level)] = $level;
+        }
+
+        if (empty($contextnames[$levelname])) {
+            throw new Exception('The specified "' . $levelname . '" context level does not exist');
+        }
+        $contextlevel = $contextnames[$levelname];
+
+        // Return it, we don't need to look for other internal ids.
+        if ($contextlevel == CONTEXT_SYSTEM) {
+            return context_system::instance();
+        }
+
+        switch ($contextlevel) {
+
+            case CONTEXT_USER:
+                $instanceid = $DB->get_field('user', 'id', array('username' => $contextref));
+                break;
+
+            case CONTEXT_COURSECAT:
+                $instanceid = $DB->get_field('course_categories', 'id', array('idnumber' => $contextref));
+                break;
+
+            case CONTEXT_COURSE:
+                $instanceid = $DB->get_field('course', 'id', array('shortname' => $contextref));
+                break;
+
+            case CONTEXT_MODULE:
+                $instanceid = $DB->get_field('course_modules', 'id', array('idnumber' => $contextref));
+                break;
+
+            default:
+                break;
+        }
+
+        $contextclass = $contextlevels[$contextlevel];
+        if (!$context = $contextclass::instance($instanceid, IGNORE_MISSING)) {
+            throw new Exception('The specified "' . $contextref . '" context reference does not exist');
+        }
+
+        return $context;
+    }
+
+    /**
+     * Gets the contact id from it's username.
+     * @throws Exception
+     * @param string $username
+     * @return int
+     */
+    protected function get_contact_id($username) {
+        global $DB;
+
+        if (!$id = $DB->get_field('user', 'id', array('username' => $username))) {
+            throw new Exception('The specified user with username "' . $username . '" does not exist');
+        }
+        return $id;
+    }
+}
diff --git a/lib/behat/classes/behat_selectors.php b/lib/behat/classes/behat_selectors.php
index 04e255ac5fc5e..e90ec563c1e5f 100644
--- a/lib/behat/classes/behat_selectors.php
+++ b/lib/behat/classes/behat_selectors.php
@@ -23,10 +23,12 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+require_once(__DIR__ . '/named_selector.php');
 require_once(__DIR__ . '/exact_named_selector.php');
 require_once(__DIR__ . '/partial_named_selector.php');
 
 use Behat\Mink\Exception\ExpectationException as ExpectationException;
+use Behat\Mink\Element\Element;
 
 /**
  * Moodle selectors manager.
@@ -47,32 +49,14 @@ class behat_selectors {
      * @return array Contains the selector and the locator expected by Mink.
      */
     public static function get_behat_selector($selectortype, $element, Behat\Mink\Session $session) {
+        // Note: This function is not deprecated, but not the recommended way of doing things.
+        [
+            'selector' => $selector,
+            'locator' => $locator,
+        ] = $session->normalise_selector($selectortype, $element, $session->getPage());
 
         // CSS and XPath selectors locator is one single argument.
-        if ($selectortype == 'css_element' || $selectortype == 'xpath_element') {
-            $selector = str_replace('_element', '', $selectortype);
-            $locator = $element;
-        } else {
-            // Named selectors uses arrays as locators including the type of named selector.
-            $allowedselectors = self::get_allowed_selectors();
-            if (!isset($allowedselectors[$selectortype])) {
-                throw new ExpectationException('The "' . $selectortype . '" selector not registered.', $session);
-            }
-            $locator = array($allowedselectors[$selectortype], behat_context_helper::escape($element));
-
-            // Get the selector which should be used.
-            $allowedpartialselectors = behat_partial_named_selector::get_allowed_selectors();
-            $allowedexactselectors = behat_exact_named_selector::get_allowed_selectors();
-            if (isset($allowedpartialselectors[$selectortype])) {
-                $selector = 'named_partial';
-            } else if (isset($allowedexactselectors[$selectortype])) {
-                $selector = 'named_exact';
-            } else {
-                throw new ExpectationException('The "' . $selectortype . '" selector not registered.', $session);
-            }
-        }
-
-        return array($selector, $locator);
+        return [$selector, $locator];
     }
 
     /**
@@ -98,4 +82,40 @@ public static function get_allowed_text_selectors() {
             behat_exact_named_selector::get_allowed_text_selectors()
         );
     }
+
+    /**
+     * Normalise the selector and locator for a named partial.
+     *
+     * @param string $selector The selector name
+     * @param string $locator The value to normalise
+     * @return array
+     */
+    public static function normalise_named_selector(string $selector, string $locator): array {
+        return [
+            $selector,
+            behat_context_helper::escape($locator),
+        ];
+    }
+
+    /**
+     * Transform the selector for a field.
+     *
+     * @param string $label The label to find
+     * @param Element $container The container to look within
+     * @return array The selector, locator, and container to search within
+     */
+    public static function transform_find_for_field(behat_base $context, string $label, Element $container): array {
+        $hasfieldset = strpos($label, '>');
+        if (false !== $hasfieldset) {
+            [$containerlabel, $label] = explode(">", $label, 2);
+            $container = $context->find_fieldset(trim($containerlabel), $container);
+            $label = trim($label);
+        }
+
+        return [
+            'selector' => 'named_partial',
+            'locator' => self::normalise_named_selector('field', $label),
+            'container' => $container,
+        ];
+    }
 }
diff --git a/lib/behat/classes/component_named_replacement.php b/lib/behat/classes/component_named_replacement.php
new file mode 100644
index 0000000000000..f11a4ceead777
--- /dev/null
+++ b/lib/behat/classes/component_named_replacement.php
@@ -0,0 +1,99 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A class for recording the definition of Mink replacements.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * A class for recording the definition of Mink replacements for use in Mink selectors.
+ *
+ * These are comprised of a source string, and a replacement.
+ *
+ * During use the source string is converted from the string to be in the format:
+ *
+ *      %[component]/[string]%
+ *
+ * For example:
+ *
+ *      %mod_forum/title%
+ *
+ * Mink replacements are used in xpath translation to translate regularly used items such as title.
+ * Here is an example from the upstream Mink project:
+ *
+ * '%tagTextMatch%' => 'contains(normalize-space(string(.)), %locator%)'
+ *
+ * And can be used in an xpath:
+ *
+ *      .//label[%tagTextMatch%]
+ *
+ * This would be expanded to:
+ *
+ *      .//label[contains(normalize-space(string(.)), %locator%)]
+ *
+ * Replacements can also be used in other replacements, as long as that replacement is defined later.
+ *
+ *      '%linkMatch%' => '(%idMatch% or %tagTextMatch% or %titleMatch% or %relMatch%)'
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class behat_component_named_replacement {
+    /** @var string */
+    protected $from;
+
+    /** @var string */
+    protected $to;
+
+    /**
+     * Create the replacement.
+     *
+     * @param string $from this is the old selector that should no longer be used.
+     *      For example 'group_message'.
+     * @param string $to this is the new equivalent that should be used instead.
+     *      For example 'core_message > Message'.
+     */
+    public function __construct(string $from, string $to) {
+        $this->from = $from;
+        $this->to = $to;
+    }
+
+    /**
+     * Get the 'from' part of the replacement, formatted for the component.
+     *
+     * @param string $component
+     * @return string
+     */
+    public function get_from(string $component): string {
+        return "%{$component}/{$this->from}%";
+    }
+
+    /**
+     * Get the 'to' part of the replacement.
+     *
+     * @return string Target xpath
+     */
+    public function get_to(): string {
+        return $this->to;
+    }
+}
diff --git a/lib/behat/classes/component_named_selector.php b/lib/behat/classes/component_named_selector.php
new file mode 100644
index 0000000000000..8b58484fe1d5b
--- /dev/null
+++ b/lib/behat/classes/component_named_selector.php
@@ -0,0 +1,124 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Class representing a named selector that can be used in Behat tests.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Class representing a named selector that can be used in Behat tests.
+ *
+ * Named selectors are what make Behat steps like
+ *   Then I should see "Useful text" in the "General" "fieldset"
+ * Here, "fieldset" is the named selector, and "General" is the locator.
+ *
+ * Selectors can either be exact, in which case the locator needs to
+ * match exactly, or can be partial, for example the way
+ *   When I click "Save" "button"
+ * will trigger a "Save changes" button.
+ *
+ * Instances of this class get returned by the get_exact_named_selectors()
+ * and get_partial_named_selectors() methods in classes like behat_mod_mymod.
+ * The code that makes the magic work is in the trait behat_named_selector
+ * used by both behat_exact_named_selector and behat_partial_named_selector.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class behat_component_named_selector {
+    /** @var string */
+    protected $alias;
+
+    /** @var array List of xpaths */
+    protected $xpaths;
+
+    /** @var string */
+    protected $istextselector;
+
+    /**
+     * Create the selector definition.
+     *
+     * As an example, if you define
+     *   new behat_component_named_selector('Message',
+     *           [".//*[@data-conversation-id]//img[contains(@alt, %locator%)]/.."])
+     * in get_partial_named_selectors in behat_message in
+     * message/tests/behat/behat_message.php, then steps like
+     *   When "Group 1" "core_message > Message" should exist
+     * will work.
+     *
+     * Text selectors are things that contain other things (e.g. some particular text), e.g.
+     *   Then I can see "Some text" in the "Whatever" "text_selector"
+     * whereas non-text selectors are atomic things, like
+     *   When I click the "Whatever" "widget".
+     *
+     * @param string $alias The 'friendly' name of the thing. This will be prefixed with the component name.
+     *      For example, if the mod_mymod plugin, says 'Thingy', then "mod_mymod > Thingy" becomes a selector.
+     * @param array $xpaths A list of xpaths one or more XPaths that the selector gets transformed into.
+     * @param bool $istextselector Whether this selector can also be used as a text selector.
+     */
+    public function __construct(string $alias, array $xpaths, bool $istextselector = true) {
+        $this->alias = $alias;
+        $this->xpaths = $xpaths;
+        $this->istextselector = $istextselector;
+    }
+
+    /**
+     * Whether this is a text selector.
+     *
+     * @return bool
+     */
+    public function is_text_selector(): bool {
+        return $this->istextselector;
+    }
+
+    /**
+     * Get the name of the selector.
+     * This is a back-end feature and contains a namespaced md5 of the human-readable name.
+     *
+     * @param string $component
+     * @return string
+     */
+    public function get_name(string $component): string {
+        return implode('_', [$component, md5($this->alias)]);
+    }
+
+    /**
+     * Get the alias of the selector.
+     * This is the human-readable name that you would typically interact with.
+     *
+     * @param string $component
+     * @return string
+     */
+    public function get_alias(string $component): string {
+        return implode(" > ", [$component, $this->alias]);;
+    }
+
+    /**
+     * Get the list of combined xpaths.
+     *
+     * @return string The list of xpaths combined with the xpath | (OR) operator
+     */
+    public function get_combined_xpath(): string {
+        return implode(' | ', $this->xpaths);
+    }
+}
diff --git a/lib/behat/classes/exact_named_selector.php b/lib/behat/classes/exact_named_selector.php
index 4902075c27550..e178daed7bd36 100644
--- a/lib/behat/classes/exact_named_selector.php
+++ b/lib/behat/classes/exact_named_selector.php
@@ -32,6 +32,9 @@
  */
 class behat_exact_named_selector extends \Behat\Mink\Selector\ExactNamedSelector {
 
+    // Use the named selector trait.
+    use behat_named_selector;
+
     /**
      * Creates selector instance.
      */
@@ -63,6 +66,9 @@ public function __construct() {
         'text_exact' => 'text',
     );
 
+    /** @var List of deprecated selectors */
+    protected static $deprecatedselectors = [];
+
     /**
      * Allowed selectors getter.
      *
diff --git a/lib/behat/classes/named_selector.php b/lib/behat/classes/named_selector.php
new file mode 100644
index 0000000000000..e683ffcf29130
--- /dev/null
+++ b/lib/behat/classes/named_selector.php
@@ -0,0 +1,113 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Moodle-specific common functions for named selectors.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Common functions for named selectors.
+ *
+ * This has to be a trait, because we need this in both the classes
+ * behat_exact_named_selector and behat_partial_named_selector, and
+ * those classes have to be subclasses of \Behat\Mink\Selector\ExactNamedSelector
+ * and \Behat\Mink\Selector\PartialNamedSelector. This trait is a way achieve
+ * that without duplciated code.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+trait behat_named_selector {
+
+    /**
+     * Registers new XPath selector with specified name.
+     *
+     * @param string $component
+     * @param behat_component_named_selector $selector
+     */
+    public function register_component_selector(string $component, behat_component_named_selector $selector) {
+        $alias = $selector->get_alias($component);
+        $name = $selector->get_name($component);
+        static::$allowedselectors[$alias] = $name;
+
+        if ($selector->is_text_selector()) {
+            static::$allowedtextselectors[$alias] = $name;
+        }
+
+        // We must use Reflection here. The replacements property is private and cannot be accessed otherwise.
+        // This is due to an API limitation in Mink.
+        $rc = new \ReflectionClass(\Behat\Mink\Selector\NamedSelector::class);
+        $r = $rc->getProperty('replacements');
+        $r->setAccessible(true);
+        $replacements = $r->getValue($this);
+
+        $selectorxpath = strtr($selector->get_combined_xpath(), $replacements);
+
+        parent::registerNamedXpath($name, $selectorxpath);
+    }
+
+    /**
+     * Registers new XPath selector with specified name.
+     *
+     * @param string $component
+     * @param behat_component_named_replacement $replacement
+     */
+    public function register_replacement(string $component, behat_component_named_replacement $replacement) {
+        // We must use Reflection here. The replacements property is private and cannot be accessed otherwise.
+        // This is due to an API limitation in Mink.
+        $rc = new \ReflectionClass(\Behat\Mink\Selector\NamedSelector::class);
+        $r = $rc->getProperty('replacements');
+        $r->setAccessible(true);
+        $existing = $r->getValue($this);
+
+        $from = $replacement->get_from($component);
+
+        if (isset($existing[$from])) {
+            throw new \coding_exception("A named replacement already exists in the partial named selector for '{$from}'.  " .
+                "Replacement names must be unique, and should be namespaced to the component");
+        }
+
+        $translatedto = strtr($replacement->get_to(), $existing);
+        $this->registerReplacement($from, $translatedto);
+    }
+
+    /**
+     * Check whether the specified selector has been deprecated and marked for replacement.
+     *
+     * @param string $selector
+     * @return bool
+     */
+    public static function is_deprecated_selector(string $selector): bool {
+        return array_key_exists($selector, static::$deprecatedselectors);
+    }
+
+    /**
+     * Fetch the replacement name of a deprecated selector.
+     *
+     * @param string $selector
+     * @return bool
+     */
+    public static function get_deprecated_replacement(string $selector): ?string {
+        return static::$deprecatedselectors[$selector];
+    }
+}
diff --git a/lib/behat/classes/partial_named_selector.php b/lib/behat/classes/partial_named_selector.php
index b9233ef347467..86830de043dbd 100644
--- a/lib/behat/classes/partial_named_selector.php
+++ b/lib/behat/classes/partial_named_selector.php
@@ -33,6 +33,9 @@
  */
 class behat_partial_named_selector extends \Behat\Mink\Selector\PartialNamedSelector {
 
+    // Use the named selector trait.
+    use behat_named_selector;
+
     /**
      * Creates selector instance.
      */
@@ -73,6 +76,8 @@ public function __construct() {
         'xpath_element' => 'xpath_element',
         'form_row' => 'form_row',
         'group_message_header' => 'group_message_header',
+        'group_message' => 'group_message',
+        'autocomplete' => 'autocomplete',
     );
 
     /**
@@ -95,6 +100,8 @@ public function __construct() {
         'group_message_member' => 'group_message_member',
         'group_message_tab' => 'group_message_tab',
         'group_message_list_area' => 'group_message_list_area',
+        'group_message_message_content' => 'group_message_message_content',
+        'icon_container' => 'icon_container',
         'icon' => 'icon',
         'link' => 'link',
         'link_or_button' => 'link_or_button',
@@ -113,6 +120,7 @@ public function __construct() {
         'form_row' => 'form_row',
         'autocomplete_selection' => 'autocomplete_selection',
         'autocomplete_suggestions' => 'autocomplete_suggestions',
+        'autocomplete' => 'autocomplete',
     );
 
     /**
@@ -161,7 +169,7 @@ public function __construct() {
             .//*[@data-region='message-drawer' and contains(., %locator%)]//div[@data-region='content-message-container']
 XPATH
     , 'group_message_header' => <<<XPATH
-        .//*[@data-region='message-drawer']//div[@data-region='header-container' and contains(., %locator%)]
+        .//*[@data-region='message-drawer']//div[@data-region='header-content' and contains(., %locator%)]
 XPATH
     , 'group_message_member' => <<<XPATH
         .//*[@data-region='message-drawer']//div[@data-region='group-info-content-container']
@@ -174,6 +182,12 @@ public function __construct() {
 XPATH
     , 'group_message_list_area' => <<<XPATH
         .//*[@data-region='message-drawer']//*[contains(@data-region, concat('view-overview-', %locator%))]
+XPATH
+    , 'group_message_message_content' => <<<XPATH
+        .//*[@data-region='message-drawer']//*[@data-region='message' and @data-message-id and contains(., %locator%)]
+XPATH
+    , 'icon_container' => <<<XPATH
+        .//span[contains(@data-region, concat(%locator%,'-icon-container'))]
 XPATH
         , 'icon' => <<<XPATH
 .//*[contains(concat(' ', normalize-space(@class), ' '), ' icon ') and ( contains(normalize-space(@title), %locator%))]
@@ -212,6 +226,9 @@ public function __construct() {
 XPATH
         , 'autocomplete_suggestions' => <<<XPATH
 .//ul[contains(concat(' ', normalize-space(@class), ' '), concat(' ', 'form-autocomplete-suggestions', ' '))]/li[@role='option'][contains(normalize-space(.), %locator%)]
+XPATH
+        , 'autocomplete' => <<<XPATH
+.//descendant::input[@id = //label[contains(normalize-space(string(.)), %locator%)]/@for]/ancestor::*[@data-fieldtype = 'autocomplete']
 XPATH
     );
 
@@ -257,6 +274,15 @@ public function __construct() {
         ],
     ];
 
+    /** @var List of deprecated selectors */
+    protected static $deprecatedselectors = [
+        'group_message' => 'core_message > Message',
+        'group_message_member' => 'core_message > Message member',
+        'group_message_tab' => 'core_message > Message tab',
+        'group_message_list_area' => 'core_message > Message list area',
+        'group_message_message_content' => 'core_message > Message content',
+    ];
+
     /**
      * Allowed selectors getter.
      *
diff --git a/lib/behat/classes/util.php b/lib/behat/classes/util.php
index 4f11771f00ac7..5338be1c7f6d5 100644
--- a/lib/behat/classes/util.php
+++ b/lib/behat/classes/util.php
@@ -31,6 +31,9 @@
 require_once(__DIR__ . '/behat_config_manager.php');
 
 require_once(__DIR__ . '/../../filelib.php');
+require_once(__DIR__ . '/../../clilib.php');
+
+use Behat\Mink\Session;
 
 /**
  * Init/reset utilities for Behat database and dataroot
@@ -342,6 +345,23 @@ public final static function get_test_file_path() {
         return behat_command::get_parent_behat_dir() . '/test_environment_enabled.txt';
     }
 
+    /**
+     * Removes config settings that were added to the main $CFG config within the Behat CLI
+     * run.
+     *
+     * Database storage is already handled by reset_database and existing config values will
+     * be reset automatically by initialise_cfg(), so we only need to remove added ones.
+     */
+    public static function remove_added_config() {
+        global $CFG;
+        if (!empty($CFG->behat_cli_added_config)) {
+            foreach ($CFG->behat_cli_added_config as $key => $value) {
+                unset($CFG->{$key});
+            }
+            unset($CFG->behat_cli_added_config);
+        }
+    }
+
     /**
      * Reset contents of all database tables to initial values, reset caches, etc.
      */
@@ -372,6 +392,41 @@ public static function reset_all_data() {
 
         // Initialise $CFG with default values. This is needed for behat cli process, so we don't have modified
         // $CFG values from the old run. @see set_config.
+        self::remove_added_config();
         initialise_cfg();
     }
+
+    /**
+     * Pause execution immediately.
+     *
+     * @param Session $session
+     * @param string $message The message to show when pausing.
+     * This will be passed through cli_ansi_format so appropriate ANSI formatting and features are available.
+     */
+    public static function pause(Session $session, string $message): void {
+        $posixexists = function_exists('posix_isatty');
+
+        // Make sure this step is only used with interactive terminal (if detected).
+        if ($posixexists && !@posix_isatty(STDOUT)) {
+            throw new ExpectationException('Break point should only be used with interactive terminal.', $session);
+        }
+
+        // Save the cursor position, ring the bell, and add a new line.
+        fwrite(STDOUT, cli_ansi_format("<cursor:save><bell><newline>"));
+
+        // Output the formatted message and reset colour back to normal.
+        $formattedmessage = cli_ansi_format("{$message}<colour:normal>");
+        fwrite(STDOUT, $formattedmessage);
+
+        // Wait for input.
+        fread(STDIN, 1024);
+
+        // Move the cursor back up to the previous position, then restore the original position stored earlier, and move
+        // it back down again.
+        fwrite(STDOUT, cli_ansi_format("<cursor:up><cursor:up><cursor:restore><cursor:down><cursor:down>"));
+
+        // Add any extra lines back if the provided message was spread over multiple lines.
+        $linecount = count(explode("\n", $formattedmessage));
+        fwrite(STDOUT, str_repeat(cli_ansi_format("<cursor:down>"), $linecount - 1));
+    }
 }
diff --git a/lib/behat/form_field/behat_form_autocomplete.php b/lib/behat/form_field/behat_form_autocomplete.php
index 873695a8d88f7..8b1d39080a0d5 100644
--- a/lib/behat/form_field/behat_form_autocomplete.php
+++ b/lib/behat/form_field/behat_form_autocomplete.php
@@ -45,7 +45,7 @@ class behat_form_autocomplete extends behat_form_text {
      */
     public function set_value($value) {
         if (!$this->running_javascript()) {
-            throw new coding_exception('Setting the valid of an autocomplete field requires javascript.');
+            throw new coding_exception('Setting the value of an autocomplete field requires javascript.');
         }
 
         // Set the value of the autocomplete's input.
@@ -86,6 +86,7 @@ public function set_value($value) {
 
             $this->wait_for_pending_js();
             $this->key_press(27);
+            $this->wait_for_pending_js();
         }
     }
 }
diff --git a/lib/classes/component.php b/lib/classes/component.php
index 6c5d842486073..a1c440393ca26 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -42,8 +42,21 @@
  * Collection of components related methods.
  */
 class core_component {
-    /** @var array list of ignored directories - watch out for auth/db exception */
-    protected static $ignoreddirs = array('CVS'=>true, '_vti_cnf'=>true, 'simpletest'=>true, 'db'=>true, 'yui'=>true, 'tests'=>true, 'classes'=>true, 'fonts'=>true);
+    /** @var array list of ignored directories in plugin type roots - watch out for auth/db exception */
+    protected static $ignoreddirs = [
+        'CVS' => true,
+        '_vti_cnf' => true,
+        'amd' => true,
+        'classes' => true,
+        'db' => true,
+        'fonts' => true,
+        'lang' => true,
+        'pix' => true,
+        'simpletest' => true,
+        'templates' => true,
+        'tests' => true,
+        'yui' => true,
+    ];
     /** @var array list plugin types that support subplugins, do not add more here unless absolutely necessary */
     protected static $supportsubplugins = array('mod', 'editor', 'tool', 'local');
 
diff --git a/lib/classes/event/context_locked.php b/lib/classes/event/context_locked.php
new file mode 100644
index 0000000000000..f4bf9904c0bc8
--- /dev/null
+++ b/lib/classes/event/context_locked.php
@@ -0,0 +1,85 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Context locked event.
+ *
+ * @package    core_access
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core\event;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Event triggered after a context has been frozen.
+ *
+ * @package    core_access
+ * @since      Moodle 3.8
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class context_locked extends base {
+    /**
+     * Returns description of what happened.
+     *
+     * @return string
+     */
+    public function get_description() {
+        return "The user with id '$this->userid' locked the context with id '$this->objectid' ";
+    }
+
+    /**
+     * Return localised event name.
+     *
+     * @return string
+     */
+    public static function get_name() {
+        return get_string('eventcontextlocked', 'access');
+    }
+
+    /**
+     * Get URL related to the action
+     *
+     * @return \moodle_url
+     */
+    public function get_url() {
+        // Try to get the url for the context.
+        try {
+            $context = \context::instance_by_id($this->objectid);
+            $url = $context->get_url();
+        } catch (\dml_missing_record_exception $e) {
+            // The context no longer exists, give them the system url instead.
+            $url = \context_system::instance()->get_url();
+        }
+        return $url;
+    }
+
+    /**
+     * Init method.
+     *
+     * @return void
+     */
+    protected function init() {
+        $this->data['crud'] = 'u';
+        $this->data['edulevel'] = self::LEVEL_OTHER;
+        $this->data['objecttable'] = 'context';
+    }
+}
diff --git a/lib/classes/event/context_unlocked.php b/lib/classes/event/context_unlocked.php
new file mode 100644
index 0000000000000..92e6ece1c5ce0
--- /dev/null
+++ b/lib/classes/event/context_unlocked.php
@@ -0,0 +1,85 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Context unlocked event.
+ *
+ * @package    core_access
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core\event;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Event triggered after a context has been unfrozen.
+ *
+ * @package    core_access
+ * @since      Moodle 3.8
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class context_unlocked extends base {
+    /**
+     * Returns description of what happened.
+     *
+     * @return string
+     */
+    public function get_description() {
+        return "The user with id '$this->userid' unlocked the context with id '$this->objectid' ";
+    }
+
+    /**
+     * Return localised event name.
+     *
+     * @return string
+     */
+    public static function get_name() {
+        return get_string('eventcontextunlocked', 'access');
+    }
+
+    /**
+     * Get URL related to the action
+     *
+     * @return \moodle_url
+     */
+    public function get_url() {
+        // Try to get the url for the context.
+        try {
+            $context = \context::instance_by_id($this->objectid);
+            $url = $context->get_url();
+        } catch (\dml_missing_record_exception $e) {
+            // The context no longer exists, give them the system url instead.
+            $url = \context_system::instance()->get_url();
+        }
+        return $url;
+    }
+
+    /**
+     * Init method.
+     *
+     * @return void
+     */
+    protected function init() {
+        $this->data['crud'] = 'u';
+        $this->data['edulevel'] = self::LEVEL_OTHER;
+        $this->data['objecttable'] = 'context';
+    }
+}
diff --git a/lib/classes/hub/api.php b/lib/classes/hub/api.php
index 75a050883fec3..40a0f9ec13022 100644
--- a/lib/classes/hub/api.php
+++ b/lib/classes/hub/api.php
@@ -33,7 +33,7 @@
 use moodle_url;
 
 /**
- * Methods to communicate with moodle.net web services
+ * Provides methods to communicate with the hub (sites directory) web services.
  *
  * @package    core
  * @copyright  2017 Marina Glancy
@@ -51,11 +51,11 @@ class api {
     const HUB_BACKUP_FILE_TYPE = 'backup';
 
     /**
-     * Calls moodle.net WS
+     * Calls a remote function exposed via web services on the hub.
      *
      * @param string $function name of WS function
      * @param array $data parameters of WS function
-     * @param bool $allowpublic allow request without moodle.net registration
+     * @param bool $allowpublic allow request without registration on the hub
      * @return mixed depends on the function
      * @throws moodle_exception
      */
@@ -71,7 +71,7 @@ protected static function call($function, array $data = [], $allowpublic = false
     }
 
     /**
-     * Performs REST request to moodle.net (using GET method)
+     * Performs a REST request to the hub site (using the GET method).
      *
      * @param string $token
      * @param string $function
@@ -88,13 +88,14 @@ protected static function call_rest($token, $function, array $data) {
 
         $curl = new curl();
         $serverurl = HUB_MOODLEORGHUBURL . "/local/hub/webservice/webservices.php";
-        $curloutput = @json_decode($curl->get($serverurl, $params), true);
+        $query = http_build_query($params, '', '&');
+        $curloutput = @json_decode($curl->post($serverurl, $query), true);
         $info = $curl->get_info();
         if ($curl->get_errno()) {
             // Connection error.
             throw new moodle_exception('errorconnect', 'hub', '', $curl->error);
         } else if (isset($curloutput['exception'])) {
-            // Exception occurred on moodle.net .
+            // Exception occurred on the remote side.
             self::process_curl_exception($token, $curloutput);
         } else if ($info['http_code'] != 200) {
             throw new moodle_exception('errorconnect', 'hub', '', $info['http_code']);
@@ -104,7 +105,7 @@ protected static function call_rest($token, $function, array $data) {
     }
 
     /**
-     * Analyses exception received from moodle.net
+     * Analyses exception received from the hub server.
      *
      * @param string $token token used for CURL request
      * @param array $curloutput output from CURL request
@@ -127,7 +128,7 @@ protected static function process_curl_exception($token, $curloutput) {
     }
 
     /**
-     * Update site registration on moodle.net
+     * Update site registration on the hub.
      *
      * @param array $siteinfo
      * @throws moodle_exception
@@ -138,20 +139,20 @@ public static function update_registration(array $siteinfo) {
     }
 
     /**
-     * Returns information about moodle.net
+     * Returns information about the hub.
      *
      * Example of the return array:
      * {
      *     "courses": 384,
-     *     "description": "Moodle.net connects you with free content and courses shared by Moodle ...",
-     *     "downloadablecourses": 190,
-     *     "enrollablecourses": 194,
+     *     "description": "Official Moodle sites directory.",
+     *     "downloadablecourses": 0,
+     *     "enrollablecourses": 0,
      *     "hublogo": 1,
      *     "language": "en",
-     *     "name": "Moodle.net",
+     *     "name": "moodle",
      *     "sites": 274175,
-     *     "url": "https://moodle.net",
-     *     "imgurl": "https://moodle.net/local/hub/webservice/download.php?filetype=hubscreenshot"
+     *     "url": "https://stats.moodle.org",
+     *     "imgurl": "https://stats.moodle.org/local/hub/webservice/download.php?filetype=hubscreenshot"
      * }
      *
      * @return array
@@ -357,7 +358,7 @@ public static function unregister_courses($courseids) {
      *
      * @param array|\stdClass $courseinfo
      * @return int id of the published course on the hub
-     * @throws moodle_exception if communication to moodle.net failed or course could not be published
+     * @throws moodle_exception if the communication with the hub failed or the course could not be published
      */
     public static function register_course($courseinfo) {
         $params = array('courses' => array($courseinfo));
@@ -371,7 +372,7 @@ public static function register_course($courseinfo) {
     /**
      * Uploads a screenshot for the published course
      *
-     * @param int $hubcourseid id of the published course on moodle.net, it must be published from this site
+     * @param int $hubcourseid id of the published course on the hub, it must be published from this site
      * @param \stored_file $file
      * @param int $screenshotnumber ordinal number of the screenshot
      */
@@ -390,7 +391,7 @@ public static function add_screenshot($hubcourseid, \stored_file $file, $screens
     /**
      * Downloads course backup
      *
-     * @param int $hubcourseid id of the course on moodle.net
+     * @param int $hubcourseid id of the course on the hub
      * @param string $path local path (in tempdir) to save the downloaded backup to.
      */
     public static function download_course_backup($hubcourseid, $path) {
@@ -414,7 +415,7 @@ public static function download_course_backup($hubcourseid, $path) {
     /**
      * Uploads a course backup
      *
-     * @param int $hubcourseid id of the published course on moodle.net, it must be published from this site
+     * @param int $hubcourseid id of the published course on the hub, it must be published from this site
      * @param \stored_file $backupfile
      */
     public static function upload_course_backup($hubcourseid, \stored_file $backupfile) {
diff --git a/lib/classes/hub/course_publication_form.php b/lib/classes/hub/course_publication_form.php
deleted file mode 100644
index 498f087049a5d..0000000000000
--- a/lib/classes/hub/course_publication_form.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Class course_publication_form
- *
- * @package    core
- * @copyright  2017 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core\hub;
-defined('MOODLE_INTERNAL') || die();
-
-use stdClass;
-use license_manager;
-use moodle_url;
-use core_collator;
-
-global $CFG;
-require_once($CFG->libdir . '/formslib.php');
-require_once($CFG->libdir . '/licenselib.php');
-
-/**
- * The forms used for course publication
- *
- * @package    core
- * @copyright  2017 Marina Glancy
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class course_publication_form extends \moodleform {
-
-    /**
-     * Form definition
-     */
-    public function definition() {
-        global $CFG, $USER, $PAGE;
-
-        $strrequired = get_string('required');
-        $mform = & $this->_form;
-        $course = $this->_customdata['course'];
-        if (!empty($this->_customdata['publication'])) {
-            // We are editing existing publication.
-            $publication = $this->_customdata['publication'];
-            $advertise = $publication->enrollable;
-            $publishedcourse = publication::get_published_course($publication);
-        } else {
-            $publication = null;
-            $advertise = $this->_customdata['advertise'];
-        }
-        $share = !$advertise;
-
-        if (!empty($publishedcourse)) {
-            $hubcourseid = $publishedcourse['id'];
-            $defaultfullname = $publishedcourse['fullname'];
-            $defaultshortname = $publishedcourse['shortname'];
-            $defaultsummary = $publishedcourse['description'];
-            $defaultlanguage = $publishedcourse['language'];
-            $defaultpublishername = $publishedcourse['publishername'];
-            $defaultpublisheremail = $publishedcourse['publisheremail'];
-            $defaultcontributornames = $publishedcourse['contributornames'];
-            $defaultcoverage = $publishedcourse['coverage'];
-            $defaultcreatorname = $publishedcourse['creatorname'];
-            $defaultlicenceshortname = $publishedcourse['licenceshortname'];
-            $defaultsubject = $publishedcourse['subject'];
-            $defaultaudience = $publishedcourse['audience'];
-            $defaulteducationallevel = $publishedcourse['educationallevel'];
-            $defaultcreatornotes = $publishedcourse['creatornotes'];
-            $defaultcreatornotesformat = $publishedcourse['creatornotesformat'];
-            $screenshotsnumber = $publishedcourse['screenshots'];
-            $screenshotbaseurl = $publishedcourse['screenshotbaseurl'];
-            $privacy = $publishedcourse['privacy'];
-            if (($screenshotsnumber > 0) and !empty($privacy)) {
-                $PAGE->requires->yui_module('moodle-block_community-imagegallery',
-                    'M.blocks_community.init_imagegallery',
-                    array(array('imageids' => array($hubcourseid),
-                        'imagenumbers' => array($screenshotsnumber),
-                        'huburl' => HUB_MOODLEORGHUBURL)));
-            }
-        } else {
-            $defaultfullname = $course->fullname;
-            $defaultshortname = $course->shortname;
-            $defaultsummary = clean_param($course->summary, PARAM_TEXT);
-            if (empty($course->lang)) {
-                $language = get_site()->lang;
-                if (empty($language)) {
-                    $defaultlanguage = current_language();
-                } else {
-                    $defaultlanguage = $language;
-                }
-            } else {
-                $defaultlanguage = $course->lang;
-            }
-            $defaultpublishername = $USER->firstname . ' ' . $USER->lastname;
-            $defaultpublisheremail = $USER->email;
-            $defaultcontributornames = '';
-            $defaultcoverage = '';
-            $defaultcreatorname = $USER->firstname . ' ' . $USER->lastname;
-            $defaultlicenceshortname = 'cc';
-            $defaultsubject = 'none';
-            $defaultaudience = publication::HUB_AUDIENCE_STUDENTS;
-            $defaulteducationallevel = publication::HUB_EDULEVEL_TERTIARY;
-            $defaultcreatornotes = '';
-            $defaultcreatornotesformat = FORMAT_HTML;
-            $screenshotsnumber = 0;
-            $screenshotbaseurl = null;
-        }
-
-        // The input parameters.
-        $mform->addElement('header', 'moodle', get_string('publicationinfo', 'hub'));
-
-        $mform->addElement('text', 'name', get_string('coursename', 'hub'),
-            array('class' => 'metadatatext'));
-        $mform->addRule('name', $strrequired, 'required', null, 'client');
-        $mform->setType('name', PARAM_TEXT);
-        $mform->setDefault('name', $defaultfullname);
-        $mform->addHelpButton('name', 'name', 'hub');
-
-        $mform->addElement('hidden', 'id', $course->id);
-        $mform->setType('id', PARAM_INT);
-
-        $mform->addElement('hidden', 'publicationid', $publication ? $publication->id : null);
-        $mform->setType('publicationid', PARAM_INT);
-
-        if ($share) {
-            $buttonlabel = get_string('shareon', 'hub', 'Moodle.net');
-
-            $mform->addElement('hidden', 'share', $share);
-            $mform->setType('share', PARAM_BOOL);
-            $mform->addElement('text', 'demourl', get_string('demourl', 'hub'),
-                array('class' => 'metadatatext'));
-            $mform->setType('demourl', PARAM_URL);
-            $mform->setDefault('demourl', new moodle_url("/course/view.php?id=" . $course->id));
-            $mform->addHelpButton('demourl', 'demourl', 'hub');
-        }
-
-        if ($advertise) {
-            if (!$publication) {
-                $buttonlabel = get_string('advertiseon', 'hub', 'Moodle.net');
-            } else {
-                $buttonlabel = get_string('readvertiseon', 'hub', 'Moodle.net');
-            }
-            $mform->addElement('hidden', 'advertise', $advertise);
-            $mform->setType('advertise', PARAM_BOOL);
-            $mform->addElement('hidden', 'courseurl', $CFG->wwwroot . "/course/view.php?id=" . $course->id);
-            $mform->setType('courseurl', PARAM_URL);
-            $mform->addElement('static', 'courseurlstring', get_string('courseurl', 'hub'));
-            $mform->setDefault('courseurlstring', new moodle_url("/course/view.php?id=" . $course->id));
-            $mform->addHelpButton('courseurlstring', 'courseurl', 'hub');
-        }
-
-        $mform->addElement('text', 'courseshortname', get_string('courseshortname', 'hub'),
-            array('class' => 'metadatatext'));
-        $mform->setDefault('courseshortname', $defaultshortname);
-        $mform->addHelpButton('courseshortname', 'courseshortname', 'hub');
-        $mform->setType('courseshortname', PARAM_TEXT);
-        $mform->addElement('textarea', 'description', get_string('description', 'hub'), array('rows' => 10,
-            'cols' => 57));
-        $mform->addRule('description', $strrequired, 'required', null, 'client');
-        $mform->setDefault('description', $defaultsummary);
-        $mform->setType('description', PARAM_TEXT);
-        $mform->addHelpButton('description', 'description', 'hub');
-
-        $languages = get_string_manager()->get_list_of_languages();
-        core_collator::asort($languages);
-        $mform->addElement('select', 'language', get_string('language'), $languages);
-        $mform->setDefault('language', $defaultlanguage);
-        $mform->addHelpButton('language', 'language', 'hub');
-
-        $mform->addElement('text', 'publishername', get_string('publishername', 'hub'),
-            array('class' => 'metadatatext'));
-        $mform->setDefault('publishername', $defaultpublishername);
-        $mform->addRule('publishername', $strrequired, 'required', null, 'client');
-        $mform->addHelpButton('publishername', 'publishername', 'hub');
-        $mform->setType('publishername', PARAM_NOTAGS);
-
-        $mform->addElement('text', 'publisheremail', get_string('publisheremail', 'hub'),
-            array('class' => 'metadatatext'));
-        $mform->setDefault('publisheremail', $defaultpublisheremail);
-        $mform->addRule('publisheremail', $strrequired, 'required', null, 'client');
-        $mform->addHelpButton('publisheremail', 'publisheremail', 'hub');
-        $mform->setType('publisheremail', PARAM_EMAIL);
-
-        $mform->addElement('text', 'creatorname', get_string('creatorname', 'hub'),
-            array('class' => 'metadatatext'));
-        $mform->addRule('creatorname', $strrequired, 'required', null, 'client');
-        $mform->setType('creatorname', PARAM_NOTAGS);
-        $mform->setDefault('creatorname', $defaultcreatorname);
-        $mform->addHelpButton('creatorname', 'creatorname', 'hub');
-
-        $mform->addElement('text', 'contributornames', get_string('contributornames', 'hub'),
-            array('class' => 'metadatatext'));
-        $mform->setDefault('contributornames', $defaultcontributornames);
-        $mform->addHelpButton('contributornames', 'contributornames', 'hub');
-        $mform->setType('contributornames', PARAM_NOTAGS);
-
-        $mform->addElement('text', 'coverage', get_string('tags', 'hub'),
-            array('class' => 'metadatatext'));
-        $mform->setType('coverage', PARAM_TEXT);
-        $mform->setDefault('coverage', $defaultcoverage);
-        $mform->addHelpButton('coverage', 'tags', 'hub');
-
-        $licensemanager = new license_manager();
-        $licences = $licensemanager->get_licenses();
-        $options = array();
-        foreach ($licences as $license) {
-            $options[$license->shortname] = get_string($license->shortname, 'license');
-        }
-        $mform->addElement('select', 'licence', get_string('license'), $options);
-        $mform->setDefault('licence', $defaultlicenceshortname);
-        unset($options);
-        $mform->addHelpButton('licence', 'licence', 'hub');
-
-        $options = publication::get_sorted_subjects();
-
-        $mform->addElement('searchableselector', 'subject',
-            get_string('subject', 'hub'), $options);
-        unset($options);
-        $mform->addHelpButton('subject', 'subject', 'hub');
-        $mform->setDefault('subject', $defaultsubject);
-        $mform->addRule('subject', $strrequired, 'required', null, 'client');
-
-        $options = publication::audience_options();
-        $mform->addElement('select', 'audience', get_string('audience', 'hub'), $options);
-        $mform->setDefault('audience', $defaultaudience);
-        unset($options);
-        $mform->addHelpButton('audience', 'audience', 'hub');
-
-        $options = publication::educational_level_options();
-        $mform->addElement('select', 'educationallevel', get_string('educationallevel', 'hub'), $options);
-        $mform->setDefault('educationallevel', $defaulteducationallevel);
-        unset($options);
-        $mform->addHelpButton('educationallevel', 'educationallevel', 'hub');
-
-        $editoroptions = array('maxfiles' => 0, 'maxbytes' => 0, 'trusttext' => false, 'forcehttps' => false);
-        $mform->addElement('editor', 'creatornotes', get_string('creatornotes', 'hub'), '', $editoroptions);
-        $mform->addRule('creatornotes', $strrequired, 'required', null, 'client');
-        $mform->setType('creatornotes', PARAM_CLEANHTML);
-        $mform->addHelpButton('creatornotes', 'creatornotes', 'hub');
-
-        if ($advertise) {
-            if (!empty($screenshotsnumber)) {
-                if (!empty($privacy)) {
-                    $screenshothtml = \html_writer::empty_tag('img',
-                        array('src' => $screenshotbaseurl, 'alt' => $defaultfullname));
-                    $screenshothtml = \html_writer::tag('div', $screenshothtml,
-                        array('class' => 'coursescreenshot',
-                            'id' => 'image-' . $hubcourseid));
-                } else {
-                    $screenshothtml = get_string('existingscreenshotnumber', 'hub', $screenshotsnumber);
-                }
-                $mform->addElement('static', 'existingscreenshots', get_string('existingscreenshots', 'hub'), $screenshothtml);
-                $mform->addHelpButton('existingscreenshots', 'deletescreenshots', 'hub');
-                $mform->addElement('checkbox', 'deletescreenshots', '', ' ' . get_string('deletescreenshots', 'hub'));
-            }
-
-            $mform->addElement('hidden', 'existingscreenshotnumber', $screenshotsnumber);
-            $mform->setType('existingscreenshotnumber', PARAM_INT);
-        }
-
-        $mform->addElement('filemanager', 'screenshots', get_string('addscreenshots', 'hub'), null,
-            array('subdirs' => 0,
-                'maxbytes' => 1000000,
-                'maxfiles' => 3
-            ));
-        $mform->addHelpButton('screenshots', 'screenshots', 'hub');
-
-        $this->add_action_buttons(false, $buttonlabel);
-
-        // Set default value for creatornotes editor.
-        $data = new stdClass();
-        $data->creatornotes = array();
-        $data->creatornotes['text'] = $defaultcreatornotes;
-        $data->creatornotes['format'] = $defaultcreatornotesformat;
-        $this->set_data($data);
-    }
-
-    /**
-     * Custom form validation
-     *
-     * @param array $data
-     * @param array $files
-     * @return array
-     */
-    public function validation($data, $files) {
-        $errors = parent::validation($data, $files);
-
-        if ($this->_form->_submitValues['subject'] == 'none') {
-            $errors['subject'] = get_string('mustselectsubject', 'hub');
-        }
-
-        return $errors;
-    }
-}
diff --git a/lib/classes/hub/publication.php b/lib/classes/hub/publication.php
deleted file mode 100644
index f0f48d946ba88..0000000000000
--- a/lib/classes/hub/publication.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Class publication
- *
- * @package    core
- * @copyright  2017 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core\hub;
-defined('MOODLE_INTERNAL') || die();
-
-use moodle_exception;
-use moodle_url;
-use context_user;
-use stdClass;
-use html_writer;
-
-/**
- * Methods to work with site registration on moodle.net
- *
- * @package    core
- * @copyright  2017 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class publication {
-
-    /** @var Audience: educators */
-    const HUB_AUDIENCE_EDUCATORS = 'educators';
-
-    /** @var Audience: students */
-    const HUB_AUDIENCE_STUDENTS = 'students';
-
-    /** @var Audience: admins */
-    const HUB_AUDIENCE_ADMINS = 'admins';
-
-    /** @var Educational level: primary */
-    const HUB_EDULEVEL_PRIMARY = 'primary';
-
-    /** @var Educational level: secondary */
-    const HUB_EDULEVEL_SECONDARY = 'secondary';
-
-    /** @var Educational level: tertiary */
-    const HUB_EDULEVEL_TERTIARY = 'tertiary';
-
-    /** @var Educational level: government */
-    const HUB_EDULEVEL_GOVERNMENT = 'government';
-
-    /** @var Educational level: association */
-    const HUB_EDULEVEL_ASSOCIATION = 'association';
-
-    /** @var Educational level: corporate */
-    const HUB_EDULEVEL_CORPORATE = 'corporate';
-
-    /** @var Educational level: other */
-    const HUB_EDULEVEL_OTHER = 'other';
-
-
-    /**
-     * Retrieve all the sorted course subjects
-     *
-     * @return array $subjects
-     */
-    public static function get_sorted_subjects() {
-        $subjects = get_string_manager()->load_component_strings('edufields', current_language());
-
-        // Sort the subjects.
-        $return  = [];
-        asort($subjects);
-        foreach ($subjects as $key => $option) {
-            $keylength = strlen($key);
-            if ($keylength == 12) {
-                $return[$key] = $option; // We want only selectable categories.
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Get all publication for a course
-     *
-     * @param int $courseid local course id
-     * @return array of publication
-     */
-    public static function get_course_publications($courseid) {
-        global $DB;
-        $sql = 'SELECT cp.id, cp.status, cp.timechecked, cp.timepublished, rh.hubname,
-                       rh.huburl, cp.courseid, cp.enrollable, cp.hubcourseid
-                FROM {course_published} cp, {registration_hubs} rh
-                WHERE cp.huburl = rh.huburl and cp.courseid = :courseid and rh.huburl = :huburl
-                ORDER BY cp.enrollable DESC, rh.hubname, cp.timepublished';
-        $params = array('courseid' => $courseid, 'huburl' => HUB_MOODLEORGHUBURL);
-        $records = $DB->get_records_sql($sql, $params);
-
-        // Add links for publications that are listed.
-        foreach ($records as $id => $record) {
-            if ($record->status) {
-                $records[$id]->link = new moodle_url(HUB_MOODLEORGHUBURL, ['courseid' => $record->hubcourseid]);
-            }
-        }
-        return $records;
-    }
-
-    /**
-     * Load publication information from local db
-     *
-     * @param int $id
-     * @param int $courseid if specified publication will be checked that it is in the current course
-     * @param int $strictness
-     * @return stdClass
-     */
-    public static function get_publication($id, $courseid = 0, $strictness = IGNORE_MISSING) {
-        global $DB;
-        if (!$id && $strictness != MUST_EXIST) {
-            return false;
-        }
-        $params = ['id' => $id, 'huburl' => HUB_MOODLEORGHUBURL];
-        if ($courseid) {
-            $params['courseid'] = $courseid;
-        }
-        return $DB->get_record('course_published', $params, '*', $strictness);
-    }
-
-    /**
-     * Update a course publication
-     * @param stdClass $publication
-     */
-    protected static function update_publication($publication) {
-        global $DB;
-        $DB->update_record('course_published', $publication);
-    }
-
-    /**
-     * Check all courses published from this site if they have been approved
-     */
-    public static function request_status_update() {
-        global $DB;
-
-        list($sitecourses, $coursetotal) = api::get_courses('', 1, 1, ['allsitecourses' => 1]);
-
-        // Update status for all these course.
-        foreach ($sitecourses as $sitecourse) {
-            // Get the publication from the hub course id.
-            $publication = $DB->get_record('course_published', ['hubcourseid' => $sitecourse['id']]);
-            if (!empty($publication)) {
-                $publication->status = $sitecourse['privacy'];
-                $publication->timechecked = time();
-                self::update_publication($publication);
-            } else {
-                $msgparams = new stdClass();
-                $msgparams->id = $sitecourse['id'];
-                $msgparams->hubname = html_writer::tag('a', 'Moodle.net', array('href' => HUB_MOODLEORGHUBURL));
-                \core\notification::add(get_string('detectednotexistingpublication', 'hub', $msgparams)); // TODO action?
-            }
-        }
-
-    }
-
-    /**
-     * Unpublish a course
-     *
-     * @param stdClass $publication
-     */
-    public static function unpublish($publication) {
-        global $DB;
-        // Unpublish the publication by web service.
-        api::unregister_courses($publication->hubcourseid);
-
-        // Delete the publication from the database.
-        $DB->delete_records('course_published', array('id' => $publication->id));
-
-        // Add confirmation message.
-        $course = get_course($publication->courseid);
-        $context = \context_course::instance($course->id);
-        $publication->courseshortname = format_string($course->shortname, true, ['context' => $context]);
-        $publication->hubname = 'Moodle.net';
-        \core\notification::add(get_string('courseunpublished', 'hub', $publication), \core\output\notification::NOTIFY_SUCCESS);
-    }
-
-    /**
-     * Publish a course
-     *
-     * @param \stdClass $courseinfo
-     * @param \stored_file[] $files
-     */
-    public static function publish_course($courseinfo, $files) {
-        global $DB;
-
-        // Register course and get id of the course on moodle.net ($hubcourseid).
-        $courseid = $courseinfo->sitecourseid;
-        try {
-            $hubcourseid = api::register_course($courseinfo);
-        } catch (Exception $e) {
-            throw new moodle_exception('errorcoursepublish', 'hub',
-                new moodle_url('/course/view.php', array('id' => $courseid)), $e->getMessage());
-        }
-
-        // Insert/update publication record in the local DB.
-        $publication = $DB->get_record('course_published', array('hubcourseid' => $hubcourseid, 'huburl' => HUB_MOODLEORGHUBURL));
-
-        if ($publication) {
-            $DB->update_record('course_published', ['id' => $publication->id, 'timepublished' => time()]);
-        } else {
-            $publication = new stdClass();
-            $publication->huburl = HUB_MOODLEORGHUBURL;
-            $publication->courseid = $courseid;
-            $publication->hubcourseid = $hubcourseid;
-            $publication->enrollable = (int)$courseinfo->enrollable;
-            $publication->timepublished = time();
-            $publication->id = $DB->insert_record('course_published', $publication);
-        }
-
-        // Send screenshots.
-        if ($files) {
-            $screenshotnumber = $courseinfo->screenshots - count($files);
-            foreach ($files as $file) {
-                $screenshotnumber++;
-                api::add_screenshot($hubcourseid, $file, $screenshotnumber);
-            }
-        }
-
-        return $hubcourseid;
-    }
-
-    /**
-     * Delete all publications
-     *
-     * @param int $advertised search for advertised courses
-     * @param int $shared search for shared courses
-     * @throws moodle_exception
-     */
-    public static function delete_all_publications($advertised = true, $shared = true) {
-        global $DB;
-
-        if (!$advertised && !$shared) {
-            // Nothing to do.
-            return true;
-        }
-
-        $params = ['huburl' => HUB_MOODLEORGHUBURL];
-        if (!$advertised || !$shared) {
-            // Retrieve ONLY advertised or ONLY shared.
-            $params['enrollable'] = $advertised ? 1 : 0;
-        }
-
-        if (!$publications = $DB->get_records('course_published', $params)) {
-            // Nothing to unpublish.
-            return true;
-        }
-
-        foreach ($publications as $publication) {
-            $hubcourseids[] = $publication->hubcourseid;
-        }
-
-        api::unregister_courses($hubcourseids);
-
-        // Delete the published courses from local db.
-        $DB->delete_records('course_published', $params);
-        return true;
-    }
-
-    /**
-     * Get an array of all block instances for a given context
-     * @param int $contextid a context id
-     * @return array of block instances.
-     */
-    public static function get_block_instances_by_context($contextid) {
-        global $DB;
-        return $DB->get_records('block_instances', array('parentcontextid' => $contextid), 'blockname');
-    }
-
-    /**
-     * List of available educational levels
-     *
-     * @param bool $any add option for "Any" (for search forms)
-     * @return array
-     */
-    public static function educational_level_options($any = false) {
-        $options = array();
-        if ($any) {
-            $options['all'] = get_string('any');
-        }
-        $options[self::HUB_EDULEVEL_PRIMARY] = get_string('edulevelprimary', 'hub');
-        $options[self::HUB_EDULEVEL_SECONDARY] = get_string('edulevelsecondary', 'hub');
-        $options[self::HUB_EDULEVEL_TERTIARY] = get_string('eduleveltertiary', 'hub');
-        $options[self::HUB_EDULEVEL_GOVERNMENT] = get_string('edulevelgovernment', 'hub');
-        $options[self::HUB_EDULEVEL_ASSOCIATION] = get_string('edulevelassociation', 'hub');
-        $options[self::HUB_EDULEVEL_CORPORATE] = get_string('edulevelcorporate', 'hub');
-        $options[self::HUB_EDULEVEL_OTHER] = get_string('edulevelother', 'hub');
-        return $options;
-    }
-
-    /**
-     * List of available audience options
-     *
-     * @param bool $any add option for "Any" (for search forms)
-     * @return array
-     */
-    public static function audience_options($any = false) {
-        $options = array();
-        if ($any) {
-            $options['all'] = get_string('any');
-        }
-        $options[self::HUB_AUDIENCE_EDUCATORS] = get_string('audienceeducators', 'hub');
-        $options[self::HUB_AUDIENCE_STUDENTS] = get_string('audiencestudents', 'hub');
-        $options[self::HUB_AUDIENCE_ADMINS] = get_string('audienceadmins', 'hub');
-        return $options;
-    }
-
-    /**
-     * Search for courses
-     *
-     * For the list of fields returned for each course see {@link communication::get_courses}
-     *
-     * @param string $search search string
-     * @param bool $downloadable true - return downloadable courses, false - return enrollable courses
-     * @param array|\stdClass $options other options from the list of allowed options:
-     *              'ids', 'sitecourseids', 'coverage', 'licenceshortname', 'subject', 'audience',
-     *              'educationallevel', 'language', 'orderby', 'givememore', 'allsitecourses'
-     * @return array of two elements: [$courses, $coursetotal]
-     */
-    public static function search($search, $downloadable, $options) {
-        try {
-            return api::get_courses($search, $downloadable, !$downloadable, $options);
-        } catch (moodle_exception $e) {
-            \core\notification::add(get_string('errorcourselisting', 'block_community', $e->getMessage()),
-                \core\output\notification::NOTIFY_ERROR);
-            return [[], 0];
-        }
-    }
-
-    /**
-     * Retrieves information about published course
-     *
-     * For the list of fields returned for the course see {@link communication::get_courses}
-     *
-     * @param stdClass $publication
-     * @return array|null
-     */
-    public static function get_published_course($publication) {
-        try {
-            list($courses, $unused) = api::get_courses('', !$publication->enrollable,
-                $publication->enrollable, ['ids' => [$publication->hubcourseid], 'allsitecourses' => 1]);
-            return reset($courses);
-        } catch (\Exception $e) {
-            \core\notification::add(get_string('errorcourseinfo', 'hub', $e->getMessage()),
-                \core\output\notification::NOTIFY_ERROR);
-        }
-        return null;
-    }
-
-    /**
-     * Downloads course backup and stores it in the user private files
-     *
-     * @param int $hubcourseid
-     * @param string $coursename
-     * @return array
-     */
-    public static function download_course_backup($hubcourseid, $coursename) {
-        global $CFG, $USER;
-        require_once($CFG->libdir . "/filelib.php");
-
-        $backuptempdir = make_backup_temp_directory('');
-        $filename = md5(time() . '-' . $hubcourseid . '-'. $USER->id . '-'. random_string(20));
-        $path = $backuptempdir.'/'.$filename.".mbz";
-
-        api::download_course_backup($hubcourseid, $path);
-
-        $fs = get_file_storage();
-        $record = new stdClass();
-        $record->contextid = context_user::instance($USER->id)->id;
-        $record->component = 'user';
-        $record->filearea = 'private';
-        $record->itemid = 0;
-        $record->filename = urlencode($coursename).'_'.time().".mbz";
-        $record->filepath = '/downloaded_backup/';
-        if (!$fs->file_exists($record->contextid, $record->component,
-            $record->filearea, 0, $record->filepath, $record->filename)) {
-            $fs->create_file_from_pathname($record, $path);
-        }
-
-        return [$record->filepath . $record->filename, $filename];
-    }
-
-    /**
-     * Uploads a course backup
-     *
-     * @param int $hubcourseid id of the published course on moodle.net, it must be published from this site
-     * @param \stored_file $backupfile
-     */
-    public static function upload_course_backup($hubcourseid, \stored_file $backupfile) {
-        api::upload_course_backup($hubcourseid, $backupfile);
-    }
-}
\ No newline at end of file
diff --git a/lib/classes/hub/registration.php b/lib/classes/hub/registration.php
index 98657820c5977..cd716ef00846f 100644
--- a/lib/classes/hub/registration.php
+++ b/lib/classes/hub/registration.php
@@ -32,7 +32,7 @@
 use html_writer;
 
 /**
- * Methods to use when publishing and searching courses on moodle.net
+ * Methods to use when registering the site at the moodle sites directory.
  *
  * @package    core
  * @copyright  2017 Marina Glancy
@@ -40,11 +40,11 @@
  */
 class registration {
 
-    /** @var Fields used in a site registration form.
+    /** @var array Fields used in a site registration form.
      * IMPORTANT: any new fields with non-empty defaults have to be added to CONFIRM_NEW_FIELDS */
-    const FORM_FIELDS = ['name', 'description', 'contactname', 'contactemail', 'contactphone', 'imageurl', 'privacy', 'street',
-        'regioncode', 'countrycode', 'geolocation', 'contactable', 'emailalert', 'emailalertemail', 'commnews', 'commnewsemail',
-        'language', 'policyagreed'];
+    const FORM_FIELDS = ['policyagreed', 'language', 'countrycode', 'privacy',
+        'contactemail', 'contactable', 'emailalert', 'emailalertemail', 'commnews', 'commnewsemail',
+        'contactname', 'name', 'description', 'imageurl', 'contactphone', 'regioncode', 'geolocation', 'street'];
 
     /** @var List of new FORM_FIELDS or siteinfo fields added indexed by the version when they were added.
      * If site was already registered, admin will be promted to confirm new registration data manually. Until registration is manually confirmed,
@@ -147,7 +147,7 @@ public static function get_last_updated() {
     }
 
     /**
-     * Calculates and prepares site information to send to moodle.net as part of registration or update
+     * Calculates and prepares site information to send to the sites directory as a part of registration.
      *
      * @param array $defaults default values for inputs in the registration form (if site was never registered before)
      * @return array site info
@@ -158,9 +158,8 @@ public static function get_site_info($defaults = []) {
         require_once($CFG->dirroot . "/course/lib.php");
 
         $siteinfo = array();
-        $cleanhuburl = clean_param(HUB_MOODLEORGHUBURL, PARAM_ALPHANUMEXT);
         foreach (self::FORM_FIELDS as $field) {
-            $siteinfo[$field] = get_config('hub', 'site_'.$field.'_' . $cleanhuburl);
+            $siteinfo[$field] = get_config('hub', 'site_'.$field);
             if ($siteinfo[$field] === false) {
                 $siteinfo[$field] = array_key_exists($field, $defaults) ? $defaults[$field] : null;
             }
@@ -210,7 +209,7 @@ public static function get_site_info($defaults = []) {
     }
 
     /**
-     * Human-readable summary of data that will be sent to moodle.net
+     * Human-readable summary of data that will be sent to the sites directory.
      *
      * @param array $siteinfo result of get_site_info()
      * @return string
@@ -264,13 +263,12 @@ public static function get_stats_summary($siteinfo) {
      * @param stdClass $formdata data from {@link site_registration_form}
      */
     public static function save_site_info($formdata) {
-        $cleanhuburl = clean_param(HUB_MOODLEORGHUBURL, PARAM_ALPHANUMEXT);
         foreach (self::FORM_FIELDS as $field) {
-            set_config('site_' . $field . '_' . $cleanhuburl, $formdata->$field, 'hub');
+            set_config('site_' . $field, $formdata->$field, 'hub');
         }
-        // Even if the the connection with moodle.net fails, admin has manually submitted the form which means they don't need
+        // Even if the connection with the sites directory fails, admin has manually submitted the form which means they don't need
         // to be redirected to the site registration page any more.
-        set_config('site_regupdateversion_' . $cleanhuburl, max(array_keys(self::CONFIRM_NEW_FIELDS)), 'hub');
+        set_config('site_regupdateversion', max(array_keys(self::CONFIRM_NEW_FIELDS)), 'hub');
     }
 
     /**
@@ -329,7 +327,7 @@ public static function update_cron() {
     }
 
     /**
-     * Confirms registration by moodle.net
+     * Confirms registration by the sites directory.
      *
      * @param string $token
      * @param string $newtoken
@@ -350,6 +348,13 @@ public static function confirm_registration($token, $newtoken, $hubname) {
         $record['timemodified'] = time();
         $DB->update_record('registration_hubs', $record);
         self::$registration = null;
+
+        $siteinfo = self::get_site_info();
+        if (strlen(http_build_query($siteinfo)) > 1800) {
+            // Update registration again because the initial request was too long and could have been truncated.
+            api::update_registration($siteinfo);
+            self::$registration = null;
+        }
     }
 
     /**
@@ -368,8 +373,8 @@ public static function site_privacy_options() {
      * Registers a site
      *
      * This method will make sure that unconfirmed registration record is created and then redirect to
-     * registration script on https://moodle.net
-     * Moodle.net will check that the site is accessible, register it and redirect back
+     * registration script on the sites directory.
+     * The sites directory will check that the site is accessible, register it and redirect back
      * to /admin/registration/confirmregistration.php
      *
      * @param string $returnurl
@@ -390,7 +395,7 @@ public static function register($returnurl) {
             $hub->token = get_site_identifier();
             $hub->secret = $hub->token;
             $hub->huburl = HUB_MOODLEORGHUBURL;
-            $hub->hubname = 'Moodle.net';
+            $hub->hubname = 'moodle';
             $hub->confirmed = 0;
             $hub->timemodified = time();
             $hub->id = $DB->insert_record('registration_hubs', $hub);
@@ -398,10 +403,21 @@ public static function register($returnurl) {
         }
 
         $params = self::get_site_info();
-        $params['token'] = $hub->token;
+
+        // The most conservative limit for the redirect URL length is 2000 characters. Only pass parameters before
+        // we reach this limit. The next registration update will update all fields.
+        // We will also update registration after we receive confirmation from moodle.net.
+        $url = new moodle_url(HUB_MOODLEORGHUBURL . '/local/hub/siteregistration.php',
+            ['token' => $hub->token, 'url' => $params['url']]);
+        foreach ($params as $key => $value) {
+            if (strlen($url->out(false, [$key => $value])) > 2000) {
+                break;
+            }
+            $url->param($key, $value);
+        }
 
         $SESSION->registrationredirect = $returnurl;
-        redirect(new moodle_url(HUB_MOODLEORGHUBURL . '/local/hub/siteregistration.php', $params));
+        redirect($url);
     }
 
     /**
@@ -418,19 +434,6 @@ public static function unregister($unpublishalladvertisedcourses, $unpublishallu
             return true;
         }
 
-        // Unpublish the courses.
-        try {
-            publication::delete_all_publications($unpublishalladvertisedcourses, $unpublishalluploadedcourses);
-        } catch (moodle_exception $e) {
-            $errormessage = $e->getMessage();
-            $errormessage .= \html_writer::empty_tag('br') .
-                get_string('errorunpublishcourses', 'hub');
-
-            \core\notification::add(get_string('unregistrationerror', 'hub', $errormessage),
-                \core\output\notification::NOTIFY_ERROR);
-            return false;
-        }
-
         // Course unpublish went ok, unregister the site now.
         try {
             api::unregister_site();
@@ -482,20 +485,20 @@ public static function reset_site_identifier($token) {
     }
 
     /**
-     * Returns information about moodle.net
+     * Returns information about the sites directory.
      *
      * Example of the return array:
      * {
      *     "courses": 384,
-     *     "description": "Moodle.net connects you with free content and courses shared by Moodle ...",
-     *     "downloadablecourses": 190,
-     *     "enrollablecourses": 194,
+     *     "description": "Official moodle sites directory",
+     *     "downloadablecourses": 0,
+     *     "enrollablecourses": 0,
      *     "hublogo": 1,
      *     "language": "en",
-     *     "name": "Moodle.net",
+     *     "name": "moodle",
      *     "sites": 274175,
-     *     "url": "https://moodle.net",
-     *     "imgurl": moodle_url : "https://moodle.net/local/hub/webservice/download.php?filetype=hubscreenshot"
+     *     "url": "https://stats.moodle.org",
+     *     "imgurl": "https://stats.moodle.org/local/hub/webservice/download.php?filetype=hubscreenshot"
      * }
      *
      * @return array|null
@@ -504,8 +507,8 @@ public static function get_moodlenet_info() {
         try {
             return api::get_hub_info();
         } catch (moodle_exception $e) {
-            // Ignore error, we only need it for displaying information about moodle.net, if this request
-            // fails, it's not a big deal.
+            // Ignore error, we only need it for displaying information about the sites directory.
+            // If this request fails, it's not a big deal.
             return null;
         }
     }
@@ -550,8 +553,7 @@ public static function get_new_registration_fields() {
             return $fieldsneedconfirm;
         }
 
-        $cleanhuburl = clean_param(HUB_MOODLEORGHUBURL, PARAM_ALPHANUMEXT);
-        $lastupdated = (int)get_config('hub', 'site_regupdateversion_' . $cleanhuburl);
+        $lastupdated = (int)get_config('hub', 'site_regupdateversion');
         foreach (self::CONFIRM_NEW_FIELDS as $version => $fields) {
             if ($version > $lastupdated) {
                 $fieldsneedconfirm = array_merge($fieldsneedconfirm, $fields);
diff --git a/lib/classes/hub/site_registration_form.php b/lib/classes/hub/site_registration_form.php
index 510a2da42b097..f58f9ef95606b 100644
--- a/lib/classes/hub/site_registration_form.php
+++ b/lib/classes/hub/site_registration_form.php
@@ -32,7 +32,7 @@
 require_once($CFG->libdir . '/formslib.php');
 
 /**
- * The site registration form. Information will be sent to moodle.net
+ * The site registration form. Information will be sent to the sites directory.
  *
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
  * @package    core
@@ -75,7 +75,7 @@ public function definition() {
         $mform->addElement('header', 'moodle', get_string('registrationinfo', 'hub'));
 
         $mform->addElement('text', 'name', get_string('sitename', 'hub'),
-            array('class' => 'registration_textfield'));
+            array('class' => 'registration_textfield', 'maxlength' => 255));
         $mform->setType('name', PARAM_TEXT);
         $mform->addHelpButton('name', 'sitename', 'hub');
 
@@ -161,16 +161,16 @@ public function definition() {
         $mform->addElement('static', 'urlstring', get_string('siteurl', 'hub'), $siteinfo['url']);
         $mform->addHelpButton('urlstring', 'siteurl', 'hub');
 
-        // Display statistic that are going to be retrieve by moodle.net.
+        // Display statistic that are going to be retrieve by the sites directory.
         $mform->addElement('static', 'siteinfosummary', get_string('sendfollowinginfo', 'hub'), registration::get_stats_summary($siteinfo));
 
         // Check if it's a first registration or update.
         if (registration::is_registered()) {
-            $buttonlabel = get_string('updatesite', 'hub', 'Moodle.net');
+            $buttonlabel = get_string('updatesiteregistration', 'core_hub');
             $mform->addElement('hidden', 'update', true);
             $mform->setType('update', PARAM_BOOL);
         } else {
-            $buttonlabel = get_string('registersite', 'hub', 'Moodle.net');
+            $buttonlabel = get_string('register', 'core_admin');
         }
 
         $this->add_action_buttons(false, $buttonlabel);
diff --git a/lib/classes/lock/db_record_lock_factory.php b/lib/classes/lock/db_record_lock_factory.php
index dd2aa7567747e..c663769a101b6 100644
--- a/lib/classes/lock/db_record_lock_factory.php
+++ b/lib/classes/lock/db_record_lock_factory.php
@@ -120,15 +120,17 @@ public function get_lock($resource, $timeout, $maxlifetime = 86400) {
         $giveuptime = $now + $timeout;
         $expires = $now + $maxlifetime;
 
-        if (!$this->db->record_exists('lock_db', array('resourcekey' => $resource))) {
+        $resourcekey = $this->type . '_' . $resource;
+
+        if (!$this->db->record_exists('lock_db', array('resourcekey' => $resourcekey))) {
             $record = new \stdClass();
-            $record->resourcekey = $resource;
+            $record->resourcekey = $resourcekey;
             $result = $this->db->insert_record('lock_db', $record);
         }
 
         $params = array('expires' => $expires,
                         'token' => $token,
-                        'resourcekey' => $resource,
+                        'resourcekey' => $resourcekey,
                         'now' => $now);
         $sql = 'UPDATE {lock_db}
                    SET
@@ -143,7 +145,7 @@ public function get_lock($resource, $timeout, $maxlifetime = 86400) {
             $params['now'] = $now;
             $this->db->execute($sql, $params);
 
-            $countparams = array('owner' => $token, 'resourcekey' => $resource);
+            $countparams = array('owner' => $token, 'resourcekey' => $resourcekey);
             $result = $this->db->count_records('lock_db', $countparams);
             $locked = $result === 1;
             if (!$locked && $timeout > 0) {
diff --git a/lib/classes/lock/lock_config.php b/lib/classes/lock/lock_config.php
index 06fddf4038670..31f3082e46600 100644
--- a/lib/classes/lock/lock_config.php
+++ b/lib/classes/lock/lock_config.php
@@ -38,18 +38,17 @@
 class lock_config {
 
     /**
-     * Get an instance of the currently configured locking subclass.
+     * Get the currently configured locking subclass.
      *
-     * @param string $type - Unique namespace for the locks generated by this factory. e.g. core_cron
-     * @return \core\lock\lock_factory
+     * @return string class name
      * @throws \coding_exception
      */
-    public static function get_lock_factory($type) {
+    public static function get_lock_factory_class(): string {
+
         global $CFG, $DB;
-        $lockfactory = null;
 
         if (during_initial_install()) {
-            $lockfactory = new \core\lock\installation_lock_factory($type);
+            $lockfactoryclass = '\core\lock\installation_lock_factory';
         } else if (isset($CFG->lock_factory) && $CFG->lock_factory != 'auto') {
             if (!class_exists($CFG->lock_factory)) {
                 // In this case I guess it is not safe to continue. Different cluster nodes could end up using different locking
@@ -57,7 +56,6 @@ public static function get_lock_factory($type) {
                 throw new \coding_exception('Lock factory set in $CFG does not exist: ' . $CFG->lock_factory);
             }
             $lockfactoryclass = $CFG->lock_factory;
-            $lockfactory = new $lockfactoryclass($type);
         } else {
             $dbtype = clean_param($DB->get_dbfamily(), PARAM_ALPHA);
 
@@ -66,14 +64,31 @@ public static function get_lock_factory($type) {
             if (!class_exists($lockfactoryclass)) {
                 $lockfactoryclass = '\core\lock\file_lock_factory';
             }
-            /* @var lock_factory $lockfactory */
-            $lockfactory = new $lockfactoryclass($type);
+
+            // Test if the auto chosen lock factory is available.
+            $lockfactory = new $lockfactoryclass('test');
             if (!$lockfactory->is_available()) {
                 // Final fallback - DB row locking.
-                $lockfactory = new \core\lock\db_record_lock_factory($type);
+                $lockfactoryclass = '\core\lock\db_record_lock_factory';
             }
         }
 
+        return $lockfactoryclass;
+    }
+
+    /**
+     * Get an instance of the currently configured locking subclass.
+     *
+     * @param string $type - Unique namespace for the locks generated by this factory. e.g. core_cron
+     * @return \core\lock\lock_factory
+     * @throws \coding_exception
+     */
+    public static function get_lock_factory(string $type): \core\lock\lock_factory {
+        $lockfactoryclass = self::get_lock_factory_class();
+        $lockfactory = new $lockfactoryclass($type);
+        if (!$lockfactory->is_available()) {
+            throw new \coding_exception("Lock factory class $lockfactoryclass is not available.");
+        }
         return $lockfactory;
     }
 
diff --git a/lib/classes/lock/postgres_lock_factory.php b/lib/classes/lock/postgres_lock_factory.php
index 87ae64b9e8c77..de1be0815bf39 100644
--- a/lib/classes/lock/postgres_lock_factory.php
+++ b/lib/classes/lock/postgres_lock_factory.php
@@ -178,7 +178,7 @@ protected function get_index_from_key($key) {
     public function get_lock($resource, $timeout, $maxlifetime = 86400) {
         $giveuptime = time() + $timeout;
 
-        $token = $this->get_index_from_key($resource);
+        $token = $this->get_index_from_key($this->type . '_' . $resource);
 
         $params = array('locktype' => $this->dblockid,
                         'token' => $token);
diff --git a/lib/classes/message/manager.php b/lib/classes/message/manager.php
index 66744b1f5f513..0a26e592830a7 100644
--- a/lib/classes/message/manager.php
+++ b/lib/classes/message/manager.php
@@ -331,15 +331,14 @@ public static function send_message(message $eventdata, \stdClass $savemessage,
             // Trigger event for sending a message or notification - we need to do this before marking as read!
             self::trigger_message_events($eventdata, $savemessage);
 
-            if ($eventdata->notification or empty($CFG->messaging)) {
-                // If they have deselected all processors and its a notification mark it read. The user doesn't want to be bothered.
-                // The same goes if the messaging is completely disabled.
-                if ($eventdata->notification) {
-                    $savemessage->timeread = null;
-                    \core_message\api::mark_notification_as_read($savemessage);
-                } else {
-                    \core_message\api::mark_message_as_read($eventdata->userto->id, $savemessage);
-                }
+            if ($eventdata->notification) {
+                // If they have deselected all processors and it's a notification mark it read. The user doesn't want to be
+                // bothered.
+                $savemessage->timeread = null;
+                \core_message\api::mark_notification_as_read($savemessage);
+            } else if (empty($CFG->messaging)) {
+                // If it's a message and messaging is disabled mark it read.
+                \core_message\api::mark_message_as_read($eventdata->userto->id, $savemessage);
             }
 
             return $savemessage->id;
@@ -383,15 +382,9 @@ protected static function send_message_to_processors($eventdata, \stdClass $save
         // Trigger event for sending a message or notification - we need to do this before marking as read!
         self::trigger_message_events($eventdata, $savemessage);
 
-        if (empty($CFG->messaging)) {
-            // If they have deselected all processors and its a notification mark it read. The user doesn't want to be bothered.
-            // The same goes if the messaging is completely disabled.
-            if ($eventdata->notification) {
-                $savemessage->timeread = null;
-                \core_message\api::mark_notification_as_read($savemessage);
-            } else {
-                \core_message\api::mark_message_as_read($eventdata->userto->id, $savemessage);
-            }
+        if (!$eventdata->notification && empty($CFG->messaging)) {
+            // If it's a message and messaging is disabled mark it read.
+            \core_message\api::mark_message_as_read($eventdata->userto->id, $savemessage);
         }
 
         return $savemessage->id;
diff --git a/lib/classes/output/mustache_engine.php b/lib/classes/output/mustache_engine.php
new file mode 100644
index 0000000000000..4dd2b9056fc8d
--- /dev/null
+++ b/lib/classes/output/mustache_engine.php
@@ -0,0 +1,77 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Custom Moodle engine for mustache.
+ *
+ * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core\output;
+
+/**
+ * Custom Moodle engine for mustache.
+ *
+ * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mustache_engine extends \Mustache_Engine {
+    /**
+     * @var mustache_helper_collection
+     */
+    private $helpers;
+
+    /**
+     * @var string[] Names of helpers that aren't allowed to be called within other helpers.
+     */
+    private $blacklistednestedhelpers = [];
+
+    /**
+     * Mustache engine constructor.
+     *
+     * This provides an additional option to the parent \Mustache_Engine implementation:
+     * $options = [
+     *      // A list of helpers (by name) to prevent from executing within the rendering
+     *      // of other helpers.
+     *      'blacklistednestedhelpers' => ['js']
+     * ];
+     * @param array $options [description]
+     */
+    public function __construct(array $options = []) {
+        if (isset($options['blacklistednestedhelpers'])) {
+            $this->blacklistednestedhelpers = $options['blacklistednestedhelpers'];
+        }
+
+        parent::__construct($options);
+    }
+
+    /**
+     * Get the current set of Mustache helpers.
+     *
+     * @see Mustache_Engine::setHelpers
+     *
+     * @return \Mustache_HelperCollection
+     */
+    public function getHelpers()
+    {
+        if (!isset($this->helpers)) {
+            $this->helpers = new mustache_helper_collection(null, $this->blacklistednestedhelpers);
+        }
+
+        return $this->helpers;
+    }
+}
diff --git a/lib/classes/output/mustache_helper_collection.php b/lib/classes/output/mustache_helper_collection.php
new file mode 100644
index 0000000000000..233d7412380fe
--- /dev/null
+++ b/lib/classes/output/mustache_helper_collection.php
@@ -0,0 +1,176 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Custom Moodle helper collection for mustache.
+ *
+ * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core\output;
+
+/**
+ * Custom Moodle helper collection for mustache.
+ *
+ * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mustache_helper_collection extends \Mustache_HelperCollection {
+
+    /**
+     * @var string[] Names of helpers that aren't allowed to be called within other helpers.
+     */
+    private $blacklistednestedhelpers = [];
+
+    /**
+     * Helper Collection constructor.
+     *
+     * Optionally accepts an array (or Traversable) of `$name => $helper` pairs.
+     *
+     * @throws \Mustache_Exception_InvalidArgumentException if the $helpers argument isn't an array or Traversable
+     *
+     * @param array|\Traversable $helpers (default: null)
+     * @param string[] $blacklistednestedhelpers Names of helpers that aren't allowed to be called within other helpers.
+     */
+    public function __construct($helpers = null, array $blacklistednestedhelpers = []) {
+        $this->blacklistednestedhelpers = $blacklistednestedhelpers;
+        parent::__construct($helpers);
+    }
+
+    /**
+     * Add a helper to this collection.
+     *
+     * This function has overridden the parent implementation to provide blacklist
+     * functionality for certain helpers to prevent them being called from within
+     * other helpers. This is because the JavaScript helper can be used in a
+     * security exploit if it can be nested.
+     *
+     * The function will wrap callable helpers in an anonymous function that strips
+     * out the blacklisted helpers from the source string before giving it to the
+     * helper function. This prevents the blacklisted helper functions from being
+     * called by nested render functions from within other helpers.
+     *
+     * @see \Mustache_HelperCollection::add()
+     * @param string $name
+     * @param mixed  $helper
+     */
+    public function add($name, $helper)
+    {
+        $blacklist = $this->blacklistednestedhelpers;
+
+        if (is_callable($helper) && !empty($blacklist)) {
+            $helper = function($source, \Mustache_LambdaHelper $lambdahelper) use ($helper, $blacklist) {
+
+                // Temporarily override the blacklisted helpers to return nothing
+                // so that they can't be executed from within other helpers.
+                $disabledhelpers = $this->disable_helpers($blacklist);
+                // Call the original function with the modified sources.
+                $result = call_user_func($helper, $source, $lambdahelper);
+                // Restore the original blacklisted helper implementations now
+                // that this helper has finished executing so that the rest of
+                // the rendering process continues to work correctly.
+                $this->restore_helpers($disabledhelpers);
+                // Lastly parse the returned string to strip out any unwanted helper
+                // tags that were added through variable substitution (or other means).
+                // This is done because a secondary render is called on the result
+                // of a helper function if it still includes mustache tags. See
+                // the section function of Mustache_Compiler for details.
+                return $this->strip_blacklisted_helpers($blacklist, $result);
+            };
+        }
+
+        parent::add($name, $helper);
+    }
+
+    /**
+     * Disable a list of helpers (by name) by changing their implementation to
+     * simply return an empty string.
+     *
+     * @param  string[] $names List of helper names to disable
+     * @return \Closure[] The original helper functions indexed by name
+     */
+    private function disable_helpers($names) {
+        $disabledhelpers = [];
+
+        foreach ($names as $name) {
+            if ($this->has($name)) {
+                $function = $this->get($name);
+                // Null out the helper. Must call parent::add here to avoid
+                // a recursion problem.
+                parent::add($name, function() {
+                    return '';
+                });
+
+                $disabledhelpers[$name] = $function;
+            }
+        }
+
+        return $disabledhelpers;
+    }
+
+    /**
+     * Restore the original helper implementations. Typically used after disabling
+     * a helper.
+     *
+     * @param  \Closure[] $helpers The helper functions indexed by name
+     */
+    private function restore_helpers($helpers) {
+        foreach ($helpers as $name => $function) {
+            // Restore the helper functions. Must call parent::add here to avoid
+            // a recursion problem.
+            parent::add($name, $function);
+        }
+    }
+
+    /**
+     * Parse the given string and remove any reference to blacklisted helpers.
+     *
+     * E.g.
+     * $blacklist = ['js'];
+     * $string = "core, move, {{#js}} some nasty JS hack {{/js}}"
+     * result: "core, move, {{}}"
+     *
+     * @param  string[] $blacklist List of helper names to strip
+     * @param  string $string String to parse
+     * @return string Parsed string
+     */
+    public function strip_blacklisted_helpers($blacklist, $string) {
+        $starttoken = \Mustache_Tokenizer::T_SECTION;
+        $endtoken = \Mustache_Tokenizer::T_END_SECTION;
+        if ($endtoken == '/') {
+            $endtoken = '\/';
+        }
+
+        $regexes = array_map(function($name) use ($starttoken, $endtoken) {
+            // We only strip out the name of the helper (excluding delimiters)
+            // the user is able to change the delimeters on a per template
+            // basis so they may not be curly braces.
+            return '/\s*' . $starttoken . '\s*'. $name . '\W+.*' . $endtoken . '\s*' . $name . '\s*/';
+        }, $blacklist);
+
+        // This will strip out unwanted helpers from the $source string
+        // before providing it to the original helper function.
+        // E.g.
+        // Before:
+        // "core, move, {{#js}} some nasty JS hack {{/js}}"
+        // After:
+        // "core, move, {{}}"
+        return preg_replace_callback($regexes, function() {
+            return '';
+        }, $string);
+    }
+}
diff --git a/lib/classes/output/mustache_template_source_loader.php b/lib/classes/output/mustache_template_source_loader.php
index 22cde76a94cfe..e340326acd5ea 100644
--- a/lib/classes/output/mustache_template_source_loader.php
+++ b/lib/classes/output/mustache_template_source_loader.php
@@ -158,7 +158,7 @@ public function load_with_dependencies(
         // Get the requested template source.
         $templatesource = $this->load($templatecomponent, $templatename, $themename, $includecomments);
         // This is a helper function to save a value in one of the result arrays (either $templates or $strings).
-        $save = function(array $results, array $seenlist, string $component, string $id, $value) {
+        $save = function(array $results, array $seenlist, string $component, string $id, $value) use ($lang) {
             if (!isset($results[$component])) {
                 // If the results list doesn't already contain this component then initialise it.
                 $results[$component] = [];
@@ -173,7 +173,7 @@ public function load_with_dependencies(
         };
         // This is a helper function for processing a dependency. Does stuff like ignore duplicate processing,
         // common result formatting etc.
-        $handler = function(array $dependency, array $ignorelist, callable $processcallback) {
+        $handler = function(array $dependency, array $ignorelist, callable $processcallback) use ($lang) {
             foreach ($dependency as $component => $ids) {
                 foreach ($ids as $id) {
                     $dependencyid = "$component/$id";
@@ -223,7 +223,8 @@ function($component, $id) use (
                 &$seenstrings,
                 &$templates,
                 &$strings,
-                $save
+                $save,
+                $lang
             ) {
                 // We haven't seen this template yet so load it and it's dependencies.
                 $subdependencies = $this->load_with_dependencies(
@@ -232,7 +233,8 @@ function($component, $id) use (
                     $themename,
                     $includecomments,
                     $seentemplates,
-                    $seenstrings
+                    $seenstrings,
+                    $lang
                 );
 
                 foreach ($subdependencies['templates'] as $component => $ids) {
diff --git a/lib/classes/session/manager.php b/lib/classes/session/manager.php
index 6c0e171e50676..caf443aa61661 100644
--- a/lib/classes/session/manager.php
+++ b/lib/classes/session/manager.php
@@ -292,7 +292,27 @@ protected static function prepare_cookies() {
 
         // Set configuration.
         session_name($sessionname);
-        session_set_cookie_params(0, $CFG->sessioncookiepath, $CFG->sessioncookiedomain, $cookiesecure, $CFG->cookiehttponly);
+
+        if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
+            $sessionoptions = [
+                'lifetime' => 0,
+                'path' => $CFG->sessioncookiepath,
+                'domain' => $CFG->sessioncookiedomain,
+                'secure' => $cookiesecure,
+                'httponly' => $CFG->cookiehttponly,
+            ];
+
+            if (self::should_use_samesite_none()) {
+                // If $samesite is empty, we don't want there to be any SameSite attribute.
+                $sessionoptions['samesite'] = 'None';
+            }
+
+            session_set_cookie_params($sessionoptions);
+        } else {
+            // Once PHP 7.3 becomes our minimum, drop this in favour of the alternative call to session_set_cookie_params above,
+            // as that does not require a hack to work with same site settings on cookies.
+            session_set_cookie_params(0, $CFG->sessioncookiepath, $CFG->sessioncookiedomain, $cookiesecure, $CFG->cookiehttponly);
+        }
         ini_set('session.use_trans_sid', '0');
         ini_set('session.use_only_cookies', '1');
         ini_set('session.hash_function', '0');        // For now MD5 - we do not have room for sha-1 in sessions table.
@@ -452,6 +472,8 @@ protected static function initialise_user_session($newsid) {
         if ($timedout) {
             $_SESSION['SESSION']->has_timed_out = true;
         }
+
+        self::append_samesite_cookie_attribute();
     }
 
     /**
@@ -519,6 +541,61 @@ public static function login_user(\stdClass $user) {
 
         // Setup $USER object.
         self::set_user($user);
+        self::append_samesite_cookie_attribute();
+    }
+
+    /**
+     * Returns a valid setting for the SameSite cookie attribute.
+     *
+     * @return string The desired setting for the SameSite attribute on the cookie. Empty string indicates the SameSite attribute
+     * should not be set at all.
+     */
+    private static function should_use_samesite_none(): bool {
+        // We only want None or no attribute at this point. When we have cookie handling compatible with Lax,
+        // we can look at checking a setting.
+
+        // Browser support for none is not consistent yet. There are known issues with Safari, and IE11.
+        // Things are stablising, however as they're not stable yet we will deal specifically with the version of chrome
+        // that introduces a default of lax, setting it to none for the current version of chrome (2 releases before the change).
+        // We also check you are using secure cookies and HTTPS because if you are not running over HTTPS
+        // then setting SameSite=None will cause your session cookie to be rejected.
+        if (\core_useragent::is_chrome() && \core_useragent::check_chrome_version('78') && is_moodle_cookie_secure()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Conditionally append the SameSite attribute to the session cookie if necessary.
+     *
+     * Contains a hack for versions of PHP lower than 7.3 as there is no API built into PHP cookie API
+     * for adding the SameSite setting.
+     *
+     * This won't change the Set-Cookie headers if:
+     *  - PHP 7.3 or higher is being used. That already adds the SameSite attribute without any hacks.
+     *  - If the samesite setting is empty.
+     *  - If the samesite setting is None but the browser is not compatible with that setting.
+     */
+    private static function append_samesite_cookie_attribute() {
+        if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
+            // This hack is only necessary if we weren't able to set the samesite flag via the session_set_cookie_params API.
+            return;
+        }
+
+        if (!self::should_use_samesite_none()) {
+            return;
+        }
+
+        $cookies = headers_list();
+        header_remove('Set-Cookie');
+        $setcookiesession = 'Set-Cookie: ' . session_name() . '=';
+
+        foreach ($cookies as $cookie) {
+            if (strpos($cookie, $setcookiesession) === 0) {
+                $cookie .= '; SameSite=None';
+            }
+            header($cookie, false);
+        }
     }
 
     /**
@@ -555,6 +632,8 @@ public static function terminate_current() {
         self::add_session_record($_SESSION['USER']->id); // Do not use $USER here because it may not be set up yet.
         session_write_close();
         self::$sessionactive = false;
+
+        self::append_samesite_cookie_attribute();
     }
 
     /**
@@ -933,6 +1012,16 @@ public static function loginas($userid, \context $context, $generateevent = true
         if ($generateevent) {
             $event->trigger();
         }
+
+        // Queue migrating the messaging data, if we need to.
+        if (!get_user_preferences('core_message_migrate_data', false, $userid)) {
+            // Check if there are any legacy messages to migrate.
+            if (\core_message\helper::legacy_messages_exist($userid)) {
+                \core_message\task\migrate_message_data::queue_task($userid);
+            } else {
+                set_user_preference('core_message_migrate_data', true, $userid);
+            }
+        }
     }
 
     /**
diff --git a/lib/classes/session/redis.php b/lib/classes/session/redis.php
index a669996e7644d..d4758675de004 100644
--- a/lib/classes/session/redis.php
+++ b/lib/classes/session/redis.php
@@ -199,9 +199,7 @@ public function init() {
                 $logstring = "Failed to connect (try {$counter} out of {$maxnumberofretries}) to redis ";
                 $logstring .= "at {$this->host}:{$this->port}, error returned was: {$e->getMessage()}";
 
-                // @codingStandardsIgnoreStart
-                error_log($logstring);
-                // @codingStandardsIgnoreEnd
+                debugging($logstring);
             }
 
             $counter++;
@@ -211,7 +209,9 @@ public function init() {
         }
 
         // We have exhausted our retries, time to give up.
-        return false;
+        if (isset($logstring)) {
+            throw new RedisException($logstring);
+        }
     }
 
     /**
diff --git a/lib/classes/task/database_logger.php b/lib/classes/task/database_logger.php
index 4aa48853fbd38..4e25171a64723 100644
--- a/lib/classes/task/database_logger.php
+++ b/lib/classes/task/database_logger.php
@@ -163,6 +163,9 @@ public static function delete_task_logs(array $logids) {
             return;
         }
 
-        $DB->delete_records_list('task_log', 'id', $logids);
+        $chunks = array_chunk($logids, 1000);
+        foreach ($chunks as $chunk) {
+            $DB->delete_records_list('task_log', 'id', $chunk);
+        }
     }
 }
diff --git a/lib/classes/task/file_temp_cleanup_task.php b/lib/classes/task/file_temp_cleanup_task.php
index ac3359cda16bc..05bfd5cccbdc1 100644
--- a/lib/classes/task/file_temp_cleanup_task.php
+++ b/lib/classes/task/file_temp_cleanup_task.php
@@ -68,7 +68,7 @@ protected function execute_on($tmpdir) {
         // Now loop through again and remove old files and directories.
         for ($iter->rewind(); $iter->valid(); $iter->next()) {
             $node = $iter->getRealPath();
-            if (!is_readable($node)) {
+            if (!isset($modifieddateobject[$node]) || !is_readable($node)) {
                 continue;
             }
 
diff --git a/lib/classes/task/grade_cron_task.php b/lib/classes/task/grade_cron_task.php
index bfb3777f6817c..60d9f8a22d2ff 100644
--- a/lib/classes/task/grade_cron_task.php
+++ b/lib/classes/task/grade_cron_task.php
@@ -43,6 +43,7 @@ public function get_name() {
      */
     public function execute() {
         global $CFG, $DB;
+        require_once($CFG->libdir . '/gradelib.php');
 
         $now = time();
         $sql = "SELECT i.*
diff --git a/lib/classes/task/manager.php b/lib/classes/task/manager.php
index 87fe34287ac4b..4764174ac9e03 100644
--- a/lib/classes/task/manager.php
+++ b/lib/classes/task/manager.php
@@ -478,18 +478,15 @@ public static function get_all_scheduled_tasks() {
      *
      * @param int $timestart
      * @return \core\task\adhoc_task or null if not found
+     * @throws \moodle_exception
      */
     public static function get_next_adhoc_task($timestart) {
         global $DB;
         $cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
 
-        if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
-            throw new \moodle_exception('locktimeout');
-        }
-
         $where = '(nextruntime IS NULL OR nextruntime < :timestart1)';
         $params = array('timestart1' => $timestart);
-        $records = $DB->get_records_select('task_adhoc', $where, $params);
+        $records = $DB->get_records_select('task_adhoc', $where, $params, 'nextruntime ASC, id ASC');
 
         foreach ($records as $record) {
 
@@ -510,6 +507,13 @@ public static function get_next_adhoc_task($timestart) {
                     continue;
                 }
 
+                // The global cron lock is under the most contention so request it
+                // as late as possible and release it as soon as possible.
+                if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
+                    $lock->release();
+                    throw new \moodle_exception('locktimeout');
+                }
+
                 $task->set_lock($lock);
                 if (!$task->is_blocking()) {
                     $cronlock->release();
@@ -520,8 +524,6 @@ public static function get_next_adhoc_task($timestart) {
             }
         }
 
-        // No tasks.
-        $cronlock->release();
         return null;
     }
 
@@ -532,15 +534,12 @@ public static function get_next_adhoc_task($timestart) {
      *
      * @param int $timestart - The start of the cron process - do not repeat any tasks that have been run more recently than this.
      * @return \core\task\scheduled_task or null
+     * @throws \moodle_exception
      */
     public static function get_next_scheduled_task($timestart) {
         global $DB;
         $cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
 
-        if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
-            throw new \moodle_exception('locktimeout');
-        }
-
         $where = "(lastruntime IS NULL OR lastruntime < :timestart1)
                   AND (nextruntime IS NULL OR nextruntime < :timestart2)
                   AND disabled = 0
@@ -579,6 +578,13 @@ public static function get_next_scheduled_task($timestart) {
                     continue;
                 }
 
+                // The global cron lock is under the most contention so request it
+                // as late as possible and release it as soon as possible.
+                if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
+                    $lock->release();
+                    throw new \moodle_exception('locktimeout');
+                }
+
                 if (!$task->is_blocking()) {
                     $cronlock->release();
                 } else {
@@ -588,8 +594,6 @@ public static function get_next_scheduled_task($timestart) {
             }
         }
 
-        // No tasks.
-        $cronlock->release();
         return null;
     }
 
diff --git a/lib/classes/task/task_log_cleanup_task.php b/lib/classes/task/task_log_cleanup_task.php
index 188171a5efbff..5a6380fc93955 100644
--- a/lib/classes/task/task_log_cleanup_task.php
+++ b/lib/classes/task/task_log_cleanup_task.php
@@ -25,6 +25,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+use core\task\database_logger;
+use core\task\logmanager;
+
 /**
  * A task to cleanup log entries for tasks.
  *
@@ -46,8 +49,9 @@ public function get_name() {
      * Perform the cleanup task.
      */
     public function execute() {
-        if (\core\task\database_logger::class == \core\task\logmanager::get_logger_classname()) {
-            \core\task\database_logger::cleanup();
+        $logger = logmanager::get_logger_classname();
+        if (is_a($logger, database_logger::class, true)) {
+            $logger::cleanup();
         }
     }
 }
diff --git a/lib/clilib.php b/lib/clilib.php
index ba243f1029e9e..c0b908e3921c8 100644
--- a/lib/clilib.php
+++ b/lib/clilib.php
@@ -227,3 +227,59 @@ function cli_logo($padding=2, $return=false) {
         cli_write($logo);
     }
 }
+
+/**
+ * Substitute cursor, colour, and bell placeholders in a CLI output to ANSI escape characters when ANSI is available.
+ *
+ * @param string $message
+ * @return string
+ */
+function cli_ansi_format(string $message): string {
+    global $CFG;
+
+    $replacements = [
+        "<newline>" => "\n",
+        "<bell>" => "\007",
+
+        // Cursor movement: https://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x361.html.
+        "<cursor:save>" => "\033[s",
+        "<cursor:restore>" => "\033[u",
+        "<cursor:up>" => "\033[1A",
+        "<cursor:down>" => "\033[1B",
+        "<cursor:forward>" => "\033[1C",
+        "<cursor:back>" => "\033[1D",
+    ];
+
+    $colours = [
+        'normal' => '0;0',
+        'black' => '0;30',
+        'darkGray' => '1;30',
+        'blue' => '0;34',
+        'lightBlue' => '1;34',
+        'green' => '0;32',
+        'lightGreen' => '1;32',
+        'cyan' => '0;36',
+        'lightCyan' => '1;36',
+        'red' => '0;31',
+        'lightRed' => '1;31',
+        'purple' => '0;35',
+        'lightPurple' => '1;35',
+        'brown' => '0;33',
+        'yellow' => '1;33',
+        'lightYellow' => '0;93',
+        'lightGray' => '0;37',
+        'white' => '1;37',
+    ];
+
+    foreach ($colours as $colour => $code) {
+        $replacements["<colour:{$colour}>"] = "\033[{$code}m";
+    }
+
+    // Windows don't support ANSI code by default, but does if ANSICON is available.
+    $isansicon = getenv('ANSICON');
+    if (($CFG->ostype === 'WINDOWS') && empty($isansicon)) {
+        return str_replace(array_keys($replacements), '', $message);
+    }
+
+    return str_replace(array_keys($replacements), array_values($replacements), $message);
+}
diff --git a/lib/cronlib.php b/lib/cronlib.php
index 8de7602fe3098..cdbb52c89ded1 100644
--- a/lib/cronlib.php
+++ b/lib/cronlib.php
@@ -87,6 +87,7 @@ function cron_run() {
  * Execute all queued scheduled tasks, applying necessary concurrency limits and time limits.
  *
  * @param   int     $timenow The time this process started.
+ * @throws \moodle_exception
  */
 function cron_run_scheduled_tasks(int $timenow) {
     // Allow a restriction on the number of scheduled task runners at once.
@@ -96,7 +97,10 @@ function cron_run_scheduled_tasks(int $timenow) {
 
     $scheduledlock = null;
     for ($run = 0; $run < $maxruns; $run++) {
-        if ($scheduledlock = $cronlockfactory->get_lock("scheduled_task_runner_{$run}", 1)) {
+        // If we can't get a lock instantly it means runner N is already running
+        // so fail as fast as possible and try N+1 so we don't limit the speed at
+        // which we bring new runners into the pool.
+        if ($scheduledlock = $cronlockfactory->get_lock("scheduled_task_runner_{$run}", 0)) {
             break;
         }
     }
@@ -109,25 +113,28 @@ function cron_run_scheduled_tasks(int $timenow) {
     $starttime = time();
 
     // Run all scheduled tasks.
-    while (!\core\task\manager::static_caches_cleared_since($timenow) &&
-            $task = \core\task\manager::get_next_scheduled_task($timenow)) {
-        cron_run_inner_scheduled_task($task);
-        unset($task);
-
-        if ((time() - $starttime) > $maxruntime) {
-            mtrace("Stopping processing of scheduled tasks as time limit has been reached.");
-            break;
+    try {
+        while (!\core\task\manager::static_caches_cleared_since($timenow) &&
+                $task = \core\task\manager::get_next_scheduled_task($timenow)) {
+            cron_run_inner_scheduled_task($task);
+            unset($task);
+
+            if ((time() - $starttime) > $maxruntime) {
+                mtrace("Stopping processing of scheduled tasks as time limit has been reached.");
+                break;
+            }
         }
+    } finally {
+        // Release the scheduled task runner lock.
+        $scheduledlock->release();
     }
-
-    // Release the scheduled task runner lock.
-    $scheduledlock->release();
 }
 
 /**
  * Execute all queued adhoc tasks, applying necessary concurrency limits and time limits.
  *
  * @param   int     $timenow The time this process started.
+ * @throws \moodle_exception
  */
 function cron_run_adhoc_tasks(int $timenow) {
     // Allow a restriction on the number of adhoc task runners at once.
@@ -137,7 +144,10 @@ function cron_run_adhoc_tasks(int $timenow) {
 
     $adhoclock = null;
     for ($run = 0; $run < $maxruns; $run++) {
-        if ($adhoclock = $cronlockfactory->get_lock("adhoc_task_runner_{$run}", 1)) {
+        // If we can't get a lock instantly it means runner N is already running
+        // so fail as fast as possible and try N+1 so we don't limit the speed at
+        // which we bring new runners into the pool.
+        if ($adhoclock = $cronlockfactory->get_lock("adhoc_task_runner_{$run}", 0)) {
             break;
         }
     }
@@ -150,19 +160,21 @@ function cron_run_adhoc_tasks(int $timenow) {
     $starttime = time();
 
     // Run all adhoc tasks.
-    while (!\core\task\manager::static_caches_cleared_since($timenow) &&
-            $task = \core\task\manager::get_next_adhoc_task($timenow)) {
-        cron_run_inner_adhoc_task($task);
-        unset($task);
-
-        if ((time() - $starttime) > $maxruntime) {
-            mtrace("Stopping processing of adhoc tasks as time limit has been reached.");
-            break;
+    try {
+        while (!\core\task\manager::static_caches_cleared_since($timenow) &&
+                $task = \core\task\manager::get_next_adhoc_task(time())) {
+            cron_run_inner_adhoc_task($task);
+            unset($task);
+
+            if ((time() - $starttime) > $maxruntime) {
+                mtrace("Stopping processing of adhoc tasks as time limit has been reached.");
+                break;
+            }
         }
+    } finally {
+        // Release the adhoc task runner lock.
+        $adhoclock->release();
     }
-
-    // Release the adhoc task runner lock.
-    $adhoclock->release();
 }
 
 /**
diff --git a/lib/db/access.php b/lib/db/access.php
index 87d472e92d82b..47a66373dcc75 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -181,20 +181,6 @@
         'clonepermissionsfrom' =>  'moodle/backup:backupcourse'
     ),
 
-    'moodle/backup:backuptargethub' => array(
-
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_COURSE,
-        'archetypes' => array(
-            'editingteacher' => CAP_ALLOW,
-            'manager' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' =>  'moodle/backup:backupcourse'
-    ),
-
     'moodle/backup:backuptargetimport' => array(
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
@@ -311,20 +297,6 @@
         ),
     ),
 
-    'moodle/restore:restoretargethub' => array(
-
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_COURSE,
-        'archetypes' => array(
-            'editingteacher' => CAP_ALLOW,
-            'manager' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' =>  'moodle/restore:restorecourse'
-    ),
-
     'moodle/restore:restoretargetimport' => array(
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
@@ -1178,7 +1150,7 @@
     'moodle/course:viewsuspendedusers' => array(
 
         'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
+        'contextlevel' => CONTEXT_COURSE,
         'archetypes' => array(
             'editingteacher' => CAP_ALLOW,
             'manager' => CAP_ALLOW
@@ -1987,15 +1959,6 @@
             'editingteacher' => CAP_ALLOW,
             'manager' => CAP_ALLOW
         )
-    ),
-     'moodle/course:publish' => array(
-
-        'captype' => 'write',
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
-        'contextlevel' => CONTEXT_SYSTEM,
-        'archetypes' => array(
-            'manager' => CAP_ALLOW
-        )
     ),
     'moodle/course:markcomplete' => array(
         'captype' => 'write',
diff --git a/lib/db/install.php b/lib/db/install.php
index 59cebd4b3ed79..798985e5d519d 100644
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -320,6 +320,6 @@ function xmldb_main_install() {
     make_default_scale();
     make_competence_scale();
 
-    require_once($CFG->libdir . '/badgeslib.php');
+    require_once($CFG->dirroot . '/badges/upgradelib.php'); // Core install and upgrade related functions only for badges.
     badges_install_default_backpacks();
 }
diff --git a/lib/db/install.xml b/lib/db/install.xml
index 7182412c1c0fc..3138e38e5c0fc 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20190501" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20190905" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -4018,6 +4018,7 @@
       </KEYS>
       <INDEXES>
         <INDEX NAME="modelid-action" UNIQUE="false" FIELDS="modelid, action"/>
+        <INDEX NAME="analysableid" UNIQUE="false" FIELDS="analysableid"/>
       </INDEXES>
     </TABLE>
     <TABLE NAME="search_index_requests" COMMENT="Records requests for (re)indexing of specific contexts. Entries will be removed from this table when indexing of that context is complete. (This table is not used for normal time-based indexing of new content.)">
diff --git a/lib/db/services.php b/lib/db/services.php
index 708f2ccdb80f5..397c45771ec7f 100644
--- a/lib/db/services.php
+++ b/lib/db/services.php
@@ -660,6 +660,14 @@
         'type' => 'write',
         'ajax' => true,
     ),
+    'core_enrol_submit_user_enrolment_form' => array(
+        'classname' => 'core_enrol_external',
+        'methodname' => 'submit_user_enrolment_form',
+        'classpath' => 'enrol/externallib.php',
+        'description' => 'Submit form data for enrolment form',
+        'type' => 'write',
+        'ajax' => true,
+    ),
     'core_enrol_unenrol_user_enrolment' => array(
         'classname' => 'core_enrol_external',
         'methodname' => 'unenrol_user_enrolment',
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index c32bcfe994f12..993679dcd8e78 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2028,16 +2028,18 @@ function xmldb_main_upgrade($oldversion) {
 
     if ($oldversion < 2018092800.02) {
         // Delete any contacts that are not mutual (meaning they both haven't added each other).
-        $sql = "SELECT c1.id
-                  FROM {message_contacts} c1
-             LEFT JOIN {message_contacts} c2
-                    ON c1.userid = c2.contactid
-                   AND c1.contactid = c2.userid
-                 WHERE c2.id IS NULL";
-        if ($contacts = $DB->get_records_sql($sql)) {
-            list($insql, $inparams) = $DB->get_in_or_equal(array_keys($contacts));
-            $DB->delete_records_select('message_contacts', "id $insql", $inparams);
-        }
+        do {
+            $sql = "SELECT c1.id
+                      FROM {message_contacts} c1
+                 LEFT JOIN {message_contacts} c2
+                        ON c1.userid = c2.contactid
+                       AND c1.contactid = c2.userid
+                     WHERE c2.id IS NULL";
+            if ($contacts = $DB->get_records_sql($sql, null, 0, 1000)) {
+                list($insql, $inparams) = $DB->get_in_or_equal(array_keys($contacts));
+                $DB->delete_records_select('message_contacts', "id $insql", $inparams);
+            }
+        } while ($contacts);
 
         upgrade_main_savepoint(true, 2018092800.02);
     }
@@ -3361,7 +3363,7 @@ function xmldb_main_upgrade($oldversion) {
         }
 
         // Add default backpacks.
-        require_once($CFG->libdir.'/badgeslib.php'); // Core Upgrade-related functions for badges only.
+        require_once($CFG->dirroot . '/badges/upgradelib.php'); // Core install and upgrade related functions only for badges.
         badges_install_default_backpacks();
 
         // Main savepoint reached.
@@ -3375,5 +3377,140 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2019051300.01);
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    if ($oldversion < 2019052001.04) {
+        // Update the empty tag instructions to null.
+        $instructions = get_config('core', 'auth_instructions');
+
+        if (trim(html_to_text($instructions)) === '') {
+            set_config('auth_instructions', '');
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2019052001.04);
+    }
+
+    if ($oldversion < 2019052001.12) {
+        // Remove unused config.
+        unset_config('enablecoursepublishing');
+        upgrade_main_savepoint(true, 2019052001.12);
+    }
+
+    if ($oldversion < 2019052001.13) {
+        // Delete "orphaned" subscriptions.
+        $sql = "SELECT DISTINCT es.userid
+                  FROM {event_subscriptions} es
+             LEFT JOIN {user} u ON u.id = es.userid
+                 WHERE u.deleted = 1 OR u.id IS NULL";
+        $deletedusers = $DB->get_fieldset_sql($sql);
+        if ($deletedusers) {
+            list($sql, $params) = $DB->get_in_or_equal($deletedusers);
+
+            // Delete orphaned subscriptions.
+            $DB->execute("DELETE FROM {event_subscriptions} WHERE userid " . $sql, $params);
+        }
+
+        upgrade_main_savepoint(true, 2019052001.13);
+    }
+
+    if ($oldversion < 2019052002.01) {
+
+        // Define index analysableid (not unique) to be added to analytics_used_analysables.
+        $table = new xmldb_table('analytics_used_analysables');
+        $index = new xmldb_index('analysableid', XMLDB_INDEX_NOTUNIQUE, ['analysableid']);
+
+        // Conditionally launch add index analysableid.
+        if (!$dbman->index_exists($table, $index)) {
+            $dbman->add_index($table, $index);
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2019052002.01);
+    }
+
+    if ($oldversion < 2019052002.07) {
+        // Rename the official moodle sites directory the site is registered with.
+        $DB->execute("UPDATE {registration_hubs}
+                         SET hubname = ?, huburl = ?
+                       WHERE huburl = ?", ['moodle', 'https://stats.moodle.org', 'https://moodle.net']);
+
+        // Convert the hub site specific settings to the new naming format without the hub URL in the name.
+        $hubconfig = get_config('hub');
+
+        if (!empty($hubconfig)) {
+            foreach (upgrade_convert_hub_config_site_param_names($hubconfig, 'https://moodle.net') as $name => $value) {
+                set_config($name, $value, 'hub');
+            }
+        }
+
+        upgrade_main_savepoint(true, 2019052002.07);
+    }
+
+    if ($oldversion < 2019052003.05) {
+        // Delete any tool_cohortroles mappings for roles which no longer exist.
+        $DB->delete_records_select('tool_cohortroles', "roleid NOT IN (SELECT id FROM {role})");
+
+        // Delete any role assignments for roles which no longer exist.
+        $DB->delete_records_select('role_assignments', "roleid NOT IN (SELECT id FROM {role})");
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2019052003.05);
+    }
+
+
+    if ($oldversion < 2019052004.02) {
+        // Delete all orphaned subscription events.
+        $select = "subscriptionid IS NOT NULL
+                   AND subscriptionid NOT IN (SELECT id from {event_subscriptions})";
+        $DB->delete_records_select('event', $select);
+
+        upgrade_main_savepoint(true, 2019052004.02);
+    }
+
+    if ($oldversion < 2019052004.05) {
+        global $DB;
+        // Delete any associated files.
+        $fs = get_file_storage();
+        $sql = "SELECT cuc.id, cuc.userid
+                  FROM {competency_usercomp} cuc
+             LEFT JOIN {user} u ON cuc.userid = u.id
+                 WHERE u.deleted = 1";
+        $usercompetencies = $DB->get_records_sql($sql);
+        foreach ($usercompetencies as $usercomp) {
+            $DB->delete_records('competency_evidence', ['usercompetencyid' => $usercomp->id]);
+            $DB->delete_records('competency_usercompcourse', ['userid' => $usercomp->userid]);
+            $DB->delete_records('competency_usercompplan', ['userid' => $usercomp->userid]);
+            $DB->delete_records('competency_usercomp', ['userid' => $usercomp->userid]);
+        }
+
+        $sql = "SELECT cue.id, cue.userid
+                  FROM {competency_userevidence} cue
+             LEFT JOIN {user} u ON cue.userid = u.id
+                 WHERE u.deleted = 1";
+        $userevidences = $DB->get_records_sql($sql);
+        foreach ($userevidences as $userevidence) {
+            $DB->delete_records('competency_userevidencecomp', ['userevidenceid' => $userevidence->id]);
+            $DB->delete_records('competency_userevidence', ['id' => $userevidence->id]);
+
+            $context = context_user::instance($userevidence->userid);
+            $fs->delete_area_files($context->id, 'core_competency', 'userevidence', $userevidence->id);
+        }
+
+        $sql = "SELECT cp.id
+                  FROM {competency_plan} cp
+             LEFT JOIN {user} u ON cp.userid = u.id
+                 WHERE u.deleted = 1";
+        $userplans = $DB->get_records_sql($sql);
+        foreach ($userplans as $userplan) {
+            $DB->delete_records('competency_plancomp', ['planid' => $userplan->id]);
+            $DB->delete_records('competency_plan', ['id' => $userplan->id]);
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2019052004.05);
+    }
+
     return true;
 }
diff --git a/lib/db/upgradelib.php b/lib/db/upgradelib.php
index e7e162fb78a37..f7eefbb919c71 100644
--- a/lib/db/upgradelib.php
+++ b/lib/db/upgradelib.php
@@ -350,10 +350,10 @@ function upgrade_course_letter_boundary($courseid = null) {
     }
     $lettercolumnsql = '';
     if ($usergradelettercolumnsetting) {
-        // the system default is to show a column with letters (and the course uses the defaults).
+        // The system default is to show a column with letters (and the course uses the defaults).
         $lettercolumnsql = '(gss.value is NULL OR ' . $DB->sql_compare_text('gss.value') .  ' <> \'0\')';
     } else {
-        // the course displays a column with letters.
+        // The course displays a column with letters.
         $lettercolumnsql = $DB->sql_compare_text('gss.value') .  ' = \'1\'';
     }
 
@@ -566,3 +566,47 @@ function upgrade_delete_orphaned_file_records() {
 
     $DB->delete_records_list('files_reference', 'id', $deletedfileids);
 }
+
+/**
+ * Convert the site settings for the 'hub' component in the config_plugins table.
+ *
+ * @param stdClass $hubconfig Settings loaded for the 'hub' component.
+ * @param string $huburl The URL of the hub to use as the valid one in case of conflict.
+ * @return stdClass List of new settings to be applied (including null values to be unset).
+ */
+function upgrade_convert_hub_config_site_param_names(stdClass $hubconfig, string $huburl): stdClass {
+
+    $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
+    $converted = [];
+
+    foreach ($hubconfig as $oldname => $value) {
+        if (preg_match('/^site_([a-z]+)([A-Za-z0-9_-]*)/', $oldname, $matches)) {
+            $newname = 'site_'.$matches[1];
+
+            if ($oldname === $newname) {
+                // There is an existing value with the new naming convention already.
+                $converted[$newname] = $value;
+
+            } else if (!array_key_exists($newname, $converted)) {
+                // Add the value under a new name and mark the original to be unset.
+                $converted[$newname] = $value;
+                $converted[$oldname] = null;
+
+            } else if ($matches[2] === '_'.$cleanhuburl) {
+                // The new name already exists, overwrite only if coming from the valid hub.
+                $converted[$newname] = $value;
+                $converted[$oldname] = null;
+
+            } else {
+                // Just unset the old value.
+                $converted[$oldname] = null;
+            }
+
+        } else {
+            // Not a hub-specific site setting, just keep it.
+            $converted[$oldname] = $value;
+        }
+    }
+
+    return (object) $converted;
+}
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 5022e29f962f3..e43c610dcb219 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -3678,3 +3678,20 @@ function get_courses_page($categoryid="all", $sort="c.sortorder ASC", $fields="c
     $rs->close();
     return $visiblecourses;
 }
+
+/**
+ * Returns the models that generated insights in the provided context.
+ *
+ * @deprecated since Moodle 3.8 MDL-66091 - please do not use this function any more.
+ * @todo MDL-65799 This will be deleted in Moodle 4.2
+ * @see \core_analytics\manager::cached_models_with_insights
+ * @param  \context $context
+ * @return int[]
+ */
+function report_insights_context_insights(\context $context) {
+
+    debugging('report_insights_context_insights is deprecated. Please use ' .
+        '\core_analytics\manager::cached_models_with_insights instead', DEBUG_DEVELOPER);
+
+    return \core_analytics\manager::cached_models_with_insights($context);
+}
diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index 9e781cd895209..021706be01afd 100644
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -834,7 +834,23 @@ public function get_in_or_equal($items, $type=SQL_PARAMS_QM, $prefix='param', $e
      * @return string The sql with tablenames being prefixed with $CFG->prefix
      */
     protected function fix_table_names($sql) {
-        return preg_replace('/\{([a-z][a-z0-9_]*)\}/', $this->prefix.'$1', $sql);
+        return preg_replace_callback(
+            '/\{([a-z][a-z0-9_]*)\}/',
+            function($matches) {
+                return $this->fix_table_name($matches[1]);
+            },
+            $sql
+        );
+    }
+
+    /**
+     * Adds the prefix to the table name.
+     *
+     * @param string $tablename The table name
+     * @return string The prefixed table name
+     */
+    protected function fix_table_name($tablename) {
+        return $this->prefix . $tablename;
     }
 
     /**
diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index b0a6a70f3445e..8469c0d5003de 100644
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -675,7 +675,8 @@ public function get_tables($usecache=true) {
      */
     public function get_indexes($table) {
         $indexes = array();
-        $sql = "SHOW INDEXES FROM {$this->prefix}$table";
+        $fixedtable = $this->fix_table_name($table);
+        $sql = "SHOW INDEXES FROM $fixedtable";
         $this->query_start($sql, null, SQL_QUERY_AUX);
         $result = $this->mysqli->query($sql);
         try {
@@ -746,7 +747,8 @@ public function get_columns($table, $usecache=true) {
         } else {
             // temporary tables are not in information schema, let's try it the old way
             $result->close();
-            $sql = "SHOW COLUMNS FROM {$this->prefix}$table";
+            $fixedtable = $this->fix_table_name($table);
+            $sql = "SHOW COLUMNS FROM $fixedtable";
             $this->query_start($sql, null, SQL_QUERY_AUX);
             $result = $this->mysqli->query($sql);
             $this->query_end(true);
@@ -1317,8 +1319,8 @@ public function insert_record_raw($table, $params, $returnid=true, $bulk=false,
         $fields = implode(',', array_keys($params));
         $qms    = array_fill(0, count($params), '?');
         $qms    = implode(',', $qms);
-
-        $sql = "INSERT INTO {$this->prefix}$table ($fields) VALUES($qms)";
+        $fixedtable = $this->fix_table_name($table);
+        $sql = "INSERT INTO $fixedtable ($fields) VALUES($qms)";
 
         list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
         $rawsql = $this->emulate_bound_params($sql, $params);
@@ -1483,7 +1485,8 @@ protected function insert_chunk($table, array $chunk, array $columns) {
             }
         }
 
-        $sql = "INSERT INTO {$this->prefix}$table $fieldssql VALUES $valuessql";
+        $fixedtable = $this->fix_table_name($table);
+        $sql = "INSERT INTO $fixedtable $fieldssql VALUES $valuessql";
 
         list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
         $rawsql = $this->emulate_bound_params($sql, $params);
@@ -1547,7 +1550,8 @@ public function update_record_raw($table, $params, $bulk=false) {
         $params[] = $id; // last ? in WHERE condition
 
         $sets = implode(',', $sets);
-        $sql = "UPDATE {$this->prefix}$table SET $sets WHERE id=?";
+        $fixedtable = $this->fix_table_name($table);
+        $sql = "UPDATE $fixedtable SET $sets WHERE id=?";
 
         list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
         $rawsql = $this->emulate_bound_params($sql, $params);
@@ -1621,7 +1625,8 @@ public function set_field_select($table, $newfield, $newvalue, $select, array $p
             $newfield = "$newfield = ?";
             array_unshift($params, $normalised_value);
         }
-        $sql = "UPDATE {$this->prefix}$table SET $newfield $select";
+        $fixedtable = $this->fix_table_name($table);
+        $sql = "UPDATE $fixedtable SET $newfield $select";
         $rawsql = $this->emulate_bound_params($sql, $params);
 
         $this->query_start($sql, $params, SQL_QUERY_UPDATE);
@@ -1644,7 +1649,8 @@ public function delete_records_select($table, $select, array $params=null) {
         if ($select) {
             $select = "WHERE $select";
         }
-        $sql = "DELETE FROM {$this->prefix}$table $select";
+        $fixedtable = $this->fix_table_name($table);
+        $sql = "DELETE FROM $fixedtable $select";
 
         list($sql, $params, $type) = $this->fix_sql_params($sql, $params);
         $rawsql = $this->emulate_bound_params($sql, $params);
@@ -2032,4 +2038,17 @@ public function is_fulltext_search_supported() {
         }
         return false;
     }
+
+    /**
+     * Fixes any table names that clash with reserved words.
+     *
+     * @param string $tablename The table name
+     * @return string The fixed table name
+     */
+    protected function fix_table_name($tablename) {
+        $prefixedtablename = parent::fix_table_name($tablename);
+        // This function quotes the table name if it matches one of the MySQL reserved
+        // words, e.g. groups.
+        return $this->get_manager()->generator->getEncQuoted($prefixedtablename);
+    }
 }
diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
index 97d94905ff9b7..c54384e7cbb25 100644
--- a/lib/dml/pgsql_native_moodle_database.php
+++ b/lib/dml/pgsql_native_moodle_database.php
@@ -187,6 +187,17 @@ public function connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, array $dbop
             throw new dml_connection_exception($dberr);
         }
 
+        if (!empty($this->dboptions['dbpersist'])) {
+            // There are rare situations (such as PHP out of memory errors) when open cursors may
+            // not be closed at the end of a connection. When using persistent connections, the
+            // cursors remain open and 'get in the way' of future connections. To avoid this
+            // problem, close all cursors here.
+            $result = pg_query($this->pgsql, 'CLOSE ALL');
+            if ($result) {
+                pg_free_result($result);
+            }
+        }
+
         if (!empty($this->dboptions['dbhandlesoptions'])) {
             /* We don't trust people who just set the dbhandlesoptions, this code checks up on them.
              * These functions do not talk to the server, they use the client library knowledge to determine state.
@@ -399,7 +410,8 @@ public function get_columns($table, $usecache=true) {
 
         $tablename = $this->prefix.$table;
 
-        $sql = "SELECT a.attnum, a.attname AS field, t.typname AS type, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, d.adsrc
+        $sql = "SELECT a.attnum, a.attname AS field, t.typname AS type, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef,
+                       CASE WHEN a.atthasdef THEN pg_catalog.pg_get_expr(d.adbin, d.adrelid) END AS adsrc
                   FROM pg_catalog.pg_class c
                   JOIN pg_catalog.pg_namespace as ns ON ns.oid = c.relnamespace
                   JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
@@ -842,8 +854,7 @@ public function close_cursor($cursorname) {
      * @return array of objects, or empty array if no records were found
      * @throws dml_exception A DML specific exception is thrown for any errors.
      */
-    public function get_records_sql($sql, array $params=null, $limitfrom=0, $limitnum=0) {
-
+    public function get_records_sql($sql, array $params = null, $limitfrom = 0, $limitnum = 0) {
         list($limitfrom, $limitnum) = $this->normalise_limit_from_num($limitfrom, $limitnum);
 
         if ($limitnum) {
@@ -868,24 +879,19 @@ public function get_records_sql($sql, array $params=null, $limitfrom=0, $limitnu
             }
         }
 
-        $rows = pg_fetch_all($result);
-        pg_free_result($result);
-
-        $return = array();
-        if ($rows) {
-            foreach ($rows as $row) {
-                $id = reset($row);
-                if ($blobs) {
-                    foreach ($blobs as $blob) {
-                        $row[$blob] = ($row[$blob] !== null ? pg_unescape_bytea($row[$blob]) : null);
-                    }
+        $return = [];
+        while ($row = pg_fetch_assoc($result)) {
+            $id = reset($row);
+            if ($blobs) {
+                foreach ($blobs as $blob) {
+                    $row[$blob] = ($row[$blob] !== null ? pg_unescape_bytea($row[$blob]) : null);
                 }
-                if (isset($return[$id])) {
-                    $colname = key($row);
-                    debugging("Did you remember to make the first column something unique in your call to get_records? Duplicate value '$id' found in column '$colname'.", DEBUG_DEVELOPER);
-                }
-                $return[$id] = (object)$row;
             }
+            if (isset($return[$id])) {
+                $colname = key($row);
+                debugging("Did you remember to make the first column something unique in your call to get_records? Duplicate value '$id' found in column '$colname'.", DEBUG_DEVELOPER);
+            }
+            $return[$id] = (object) $row;
         }
 
         return $return;
diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
index 9174f70c60086..a91317dc71d10 100644
--- a/lib/dml/sqlsrv_native_moodle_database.php
+++ b/lib/dml/sqlsrv_native_moodle_database.php
@@ -841,6 +841,30 @@ public function execute($sql, array $params = null) {
         return true;
     }
 
+    /**
+     * Whether the given SQL statement has the ORDER BY clause in the main query.
+     *
+     * @param string $sql the SQL statement
+     * @return bool true if the main query has the ORDER BY clause; otherwise, false.
+     */
+    protected static function has_query_order_by(string $sql) {
+        $sqltoupper = strtoupper($sql);
+        // Fail fast if there is no ORDER BY clause in the original query.
+        if (strpos($sqltoupper, 'ORDER BY') === false) {
+            return false;
+        }
+
+        // Search for an ORDER BY clause in the main query, not in any subquery (not always allowed in MSSQL)
+        // or in clauses like OVER with a window function e.g. ROW_NUMBER() OVER (ORDER BY ...) or RANK() OVER (ORDER BY ...):
+        // use PHP PCRE recursive patterns to remove everything found within round brackets.
+        $mainquery = preg_replace('/\(((?>[^()]+)|(?R))*\)/', '()', $sqltoupper);
+        if (strpos($mainquery, 'ORDER BY') !== false) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Get a number of records as a moodle_recordset using a SQL statement.
      *
@@ -876,9 +900,9 @@ public function get_recordset_sql($sql, array $params = null, $limitfrom = 0, $l
             } else {
                 $needscrollable = false; // Using supported fetch/offset, no need to scroll anymore.
                 $sql = (substr($sql, -1) === ';') ? substr($sql, 0, -1) : $sql;
-                // We need order by to use FETCH/OFFSET.
+                // We need ORDER BY to use FETCH/OFFSET.
                 // Ordering by first column shouldn't break anything if there was no order in the first place.
-                if (!strpos(strtoupper($sql), "ORDER BY")) {
+                if (!self::has_query_order_by($sql)) {
                     $sql .= " ORDER BY 1";
                 }
 
diff --git a/lib/dml/tests/dml_table_test.php b/lib/dml/tests/dml_table_test.php
index 4d3cd8511e541..7ce85d344fe1f 100644
--- a/lib/dml/tests/dml_table_test.php
+++ b/lib/dml/tests/dml_table_test.php
@@ -33,7 +33,6 @@
  * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core\dml\table
- * @covers ::<!public>
  */
 class core_dml_table_testcase extends database_driver_testcase {
 
diff --git a/lib/dml/tests/sqlsrv_native_moodle_database_test.php b/lib/dml/tests/sqlsrv_native_moodle_database_test.php
index 65cd4706e7ada..8736d795b8e3a 100644
--- a/lib/dml/tests/sqlsrv_native_moodle_database_test.php
+++ b/lib/dml/tests/sqlsrv_native_moodle_database_test.php
@@ -134,6 +134,124 @@ public function test_add_no_lock_to_temp_tables($input, $expected) {
         $temptablesproperty->setValue($sqlsrv, null);
         $this->assertEquals($expected, $result);
     }
+
+    /**
+     * Data provider for test_has_query_order_by
+     *
+     * @return array data for test_has_query_order_by
+     */
+    public function has_query_order_by_provider() {
+        // Fixtures taken from https://docs.moodle.org/en/ad-hoc_contributed_reports.
+
+        return [
+            'User with language => FALSE' => [
+                'sql' => <<<EOT
+SELECT username, lang
+  FROM prefix_user
+EOT
+                ,
+                'expectedmainquery' => <<<EOT
+SELECT username, lang
+  FROM prefix_user
+EOT
+                ,
+                'expectedresult' => false
+            ],
+            'List Users with extra info (email) in current course => FALSE' => [
+                'sql' => <<<EOT
+SELECT u.firstname, u.lastname, u.email
+  FROM prefix_role_assignments AS ra
+  JOIN prefix_context AS context ON context.id = ra.contextid AND context.contextlevel = 50
+  JOIN prefix_course AS c ON c.id = context.instanceid AND c.id = %%COURSEID%%
+  JOIN prefix_user AS u ON u.id = ra.userid
+EOT
+                ,
+                'expectedmainquery' => <<<EOT
+SELECT u.firstname, u.lastname, u.email
+  FROM prefix_role_assignments AS ra
+  JOIN prefix_context AS context ON context.id = ra.contextid AND context.contextlevel = 50
+  JOIN prefix_course AS c ON c.id = context.instanceid AND c.id = %%COURSEID%%
+  JOIN prefix_user AS u ON u.id = ra.userid
+EOT
+                ,
+                'expectedresult' => false
+            ],
+            'ROW_NUMBER() OVER (ORDER BY ...) => FALSE (https://github.com/jleyva/moodle-block_configurablereports/issues/120)' => [
+                'sql' => <<<EOT
+SELECT COUNT(*) AS 'Users who have logged in today'
+  FROM (
+         SELECT ROW_NUMBER() OVER(ORDER BY lastaccess DESC) AS Row
+           FROM mdl_user
+          WHERE lastaccess > DATEDIFF(s, '1970-01-01 02:00:00', (SELECT Convert(DateTime, DATEDIFF(DAY, 0, GETDATE()))))
+       ) AS Logins
+EOT
+                ,
+                'expectedmainquery' => <<<EOT
+SELECT COUNT() AS 'Users who have logged in today'
+  FROM () AS Logins
+EOT
+                ,
+                'expectedresult' => false
+            ],
+            'CONTRIB-7725 workaround) => TRUE' => [
+                'sql' => <<<EOT
+SELECT COUNT(*) AS 'Users who have logged in today'
+  FROM (
+         SELECT ROW_NUMBER() OVER(ORDER BY lastaccess DESC) AS Row
+           FROM mdl_user
+          WHERE lastaccess > DATEDIFF(s, '1970-01-01 02:00:00', (SELECT Convert(DateTime, DATEDIFF(DAY, 0, GETDATE()))))
+       ) AS Logins ORDER BY 1
+EOT
+                ,
+                'expectedmainquery' => <<<EOT
+SELECT COUNT() AS 'Users who have logged in today'
+  FROM () AS Logins ORDER BY 1
+EOT
+                ,
+                'expectedresult' => true
+            ],
+            'Enrolment count in each Course => TRUE' => [
+                'sql' => <<<EOT
+  SELECT c.fullname, COUNT(ue.id) AS Enroled
+    FROM prefix_course AS c
+    JOIN prefix_enrol AS en ON en.courseid = c.id
+    JOIN prefix_user_enrolments AS ue ON ue.enrolid = en.id
+GROUP BY c.id
+ORDER BY c.fullname
+EOT
+                ,
+                'expectedmainquery' => <<<EOT
+  SELECT c.fullname, COUNT() AS Enroled
+    FROM prefix_course AS c
+    JOIN prefix_enrol AS en ON en.courseid = c.id
+    JOIN prefix_user_enrolments AS ue ON ue.enrolid = en.id
+GROUP BY c.id
+ORDER BY c.fullname
+EOT
+                ,
+                'expectedresult' => true
+            ],
+        ];
+    }
+
+    /**
+     * Test has_query_order_by
+     *
+     * @dataProvider has_query_order_by_provider
+     * @param string $sql the query
+     * @param string $expectedmainquery the expected main query
+     * @param bool $expectedresult the expected result
+     */
+    public function test_has_query_order_by(string $sql, string $expectedmainquery, bool $expectedresult) {
+        $mainquery = preg_replace('/\(((?>[^()]+)|(?R))*\)/', '()', $sql);
+        $this->assertSame($expectedmainquery, $mainquery);
+
+        // The has_query_order_by static method is protected. Use Reflection to call the method.
+        $method = new ReflectionMethod('sqlsrv_native_moodle_database', 'has_query_order_by');
+        $method->setAccessible(true);
+        $result = $method->invoke(null, $sql);
+        $this->assertSame($expectedresult, $result);
+    }
 }
 
 /**
diff --git a/lib/editor/atto/db/upgrade.php b/lib/editor/atto/db/upgrade.php
index 2d91167ca5c63..7b1f233bd92ca 100644
--- a/lib/editor/atto/db/upgrade.php
+++ b/lib/editor/atto/db/upgrade.php
@@ -100,5 +100,8 @@ function xmldb_editor_atto_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/lang/en/editor_atto.php b/lib/editor/atto/lang/en/editor_atto.php
index ffe8c1691007e..b01fda6b0417c 100644
--- a/lib/editor/atto/lang/en/editor_atto.php
+++ b/lib/editor/atto/lang/en/editor_atto.php
@@ -36,7 +36,7 @@
 $string['subplugintype_atto'] = 'Atto plugin';
 $string['subplugintype_atto_plural'] = 'Atto plugins';
 $string['settings'] = 'Atto toolbar settings';
-$string['taskautosavecleanup'] = 'Delete expired autosave drafts from the database.';
+$string['taskautosavecleanup'] = 'Delete expired autosave drafts';
 $string['textrecovered'] = 'A draft version of this text was automatically restored.';
 $string['toolbarconfig'] = 'Toolbar config';
 $string['toolbarconfig_desc'] = 'The list of plugins and the order they are displayed can be configured here. The configuration consists of groups (one per line) followed by the ordered list of plugins for that group. The group is separated from the plugins with an equals sign and the plugins are separated with commas. The group names must be unique and should indicate what the buttons have in common. Button and group names should not be repeated and may only contain alphanumeric characters.';
diff --git a/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-debug.js b/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-debug.js
index cdf67fada87f4..c8d7bb63bce04 100644
--- a/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-debug.js
+++ b/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-debug.js
@@ -129,8 +129,11 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
 
             // Check for non-empty text.
             if (Y.Lang.trim(node.get('text')) !== '') {
-                foreground = node.getComputedStyle('color');
-                background = node.getComputedStyle('backgroundColor');
+                foreground = Y.Color.fromArray(
+                    this._getComputedBackgroundColor(node, node.getComputedStyle('color')),
+                    Y.Color.TYPES.RGBA
+                );
+                background = Y.Color.fromArray(this._getComputedBackgroundColor(node), Y.Color.TYPES.RGBA);
 
                 lum1 = this._getLuminanceFromCssColor(foreground);
                 lum2 = this._getLuminanceFromCssColor(background);
@@ -239,7 +242,7 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
      * Generate the HTML that lists the found warnings.
      *
      * @method _addWarnings
-     * @param {Node} A Node to append the html to.
+     * @param {Node} list Node to append the html to.
      * @param {String} description Description of this failure.
      * @param {array} nodes An array of failing nodes.
      * @param {boolean} imagewarnings true if the warnings are related to images, false if text.
@@ -309,6 +312,44 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
             b1 = part1(color[2]);
 
         return 0.2126 * r1 + 0.7152 * g1 + 0.0722 * b1;
+    },
+
+    /**
+     * Get the computed RGB converted to full alpha value, considering the node hierarchy.
+     *
+     * @method _getComputedBackgroundColor
+     * @param {Node} node
+     * @param {String} color The initial colour. If not specified, fetches the backgroundColor from the node.
+     * @return {Array} Colour in Array form (RGBA)
+     * @private
+     */
+    _getComputedBackgroundColor: function(node, color) {
+        color = color || node.getComputedStyle('backgroundColor');
+
+        if (color.toLowerCase() === 'transparent') {
+            // Y.Color doesn't handle 'transparent' properly.
+            color = 'rgba(1, 1, 1, 0)';
+        }
+
+        // Convert the colour to its constituent parts in RGBA format, then fetch the alpha.
+        var colorParts = Y.Color.toArray(color);
+        var alpha = colorParts[3];
+
+        if (alpha === 1) {
+            // If the alpha of the background is already 1, then the parent background colour does not change anything.
+            return colorParts;
+        }
+
+        // Fetch the computed background colour of the parent and use it to calculate the RGB of this item.
+        var parentColor = this._getComputedBackgroundColor(node.get('parentNode'));
+        return [
+            // RGB = (alpha * R|G|B) + (1 - alpha * solid parent colour).
+            (1 - alpha) * parentColor[0] + alpha * colorParts[0],
+            (1 - alpha) * parentColor[1] + alpha * colorParts[1],
+            (1 - alpha) * parentColor[2] + alpha * colorParts[2],
+            // We always return a colour with full alpha.
+            1
+        ];
     }
 });
 
diff --git a/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-min.js b/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-min.js
index 294089029df07..e4a9c3bc743d5 100644
--- a/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-min.js
+++ b/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_accessibilitychecker-button",function(e,t){var n="atto_accessibilitychecker";e.namespace("M.atto_accessibilitychecker").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){this.addButton({icon:"e/accessibility_checker",callback:this._displayDialogue})},_displayDialogue:function(){var e=this.getDialogue({headerContent:M.util.get_string("pluginname",n),width:"500px",focusAfterHide:!0});e.set("bodyContent",this._getDialogueContent()).show()},_getDialogueContent:function(){var t=e.Node.create('<div style="word-wrap: break-word;"></div>');return t.append(this._getWarnings()),t.delegate("click",function(e){e.preventDefault();var t=this.get("host"),n=e.currentTarget.getData("sourceNode"),r=this.getDialogue();n?(r.set("focusAfterHide",this.editor).hide(),t.setSelection(t.getSelectionFromNode(n))):r.hide()},"a",this),t},_getWarnings:function(){var t,r=e.Node.create("<div></div>");return t=[],this.editor.all("img").each(function(e){var n=e.getAttribute("alt");(typeof n=="undefined"||n==="")&&e.getAttribute("role")!=="presentation"&&t.push(e)},this),this._addWarnings(r,M.util.get_string("imagesmissingalt",n),t,!0),t=[],this.editor.all("*").each(function(n){var r,i,s,o,u;if(e.Lang.trim(n.get("text"))!==""){r=n.getComputedStyle("color"),i=n.getComputedStyle("backgroundColor"),o=this._getLuminanceFromCssColor(r),u=this._getLuminanceFromCssColor(i),o>u?s=(o+.05)/(u+.05):s=(u+.05)/(o+.05);if(s<=4.5){var a=0,f=!1;for(a=0;a<t.length;a++){if(n.ancestors("*").indexOf(t[a])!==-1){f=!0;break}if(t[a].ancestors("*").indexOf(n)!==-1){t[a]=n,f=!0;break}}f||t.push(n)}}},this),this._addWarnings(r,M.util.get_string("needsmorecontrast",n),t,!1),this.editor.get("text").length>1e3&&!this.editor.one("h3, h4, h5")&&this._addWarnings(r,M.util.get_string("needsmoreheadings",n),[this.editor],!1),t=[],this.editor.all("table").each(function(e){var n=e.one("caption");(n===null||n.get("text").trim()==="")&&t.push(e)},this),this._addWarnings(r,M.util.get_string("tablesmissingcaption",n),t,!1),t=[],this.editor.all("table").each(function(e){var n=e.one("[colspan],[rowspan]");n!==null&&t.push(e)},this),this._addWarnings(r,M.util.get_string("tableswithmergedcells",n),t,!1),t=[],this.editor.all("table").each(function(e){if(e.one("tr").one("td"))e.all("tr").some(function(n){var r=n.one("th");return!r||r.get("text").trim()===""?(t.push(e),!0):!1},this);else{var n=!1;e.one("tr").all("th").some(function(r){return n=!0,r.get("text").trim()===""?(t.push(e),!0):!1}),n||t.push(e)}},this),this._addWarnings(r,M.util.get_string("tablesmissingheaders",n),t,!1),r.hasChildNodes()||r.append("<p>"+M.util.get_string("nowarnings",n)+"</p>"),r},_addWarnings:function(t,r,i,s){var o,u,a,f,l,c,h,p;if(i.length>0){o=e.Node.create("<p>"+r+"</p>"),u=e.Node.create('<ol class="accessibilitywarnings"></ol>'),a=0;for(a=0;a<i.length;a++)c=e.Node.create("<li></li>"),s?(f=i[a].getAttribute("src"),h=e.Node.create('<a href="#"><img src="'+f+'" /> '+f+"</a>")):(l="innerText"in i[a]?"innerText":"textContent",p=i[a].get(l).trim(),p===""&&(p=M.util.get_string("emptytext",n)),i[a]===this.editor&&(p=M.util.get_string("entiredocument",n)),h=e.Node.create('<a href="#">'+p+"</a>")),h.setData("sourceNode",i[a]),c.append(h),u.append(c);o.append(u),t.append(o)}},_getLuminanceFromCssColor:function(t){var n;t==="transparent"&&(t="#ffffff"),n=e.Color.toArray(e.Color.toRGB(t));var r=function(e){return e=parseInt(e,10)/255,e<=.03928?e/=12.92:e=Math.pow((e+.055)/1.055,2.4),e},i=r(n[0]),s=r(n[1]),o=r(n[2]);return.2126*i+.7152*s+.0722*o}})},"@VERSION@",{requires:["color-base","moodle-editor_atto-plugin"]});
+YUI.add("moodle-atto_accessibilitychecker-button",function(e,t){var n="atto_accessibilitychecker";e.namespace("M.atto_accessibilitychecker").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{initializer:function(){this.addButton({icon:"e/accessibility_checker",callback:this._displayDialogue})},_displayDialogue:function(){var e=this.getDialogue({headerContent:M.util.get_string("pluginname",n),width:"500px",focusAfterHide:!0});e.set("bodyContent",this._getDialogueContent()).show()},_getDialogueContent:function(){var t=e.Node.create('<div style="word-wrap: break-word;"></div>');return t.append(this._getWarnings()),t.delegate("click",function(e){e.preventDefault();var t=this.get("host"),n=e.currentTarget.getData("sourceNode"),r=this.getDialogue();n?(r.set("focusAfterHide",this.editor).hide(),t.setSelection(t.getSelectionFromNode(n))):r.hide()},"a",this),t},_getWarnings:function(){var t,r=e.Node.create("<div></div>");return t=[],this.editor.all("img").each(function(e){var n=e.getAttribute("alt");(typeof n=="undefined"||n==="")&&e.getAttribute("role")!=="presentation"&&t.push(e)},this),this._addWarnings(r,M.util.get_string("imagesmissingalt",n),t,!0),t=[],this.editor.all("*").each(function(n){var r,i,s,o,u;if(e.Lang.trim(n.get("text"))!==""){r=e.Color.fromArray(this._getComputedBackgroundColor(n,n.getComputedStyle("color")),e.Color.TYPES.RGBA),i=e.Color.fromArray(this._getComputedBackgroundColor(n),e.Color.TYPES.RGBA),o=this._getLuminanceFromCssColor(r),u=this._getLuminanceFromCssColor(i),o>u?s=(o+.05)/(u+.05):s=(u+.05)/(o+.05);if(s<=4.5){var a=0,f=!1;for(a=0;a<t.length;a++){if(n.ancestors("*").indexOf(t[a])!==-1){f=!0;break}if(t[a].ancestors("*").indexOf(n)!==-1){t[a]=n,f=!0;break}}f||t.push(n)}}},this),this._addWarnings(r,M.util.get_string("needsmorecontrast",n),t,!1),this.editor.get("text").length>1e3&&!this.editor.one("h3, h4, h5")&&this._addWarnings(r,M.util.get_string("needsmoreheadings",n),[this.editor],!1),t=[],this.editor.all("table").each(function(e){var n=e.one("caption");(n===null||n.get("text").trim()==="")&&t.push(e)},this),this._addWarnings(r,M.util.get_string("tablesmissingcaption",n),t,!1),t=[],this.editor.all("table").each(function(e){var n=e.one("[colspan],[rowspan]");n!==null&&t.push(e)},this),this._addWarnings(r,M.util.get_string("tableswithmergedcells",n),t,!1),t=[],this.editor.all("table").each(function(e){if(e.one("tr").one("td"))e.all("tr").some(function(n){var r=n.one("th");return!r||r.get("text").trim()===""?(t.push(e),!0):!1},this);else{var n=!1;e.one("tr").all("th").some(function(r){return n=!0,r.get("text").trim()===""?(t.push(e),!0):!1}),n||t.push(e)}},this),this._addWarnings(r,M.util.get_string("tablesmissingheaders",n),t,!1),r.hasChildNodes()||r.append("<p>"+M.util.get_string("nowarnings",n)+"</p>"),r},_addWarnings:function(t,r,i,s){var o,u,a,f,l,c,h,p;if(i.length>0){o=e.Node.create("<p>"+r+"</p>"),u=e.Node.create('<ol class="accessibilitywarnings"></ol>'),a=0;for(a=0;a<i.length;a++)c=e.Node.create("<li></li>"),s?(f=i[a].getAttribute("src"),h=e.Node.create('<a href="#"><img src="'+f+'" /> '+f+"</a>")):(l="innerText"in i[a]?"innerText":"textContent",p=i[a].get(l).trim(),p===""&&(p=M.util.get_string("emptytext",n)),i[a]===this.editor&&(p=M.util.get_string("entiredocument",n)),h=e.Node.create('<a href="#">'+p+"</a>")),h.setData("sourceNode",i[a]),c.append(h),u.append(c);o.append(u),t.append(o)}},_getLuminanceFromCssColor:function(t){var n;t==="transparent"&&(t="#ffffff"),n=e.Color.toArray(e.Color.toRGB(t));var r=function(e){return e=parseInt(e,10)/255,e<=.03928?e/=12.92:e=Math.pow((e+.055)/1.055,2.4),e},i=r(n[0]),s=r(n[1]),o=r(n[2]);return.2126*i+.7152*s+.0722*o},_getComputedBackgroundColor:function(t,n){n=n||t.getComputedStyle("backgroundColor"),n.toLowerCase()==="transparent"&&(n="rgba(1, 1, 1, 0)");var r=e.Color.toArray(n),i=r[3];if(i===1)return r;var s=this._getComputedBackgroundColor(t.get("parentNode"));return[(1-i)*s[0]+i*r[0],(1-i)*s[1]+i*r[1],(1-i)*s[2]+i*r[2],1]}})},"@VERSION@",{requires:["color-base","moodle-editor_atto-plugin"]});
diff --git a/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button.js b/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button.js
index 7c149988df88a..89d365cda5bc9 100644
--- a/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button.js
+++ b/lib/editor/atto/plugins/accessibilitychecker/yui/build/moodle-atto_accessibilitychecker-button/moodle-atto_accessibilitychecker-button.js
@@ -129,8 +129,11 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
 
             // Check for non-empty text.
             if (Y.Lang.trim(node.get('text')) !== '') {
-                foreground = node.getComputedStyle('color');
-                background = node.getComputedStyle('backgroundColor');
+                foreground = Y.Color.fromArray(
+                    this._getComputedBackgroundColor(node, node.getComputedStyle('color')),
+                    Y.Color.TYPES.RGBA
+                );
+                background = Y.Color.fromArray(this._getComputedBackgroundColor(node), Y.Color.TYPES.RGBA);
 
                 lum1 = this._getLuminanceFromCssColor(foreground);
                 lum2 = this._getLuminanceFromCssColor(background);
@@ -234,7 +237,7 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
      * Generate the HTML that lists the found warnings.
      *
      * @method _addWarnings
-     * @param {Node} A Node to append the html to.
+     * @param {Node} list Node to append the html to.
      * @param {String} description Description of this failure.
      * @param {array} nodes An array of failing nodes.
      * @param {boolean} imagewarnings true if the warnings are related to images, false if text.
@@ -304,6 +307,44 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
             b1 = part1(color[2]);
 
         return 0.2126 * r1 + 0.7152 * g1 + 0.0722 * b1;
+    },
+
+    /**
+     * Get the computed RGB converted to full alpha value, considering the node hierarchy.
+     *
+     * @method _getComputedBackgroundColor
+     * @param {Node} node
+     * @param {String} color The initial colour. If not specified, fetches the backgroundColor from the node.
+     * @return {Array} Colour in Array form (RGBA)
+     * @private
+     */
+    _getComputedBackgroundColor: function(node, color) {
+        color = color || node.getComputedStyle('backgroundColor');
+
+        if (color.toLowerCase() === 'transparent') {
+            // Y.Color doesn't handle 'transparent' properly.
+            color = 'rgba(1, 1, 1, 0)';
+        }
+
+        // Convert the colour to its constituent parts in RGBA format, then fetch the alpha.
+        var colorParts = Y.Color.toArray(color);
+        var alpha = colorParts[3];
+
+        if (alpha === 1) {
+            // If the alpha of the background is already 1, then the parent background colour does not change anything.
+            return colorParts;
+        }
+
+        // Fetch the computed background colour of the parent and use it to calculate the RGB of this item.
+        var parentColor = this._getComputedBackgroundColor(node.get('parentNode'));
+        return [
+            // RGB = (alpha * R|G|B) + (1 - alpha * solid parent colour).
+            (1 - alpha) * parentColor[0] + alpha * colorParts[0],
+            (1 - alpha) * parentColor[1] + alpha * colorParts[1],
+            (1 - alpha) * parentColor[2] + alpha * colorParts[2],
+            // We always return a colour with full alpha.
+            1
+        ];
     }
 });
 
diff --git a/lib/editor/atto/plugins/accessibilitychecker/yui/src/button/js/button.js b/lib/editor/atto/plugins/accessibilitychecker/yui/src/button/js/button.js
index 1634ac7649aa6..ce6a4e20212a0 100644
--- a/lib/editor/atto/plugins/accessibilitychecker/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/accessibilitychecker/yui/src/button/js/button.js
@@ -127,8 +127,11 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
 
             // Check for non-empty text.
             if (Y.Lang.trim(node.get('text')) !== '') {
-                foreground = node.getComputedStyle('color');
-                background = node.getComputedStyle('backgroundColor');
+                foreground = Y.Color.fromArray(
+                    this._getComputedBackgroundColor(node, node.getComputedStyle('color')),
+                    Y.Color.TYPES.RGBA
+                );
+                background = Y.Color.fromArray(this._getComputedBackgroundColor(node), Y.Color.TYPES.RGBA);
 
                 lum1 = this._getLuminanceFromCssColor(foreground);
                 lum2 = this._getLuminanceFromCssColor(background);
@@ -237,7 +240,7 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
      * Generate the HTML that lists the found warnings.
      *
      * @method _addWarnings
-     * @param {Node} A Node to append the html to.
+     * @param {Node} list Node to append the html to.
      * @param {String} description Description of this failure.
      * @param {array} nodes An array of failing nodes.
      * @param {boolean} imagewarnings true if the warnings are related to images, false if text.
@@ -307,5 +310,43 @@ Y.namespace('M.atto_accessibilitychecker').Button = Y.Base.create('button', Y.M.
             b1 = part1(color[2]);
 
         return 0.2126 * r1 + 0.7152 * g1 + 0.0722 * b1;
+    },
+
+    /**
+     * Get the computed RGB converted to full alpha value, considering the node hierarchy.
+     *
+     * @method _getComputedBackgroundColor
+     * @param {Node} node
+     * @param {String} color The initial colour. If not specified, fetches the backgroundColor from the node.
+     * @return {Array} Colour in Array form (RGBA)
+     * @private
+     */
+    _getComputedBackgroundColor: function(node, color) {
+        color = color || node.getComputedStyle('backgroundColor');
+
+        if (color.toLowerCase() === 'transparent') {
+            // Y.Color doesn't handle 'transparent' properly.
+            color = 'rgba(1, 1, 1, 0)';
+        }
+
+        // Convert the colour to its constituent parts in RGBA format, then fetch the alpha.
+        var colorParts = Y.Color.toArray(color);
+        var alpha = colorParts[3];
+
+        if (alpha === 1) {
+            // If the alpha of the background is already 1, then the parent background colour does not change anything.
+            return colorParts;
+        }
+
+        // Fetch the computed background colour of the parent and use it to calculate the RGB of this item.
+        var parentColor = this._getComputedBackgroundColor(node.get('parentNode'));
+        return [
+            // RGB = (alpha * R|G|B) + (1 - alpha * solid parent colour).
+            (1 - alpha) * parentColor[0] + alpha * colorParts[0],
+            (1 - alpha) * parentColor[1] + alpha * colorParts[1],
+            (1 - alpha) * parentColor[2] + alpha * colorParts[2],
+            // We always return a colour with full alpha.
+            1
+        ];
     }
 });
diff --git a/lib/editor/atto/plugins/equation/db/upgrade.php b/lib/editor/atto/plugins/equation/db/upgrade.php
index e10c52f8f670a..732be3ef6d6ae 100644
--- a/lib/editor/atto/plugins/equation/db/upgrade.php
+++ b/lib/editor/atto/plugins/equation/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_atto_equation_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js
index 7c0a688e0a9f3..eef8a6480a617 100644
--- a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js
+++ b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js
@@ -157,7 +157,7 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
             usedFiles = {};
 
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
-            filename = decodeURI(match[1]);
+            filename = decodeURIComponent(match[1]);
             usedFiles[filename] = true;
         }
 
diff --git a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js
index 515f6454da6e6..b3c8b9ddef775 100644
--- a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js
+++ b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_managefiles-usedfiles",function(e,t){var n={HASMISSINGFILES:"has-missing-files",HASUNUSEDFILES:"has-unused-files"},r={FILEANCESTOR:".fitem",FORM:"#atto_managefiles_manageform",MISSINGFILES:".missing-files"};M.atto_managefiles=M.atto_managefiles||{},M.atto_managefiles.usedfiles=M.atto_managefiles.usedfiles||{_usercontext:null,_itemid:null,_elementid:null,init:function(t){this._usercontext=t.usercontext,this._itemid=t.itemid,this._elementid=t.elementid;var i=t.files,s=e.one(r.FORM),o,u,a,f,l;if(!s||!window.parent)return;o=this._getUsedFiles(),u=this.findUnusedFiles(i,o),a=this.findMissingFiles(i,o),u.length>0?(s.all('input[type=checkbox][name^="deletefile"]').each(function(t){e.Array.indexOf(u,t.getData("filename"))===-1&&t.ancestor(r.FILEANCESTOR).remove()}),s.addClass(n.HASUNUSEDFILES)):s.removeClass(n.HASUNUSEDFILES);if(a.length>0){f="<ul>";for(l=0;l<a.length;l++)f+="<li>"+e.Escape.html(a[l])+"</li>";f+="</ul>",s.one(r.MISSINGFILES).setHTML("").append(f),s.addClass(n.HASMISSINGFILES)}else s.removeClass(n.HASMISSINGFILES)},_getUsedFiles:function(){var t=e.one(window.parent.document.getElementById(this._elementid+"editable")),n=M.cfg.wwwroot+"/draftfile.php/"+this._usercontext+"/user/draft/"+this._itemid+"/",r=new RegExp(n.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g,"\\$&")+"(.+?)[\\?\"']","gm"),i="",s="",o={};while((s=r.exec(t.get("innerHTML")))!==null)i=decodeURI(s[1]),o[i]=!0;return o},findUnusedFiles:function(e,t){var n,r=[];for(n in e)t[n]||r.push(n);return r},findMissingFiles:function(e,t){var n,r=[];for(n in t)e[n]||r.push(n);return r}}},"@VERSION@",{requires:["node","escape"]});
+YUI.add("moodle-atto_managefiles-usedfiles",function(e,t){var n={HASMISSINGFILES:"has-missing-files",HASUNUSEDFILES:"has-unused-files"},r={FILEANCESTOR:".fitem",FORM:"#atto_managefiles_manageform",MISSINGFILES:".missing-files"};M.atto_managefiles=M.atto_managefiles||{},M.atto_managefiles.usedfiles=M.atto_managefiles.usedfiles||{_usercontext:null,_itemid:null,_elementid:null,init:function(t){this._usercontext=t.usercontext,this._itemid=t.itemid,this._elementid=t.elementid;var i=t.files,s=e.one(r.FORM),o,u,a,f,l;if(!s||!window.parent)return;o=this._getUsedFiles(),u=this.findUnusedFiles(i,o),a=this.findMissingFiles(i,o),u.length>0?(s.all('input[type=checkbox][name^="deletefile"]').each(function(t){e.Array.indexOf(u,t.getData("filename"))===-1&&t.ancestor(r.FILEANCESTOR).remove()}),s.addClass(n.HASUNUSEDFILES)):s.removeClass(n.HASUNUSEDFILES);if(a.length>0){f="<ul>";for(l=0;l<a.length;l++)f+="<li>"+e.Escape.html(a[l])+"</li>";f+="</ul>",s.one(r.MISSINGFILES).setHTML("").append(f),s.addClass(n.HASMISSINGFILES)}else s.removeClass(n.HASMISSINGFILES)},_getUsedFiles:function(){var t=e.one(window.parent.document.getElementById(this._elementid+"editable")),n=M.cfg.wwwroot+"/draftfile.php/"+this._usercontext+"/user/draft/"+this._itemid+"/",r=new RegExp(n.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g,"\\$&")+"(.+?)[\\?\"']","gm"),i="",s="",o={};while((s=r.exec(t.get("innerHTML")))!==null)i=decodeURIComponent(s[1]),o[i]=!0;return o},findUnusedFiles:function(e,t){var n,r=[];for(n in e)t[n]||r.push(n);return r},findMissingFiles:function(e,t){var n,r=[];for(n in t)e[n]||r.push(n);return r}}},"@VERSION@",{requires:["node","escape"]});
diff --git a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js
index 423078ed7b1d1..ae2668e7dc1e4 100644
--- a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js
+++ b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js
@@ -156,7 +156,7 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
             usedFiles = {};
 
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
-            filename = decodeURI(match[1]);
+            filename = decodeURIComponent(match[1]);
             usedFiles[filename] = true;
         }
 
diff --git a/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js b/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js
index 0f7d6284ff174..534a2b79b69b7 100644
--- a/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js
+++ b/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js
@@ -155,7 +155,7 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
             usedFiles = {};
 
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
-            filename = decodeURI(match[1]);
+            filename = decodeURIComponent(match[1]);
             usedFiles[filename] = true;
         }
 
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 18d80bab06f1f..f24e52162da52 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -1367,7 +1367,7 @@ EditorClean.prototype = {
 
             // Source: "http://www.codinghorror.com/blog/2006/01/cleaning-words-nasty-html.html"
             // Remove forbidden tags for content, title, meta, style, st0-9, head, font, html, body, link.
-            {regex: /<\/?(?:title|meta|style|st\d|head|font|html|body|link)[^>]*?>/gi, replace: ""}
+            {regex: /<\/?(?:title|meta|style|st\d|head\b|font|html|body|link)[^>]*?>/gi, replace: ""}
         ];
 
         return this._filterContentWithRules(content, rules);
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index 2574ec4eba6f8..7b7b5becec598 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
@@ -1,4 +1,4 @@
 YUI.add("moodle-editor_atto-editor",function(e,t){function s(){s.superclass.constructor.apply(this,arguments)}function f(){}function l(){}function d(){}function m(){m.superclass.constructor.apply(this,arguments),this._submitEvents={},this._queue=[],this._throttle=null}function g(){}function y(){}function b(){}function w(){}function E(){}function S(){}function x(){}function T(){}var n="moodle-editor_atto-editor",r={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto",HIGHLIGHT:"highlight"},i=window.rangy;e.extend(s,e.Base,{BLOCK_TAGS:["address","article","aside","audio","blockquote","canvas","dd","div","dl","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","hr","noscript","ol","output","p","pre","section","table","tfoot","ul","video"],PLACEHOLDER_CLASS:"atto-tmp-class",ALL_NODES_SELECTOR:"[style],font[face]",FONT_FAMILY:"fontFamily",_wrapper:null,editor:null,textarea:null,textareaLabel:null,plugins:null,_eventHandles:null,initializer:function(){var t;this.textarea=e.one(document.getElementById(this.get("elementid")));if(!this.textarea)return;var n=this.textarea.getAttribute("class");this._eventHandles=[],this._wrapper=e.Node.create('<div class="'+r.WRAPPER+'" />'),t=e.Handlebars.compile('<div id="{{elementid}}editable" contenteditable="true" role="textbox" spellcheck="true" aria-live="off" class="{{CSS.CONTENT}} '+n+'" '+"/>"),this.editor=e.Node.create(t({elementid:this.get("elementid"),CSS:r})),this.textareaLabel=e.one('[for="'+this.get("elementid")+'"]'),this.textareaLabel&&(this.textareaLabel.generateID(),this.editor.setAttribute("aria-labelledby",this.textareaLabel.get("id"))),this.setupToolbar();var i=e.Node.create('<div class="'+r.CONTENTWRAPPER+'" />');i.appendChild(this.editor),this._wrapper.appendChild(i),this.editor.setStyle("minHeight",20*this.textarea.getAttribute("rows")+8+"px"),e.UA.ie===0&&this.editor.setStyle("height",20*this.textarea.getAttribute("rows")+8+"px"),this.disableCssStyling(),document.queryCommandSupported("DefaultParagraphSeparator")&&document.execCommand("DefaultParagraphSeparator",!1,"p"),this.textarea.get("parentNode").insert(this._wrapper,this.textarea).setAttribute("class","editor_atto_wrap"),this.textarea.hide(),e.mix(e.Node.DOM_EVENTS,{"form:editorUpdated":!0}),this.textarea.on("form:editorUpdated",function(){this.updateEditorState()},this),this.updateFromTextArea(),this.publishEvents(),this.setupSelectionWatchers(),this.setupAutomaticPolling(),this.setupPlugins(),this.setupAutosave(),this.setupNotifications()},focus:function(){return this.editor.focus(),this},publishEvents:function(){return this.publish("change",{broadcast:!0,preventable:!0}),this.publish("pluginsloaded",{fireOnce:!0}),this.publish("atto:selectionchanged",{prefix:"atto"}),this},setupAutomaticPolling:function(){return this._registerEventHandle(this.editor.on(["keyup","cut"],this.updateOriginal,this)),this._registerEventHandle(this.editor.on("paste",this.pasteCleanup,this)),this._registerEventHandle(this.editor.on("drop",this.updateOriginalDelayed,this)),this},updateOriginalDelayed:function(){return e.soon(e.bind(this.updateOriginal,this)),this},setupPlugins:function(){this.plugins={};var t=this.get("plugins"),n,r,i,s,o;for(n in t){r=t[n];if(!r.plugins)continue;for(i in r.plugins){s=r.plugins[i],o=e.mix({name:s.name,group:r.group,editor:this.editor,toolbar:this.toolbar,host:this},s);if(typeof e.M["atto_"+s.name]=="undefined")continue;this.plugins[s.name]=new e.M["atto_"+s.name].Button(o)}}return this.fire("pluginsloaded"),this},enablePlugins:function(e){this._setPluginState(!0,e)},disablePlugins:function(e){this._setPluginState(!1,e)},_setPluginState:function(t,n){var r="disableButtons";t&&(r="enableButtons"),n?this.plugins[n][r]():e.Object.each(this.plugins,function(e){e[r]()},this)},updateEditorState:function(){var t=this.textarea.hasAttribute("readonly"),n=e.one("#"+this.get("elementid")+"editable");this._setPluginState(!t),n&&n.setAttribute("contenteditable",!t)},_registerEventHandle:function(e){this._eventHandles.push(e)}},{NS:"editor_atto",ATTRS:{elementid:{value:null,writeOnce:!0},contextid:{value:null,writeOnce:!0},plugins:{value:{},writeOnce:!0}}}),e.augment(s,e.EventTarget),e.namespace("M.editor_atto").Editor=s,e.namespace("M.editor_atto.Editor").init=function(t){return new e.M.editor_atto.Editor(t)};var o="moodle-editor_atto-editor-notify",u="info",a="warning";f.ATTRS={},f.prototype={messageOverlay:null,hideTimer:null,setupNotifications:function(){var e=new Image,t=new Image;return e.src=M.util.image_url("i/warning","moodle"),t.src=M.util.image_url("i/info","moodle"),this},showMessage:function(t,n,r){var i="",s,o;return this.messageOverlay===null&&(this.messageOverlay=e.Node.create('<div class="editor_atto_notification"></div>'),this.messageOverlay.hide(!0),this.textarea.get("parentNode").append(this.messageOverlay),this.messageOverlay.on("click",function(){this.messageOverlay.hide(!0)},this)),this.hideTimer!==null&&this.hideTimer.cancel(),n===a?i='<img src="'+M.util.image_url("i/warning","moodle")+'" alt="'+M.util.get_string("warning","moodle")+'"/>':n===u&&(i='<img src="'+M.util.image_url("i/info","moodle")+'" alt="'+M.util.get_string("info","moodle")+'"/>'),s=parseInt(r,10),s<=0&&(s=6e4),n="atto_"+n,o=e.Node.create('<div class="'+n+'" role="alert" aria-live="assertive">'+i+" "+e.Escape.html(t)+"</div>"),this.messageOverlay.empty(),this.messageOverlay.append(o),this.messageOverlay.show(!0),this.hideTimer=e.later(s,this,function(){this.hideTimer=null,this.messageOverlay.inDoc()&&this.messageOverlay.hide(!0)}),this}},e.Base.mix(e.M.editor_atto.Editor,[f]),l.ATTRS={},l.prototype={_getEmptyContent:function(){return e.UA.ie&&e.UA.ie<10?"<p></p>":"<p><br></p>"},updateFromTextArea:function(){return this.editor.setHTML(""),this.editor.append(this._cleanHTML(this.textarea.get("value"))),this.editor.getHTML()===""&&this.editor.setHTML(this._getEmptyContent()),this},updateOriginal
-:function(){var e=this.textarea.get("value"),t=this.getCleanHTML();return t===""&&this.isActive()&&(t=this._getEmptyContent()),e!==t&&(this.textarea.set("value",t),this.textarea.simulate("change"),this.fire("change")),this}},e.Base.mix(e.M.editor_atto.Editor,[l]);var c=5e3,h=6e4,p="moodle-editor_atto-editor-autosave";d.ATTRS={autosaveEnabled:{value:!0,writeOnce:!0},autosaveFrequency:{value:60,writeOnce:!0},pageHash:{value:"",writeOnce:!0}},d.prototype={lastText:"",autosaveInstance:null,autosaveTimer:null,setupAutosave:function(){var t=-1,n,r=null,i=this.get("filepickeroptions"),s;if(!this.get("autosaveEnabled"))return;this.autosaveInstance=e.stamp(this);for(r in i)typeof i[r].itemid!="undefined"&&(t=i[r].itemid);s={contextid:this.get("contextid"),action:"resume",draftid:t,elementid:this.get("elementid"),pageinstance:this.autosaveInstance,pagehash:this.get("pageHash")},this.autosaveIo(s,this,{success:function(e){if(e===null)return;if(!e)return;if(e.result==="<p></p>"||e.result==="<p><br></p>"||e.result==="<br>")e.result="";if(e.result==="<p>&nbsp;</p>"||e.result==="<p><br>&nbsp;</p>")e.result="";e.error||typeof e.result=="undefined"?this.showMessage(M.util.get_string("errortextrecovery","editor_atto"),a,h):e.result!==this.textarea.get("value")&&e.result!==""&&this.recoverText(e.result),this._fireSelectionChanged()},failure:function(){this.showMessage(M.util.get_string("errortextrecovery","editor_atto"),a,h)}});var o=parseInt(this.get("autosaveFrequency"),10)*1e3;return this.autosaveTimer=e.later(o,this,this.saveDraft,!1,!0),n=this.textarea.ancestor("form"),n&&this.autosaveIoOnSubmit(n,{action:"reset",contextid:this.get("contextid"),elementid:this.get("elementid"),pageinstance:this.autosaveInstance,pagehash:this.get("pageHash")}),this},recoverText:function(e){return this.editor.setHTML(e),this.saveSelection(),this.updateOriginal(),this.lastText=e,this.showMessage(M.util.get_string("textrecovered","editor_atto"),u,h),require(["core/event"],function(e){e.notifyEditorContentRestored()}),this},saveDraft:function(){var t,n;if(!this.editor.getDOMNode()){this.autosaveTimer.cancel();return}this.editor.get("hidden")||this.updateOriginal();var r=this.textarea.get("value");if(r!==this.lastText){t=M.cfg.wwwroot+this.get("autosaveAjaxScript"),n={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"save",drafttext:r,elementid:this.get("elementid"),pagehash:this.get("pageHash"),pageinstance:this.autosaveInstance};var i=function(e){var t=parseInt(this.get("autosaveFrequency"),10)*1e3;this.showMessage(M.util.get_string("autosavefailed","editor_atto"),a,t)};this.autosaveIo(n,this,{failure:i,success:function(t){t&&t.error?e.soon(e.bind(i,this,[t])):(this.lastText=r,this.showMessage(M.util.get_string("autosavesucceeded","editor_atto"),u,c))}})}return this}},e.Base.mix(e.M.editor_atto.Editor,[d]);var v=null;m.NAME="EditorAutosaveIoDispatcher",m.ATTRS={autosaveAjaxScript:{value:"/lib/editor/atto/autosave-ajax.php",readOnly:!0},delay:{value:50,readOnly:!0}},e.extend(m,e.Base,{dispatch:function(t,n,r){this._throttle&&this._throttle.cancel(),this._throttle=e.later(this.get("delay"),this,this._processDispatchQueue),this._queue.push([t,n,r])},_processDispatchQueue:function(){var t=this._queue,n={};this._queue=[];if(t.length<1)return;e.Array.each(t,function(e,t){n[t]=e[0]}),e.io(M.cfg.wwwroot+this.get("autosaveAjaxScript"),{method:"POST",data:e.QueryString.stringify({actions:n,sesskey:M.cfg.sesskey}),on:{start:this._makeIoEventCallback("start",t),complete:this._makeIoEventCallback("complete",t),failure:this._makeIoEventCallback("failure",t),end:this._makeIoEventCallback("end",t),success:this._makeIoEventCallback("success",t)}})},_makeIoEventCallback:function(t,n){var r=function(){};return function(){var i=arguments[1],s={};(t=="complete"||t=="success")&&typeof i!="undefined"&&typeof i.responseText!="undefined"&&i.responseText!==""&&(s=JSON.parse(i.responseText)||{}),e.Array.each(n,function(e,n){var i=e[1],o=e[2]&&e[2][t]||r,u;s&&s.error?u=s:s&&(u=s[n]),o.apply(i,[u])})}},_onSubmit:function(t){var n={},r=t.currentTarget.generateID(),i=this._submitEvents[r];if(!i||i.ios.length<1)return;e.Array.each(i.ios,function(e,t){n[t]=e}),e.io(M.cfg.wwwroot+this.get("autosaveAjaxScript"),{method:"POST",data:e.QueryString.stringify({actions:n,sesskey:M.cfg.sesskey}),sync:!0})},whenSubmit:function(e,t){typeof this._submitEvents[e.generateID()]=="undefined"&&(this._submitEvents[e.generateID()]={event:e.on("submit",this._onSubmit,this),ajaxEvent:e.on(M.core.event.FORM_SUBMIT_AJAX,this._onSubmit,this),ios:[]}),this._submitEvents[e.get("id")].ios.push([t])}}),v=new m,g.prototype={autosaveIo:function(e,t,n){v.dispatch(e,t,n)},autosaveIoOnSubmit:function(e,t){v.whenSubmit(e,t)}},e.Base.mix(e.M.editor_atto.Editor,[g]),y.ATTRS={},y.prototype={getCleanHTML:function(){var t=this.editor.cloneNode(!0),n;return e.each(t.all('[id^="yui"]'),function(e){e.removeAttribute("id")}),t.all(".atto_control").remove(!0),n=t.get("innerHTML"),n==="<p></p>"||n==="<p><br></p>"?"":this._cleanHTML(n)},cleanEditorHTML:function(){var e=this.editor.get("innerHTML");return this.editor.set("innerHTML",this._cleanHTML(e)),this},_cleanHTML:function(e){var t=[{regex:/<style[^>]*>[\s\S]*?<\/style>/gi,replace:""},{regex:/<!--(?![\s\S]*?-->)/gi,replace:""},{regex:/<\/?(?:title|meta|style|st\d|head|font|html|body|link)[^>]*?>/gi,replace:""}];return this._filterContentWithRules(e,t)},_filterContentWithRules:function(e,t){var n=0;for(n=0;n<t.length;n++)e=e.replace(t[n].regex,t[n].replace);return e},pasteCleanup:function(e){if(e.type==="paste"){var t=e._event;if(!(t&&t.clipboardData&&t.clipboardData.getData&&t.clipboardData.types))return this.fallbackPasteCleanupDelayed(),!0;var n=t.clipboardData.types,r=!1;typeof n.contains=="function"?r=n.contains("text/html"):typeof n.indexOf=="function"&&(r=n.indexOf("text/html")>-1);var i;if(r){try{i=t.clipboardData.getData("text/html")}catch(s){return this.fallbackPasteCleanupDelayed(),!0}e.preventDefault(),i=this._cleanPasteHTML
+:function(){var e=this.textarea.get("value"),t=this.getCleanHTML();return t===""&&this.isActive()&&(t=this._getEmptyContent()),e!==t&&(this.textarea.set("value",t),this.textarea.simulate("change"),this.fire("change")),this}},e.Base.mix(e.M.editor_atto.Editor,[l]);var c=5e3,h=6e4,p="moodle-editor_atto-editor-autosave";d.ATTRS={autosaveEnabled:{value:!0,writeOnce:!0},autosaveFrequency:{value:60,writeOnce:!0},pageHash:{value:"",writeOnce:!0}},d.prototype={lastText:"",autosaveInstance:null,autosaveTimer:null,setupAutosave:function(){var t=-1,n,r=null,i=this.get("filepickeroptions"),s;if(!this.get("autosaveEnabled"))return;this.autosaveInstance=e.stamp(this);for(r in i)typeof i[r].itemid!="undefined"&&(t=i[r].itemid);s={contextid:this.get("contextid"),action:"resume",draftid:t,elementid:this.get("elementid"),pageinstance:this.autosaveInstance,pagehash:this.get("pageHash")},this.autosaveIo(s,this,{success:function(e){if(e===null)return;if(!e)return;if(e.result==="<p></p>"||e.result==="<p><br></p>"||e.result==="<br>")e.result="";if(e.result==="<p>&nbsp;</p>"||e.result==="<p><br>&nbsp;</p>")e.result="";e.error||typeof e.result=="undefined"?this.showMessage(M.util.get_string("errortextrecovery","editor_atto"),a,h):e.result!==this.textarea.get("value")&&e.result!==""&&this.recoverText(e.result),this._fireSelectionChanged()},failure:function(){this.showMessage(M.util.get_string("errortextrecovery","editor_atto"),a,h)}});var o=parseInt(this.get("autosaveFrequency"),10)*1e3;return this.autosaveTimer=e.later(o,this,this.saveDraft,!1,!0),n=this.textarea.ancestor("form"),n&&this.autosaveIoOnSubmit(n,{action:"reset",contextid:this.get("contextid"),elementid:this.get("elementid"),pageinstance:this.autosaveInstance,pagehash:this.get("pageHash")}),this},recoverText:function(e){return this.editor.setHTML(e),this.saveSelection(),this.updateOriginal(),this.lastText=e,this.showMessage(M.util.get_string("textrecovered","editor_atto"),u,h),require(["core/event"],function(e){e.notifyEditorContentRestored()}),this},saveDraft:function(){var t,n;if(!this.editor.getDOMNode()){this.autosaveTimer.cancel();return}this.editor.get("hidden")||this.updateOriginal();var r=this.textarea.get("value");if(r!==this.lastText){t=M.cfg.wwwroot+this.get("autosaveAjaxScript"),n={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"save",drafttext:r,elementid:this.get("elementid"),pagehash:this.get("pageHash"),pageinstance:this.autosaveInstance};var i=function(e){var t=parseInt(this.get("autosaveFrequency"),10)*1e3;this.showMessage(M.util.get_string("autosavefailed","editor_atto"),a,t)};this.autosaveIo(n,this,{failure:i,success:function(t){t&&t.error?e.soon(e.bind(i,this,[t])):(this.lastText=r,this.showMessage(M.util.get_string("autosavesucceeded","editor_atto"),u,c))}})}return this}},e.Base.mix(e.M.editor_atto.Editor,[d]);var v=null;m.NAME="EditorAutosaveIoDispatcher",m.ATTRS={autosaveAjaxScript:{value:"/lib/editor/atto/autosave-ajax.php",readOnly:!0},delay:{value:50,readOnly:!0}},e.extend(m,e.Base,{dispatch:function(t,n,r){this._throttle&&this._throttle.cancel(),this._throttle=e.later(this.get("delay"),this,this._processDispatchQueue),this._queue.push([t,n,r])},_processDispatchQueue:function(){var t=this._queue,n={};this._queue=[];if(t.length<1)return;e.Array.each(t,function(e,t){n[t]=e[0]}),e.io(M.cfg.wwwroot+this.get("autosaveAjaxScript"),{method:"POST",data:e.QueryString.stringify({actions:n,sesskey:M.cfg.sesskey}),on:{start:this._makeIoEventCallback("start",t),complete:this._makeIoEventCallback("complete",t),failure:this._makeIoEventCallback("failure",t),end:this._makeIoEventCallback("end",t),success:this._makeIoEventCallback("success",t)}})},_makeIoEventCallback:function(t,n){var r=function(){};return function(){var i=arguments[1],s={};(t=="complete"||t=="success")&&typeof i!="undefined"&&typeof i.responseText!="undefined"&&i.responseText!==""&&(s=JSON.parse(i.responseText)||{}),e.Array.each(n,function(e,n){var i=e[1],o=e[2]&&e[2][t]||r,u;s&&s.error?u=s:s&&(u=s[n]),o.apply(i,[u])})}},_onSubmit:function(t){var n={},r=t.currentTarget.generateID(),i=this._submitEvents[r];if(!i||i.ios.length<1)return;e.Array.each(i.ios,function(e,t){n[t]=e}),e.io(M.cfg.wwwroot+this.get("autosaveAjaxScript"),{method:"POST",data:e.QueryString.stringify({actions:n,sesskey:M.cfg.sesskey}),sync:!0})},whenSubmit:function(e,t){typeof this._submitEvents[e.generateID()]=="undefined"&&(this._submitEvents[e.generateID()]={event:e.on("submit",this._onSubmit,this),ajaxEvent:e.on(M.core.event.FORM_SUBMIT_AJAX,this._onSubmit,this),ios:[]}),this._submitEvents[e.get("id")].ios.push([t])}}),v=new m,g.prototype={autosaveIo:function(e,t,n){v.dispatch(e,t,n)},autosaveIoOnSubmit:function(e,t){v.whenSubmit(e,t)}},e.Base.mix(e.M.editor_atto.Editor,[g]),y.ATTRS={},y.prototype={getCleanHTML:function(){var t=this.editor.cloneNode(!0),n;return e.each(t.all('[id^="yui"]'),function(e){e.removeAttribute("id")}),t.all(".atto_control").remove(!0),n=t.get("innerHTML"),n==="<p></p>"||n==="<p><br></p>"?"":this._cleanHTML(n)},cleanEditorHTML:function(){var e=this.editor.get("innerHTML");return this.editor.set("innerHTML",this._cleanHTML(e)),this},_cleanHTML:function(e){var t=[{regex:/<style[^>]*>[\s\S]*?<\/style>/gi,replace:""},{regex:/<!--(?![\s\S]*?-->)/gi,replace:""},{regex:/<\/?(?:title|meta|style|st\d|head\b|font|html|body|link)[^>]*?>/gi,replace:""}];return this._filterContentWithRules(e,t)},_filterContentWithRules:function(e,t){var n=0;for(n=0;n<t.length;n++)e=e.replace(t[n].regex,t[n].replace);return e},pasteCleanup:function(e){if(e.type==="paste"){var t=e._event;if(!(t&&t.clipboardData&&t.clipboardData.getData&&t.clipboardData.types))return this.fallbackPasteCleanupDelayed(),!0;var n=t.clipboardData.types,r=!1;typeof n.contains=="function"?r=n.contains("text/html"):typeof n.indexOf=="function"&&(r=n.indexOf("text/html")>-1);var i;if(r){try{i=t.clipboardData.getData("text/html")}catch(s){return this.fallbackPasteCleanupDelayed(),!0}e.preventDefault(),i=this._cleanPasteHTML
 (i);var o=window.rangy.saveSelection();return this.insertContentAtFocusPoint(i),window.rangy.restoreSelection(o),window.rangy.getSelection().collapseToEnd(),this.updateOriginal(),!1}try{i=t.clipboardData.getData("text")}catch(s){return this.fallbackPasteCleanupDelayed(),!0}}return this.updateOriginalDelayed(),!0},fallbackPasteCleanup:function(){var e=window.rangy.saveSelection(),t=this.editor.get("innerHTML");return this.editor.set("innerHTML",this._cleanPasteHTML(t)),this.updateOriginal(),window.rangy.restoreSelection(e),this},fallbackPasteCleanupDelayed:function(){return e.soon(e.bind(this.fallbackPasteCleanup,this)),this},_cleanPasteHTML:function(e){if(!e||e.length===0)return"";var t=[{regex:/<\s*\/html\s*>([\s\S]+)$/gi,replace:""},{regex:/<!--\[if[\s\S]*?endif\]-->/gi,replace:""},{regex:/<!--(Start|End)Fragment-->/gi,replace:""},{regex:/<xml[^>]*>[\s\S]*?<\/xml>/gi,replace:""},{regex:/<\?xml[^>]*>[\s\S]*?<\\\?xml>/gi,replace:""},{regex:/<\/?\w+:[^>]*>/gi,replace:""}];e=this._filterContentWithRules(e,t),e=this._cleanHTML(e);if(e.length===0||!e.match(/\S/))return e;var n=document.createElement("div");return n.innerHTML=e,e=n.innerHTML,n.innerHTML="",t=[{regex:/(<[^>]*?class\s*?=\s*?")([^>"]*)(")/gi,replace:function(e,t,n,r){return n=n.replace(/(?:^|[\s])[\s]*MSO[_a-zA-Z0-9\-]*/gi,""),n=n.replace(/(?:^|[\s])[\s]*Apple-[_a-zA-Z0-9\-]*/gi,""),t+n+r}},{regex:/<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi,replace:""}],e=this._cleanStyles(e),e=this._filterContentWithRules(e,t),e=this._cleanHTML(e),e=this._cleanSpans(e),e},_cleanStyles:function(e){var t=document.createElement("div");t.innerHTML=e;var n=t.querySelectorAll("[style]"),r=0;for(r=0;r<n.length;r++)n[r].removeAttribute("style");var i=t.querySelectorAll("[class]");for(r=0;r<i.length;r++)i[r].removeAttribute("class");return t.innerHTML},_cleanSpans:function(e){if(!e||e.length===0)return"";if(e.length===0||!e.match(/\S/))return e;var t=[{regex:/(<[^>]*?)(?:[\s]*(?:class|style|id)\s*?=\s*?"\s*?")+/gi,replace:"$1"}];e=this._filterContentWithRules(e,t);var n=document.createElement("div");n.innerHTML=e;var r=n.getElementsByTagName("span"),i=Array.prototype.slice.call(r,0);return i.forEach(function(e){if(!e.hasAttributes()){while(e.firstChild)e.parentNode.insertBefore(e.firstChild,e);e.parentNode.removeChild(e)}}),n.innerHTML}},e.Base.mix(e.M.editor_atto.Editor,[y]),b.ATTRS={},b.prototype={applyFormat:function(t,n,r,i){function s(t,n,r,i,s,o){e.soon(e.bind(function(e,t,n,r,i,s){var o=window.rangy.getSelection(),u=o.getRangeAt(0);u.setStart(i,s),o.setSingleRange(u),t.apply(n,[e,r]),o.collapseToEnd(),this.saveSelection(),this.updateOriginal()},this,t,n,r,i,s,o))}r=r||this;var o=window.rangy.getSelection();if(o.isCollapsed){var u=this.editor.once("input",s,this,n,r,i,o.anchorNode,o.anchorOffset);this.editor.onceAfter(["click","selectstart"],u.detach,u);return}n.apply(r,[t,i]),this.saveSelection(),this.updateOriginal()},replaceTags:function(t,n){t.setAttribute("data-iterate",!0);var r=this.editor.one('[data-iterate="true"]');while(r){var i=e.Node.create("<"+n+" />").setAttrs(r.getAttrs()).removeAttribute("data-iterate");r.getAttribute("style")&&i.setAttribute("style",r.getAttribute("style")),r.getAttribute("class")&&i.setAttribute("class",r.getAttribute("class"));var s=r.getDOMNode().childNodes,o;o=s[0];while(typeof o!="undefined")i.append(o),o=s[0];r.replace(i),r=this.editor.one('[data-iterate="true"]')}},changeToCSS:function(e,t){var n=window.rangy.saveSelection();this.editor.all(".rangySelectionBoundary").setStyle("display",null),this.editor.all(e).addClass(t),this.replaceTags(this.editor.all("."+t),"span"),window.rangy.restoreSelection(n)},changeToTags:function(e,t){var n=window.rangy.saveSelection();this.editor.all(".rangySelectionBoundary").setStyle("display",null),this.replaceTags(this.editor.all('span[class="'+e+'"]'),t),this.editor.all(t+'[class="'+e+'"]').removeAttribute("class"),this.editor.all("."+e).each(function(n){n.wrap("<"+t+"/>"),n.removeClass(e)}),this.editor.all('[class="'+e+'"]').removeAttribute("class"),this.editor.all(t).removeClass(e),window.rangy.restoreSelection(n)}},e.Base.mix(e.M.editor_atto.Editor,[b]),w.ATTRS={},w.prototype={toolbar:null,openMenus:null,setupToolbar:function(){return this.toolbar=e.Node.create('<div class="'+r.TOOLBAR+'" role="toolbar" aria-live="off"/>'),this.openMenus=[],this._wrapper.appendChild(this.toolbar),this.textareaLabel&&this.toolbar.setAttribute("aria-labelledby",this.textareaLabel.get("id")),this.setupToolbarNavigation(),this}},e.Base.mix(e.M.editor_atto.Editor,[w]),E.ATTRS={},E.prototype={_tabFocus:null,setupToolbarNavigation:function(){return this._wrapper.delegate("key",this.toolbarKeyboardNavigation,"down:37,39","."+r.TOOLBAR,this),this._wrapper.delegate("focus",function(e){this._setTabFocus(e.currentTarget)},"."+r.TOOLBAR+" button",this),this},toolbarKeyboardNavigation:function(e){e.preventDefault();var t=this.toolbar.all("button"),n=1,r,i=e.target.ancestor("button",!0);e.keyCode===37&&(n=-1),r=this._findFirstFocusable(t,i,n),r&&(r.focus(),this._setTabFocus(r))},_findFirstFocusable:function(e,t,n){var r=0,i,s,o,u;u=e.indexOf(t),u<-1&&(u=0);while(r<e.size()){u+=n,u<0?u=e.size()-1:u>=e.size()&&(u=0),s=e.item(u),r++;if(s.hasAttribute("hidden")||s.hasAttribute("disabled"))continue;i=s.ancestor(".atto_group");if(i.hasAttribute("hidden"))continue;o=s;break}return o},checkTabFocus:function(){if(this._tabFocus)if(this._tabFocus.hasAttribute("disabled")||this._tabFocus.hasAttribute("hidden")||this._tabFocus.ancestor(".atto_group").hasAttribute("hidden")){var e=this._findFirstFocusable(this.toolbar.all("button"),this._tabFocus,-1);e&&(this._tabFocus.compareTo(document.activeElement)&&e.focus(),this._setTabFocus(e))}return this},_setTabFocus:function(e){return this._tabFocus&&this._tabFocus.setAttribute("tabindex","-1"),this._tabFocus=e,this._tabFocus.setAttribute("tabindex",0),this.toolbar.setAttribute("aria-activedescendant",this._tabFocus.generateID()),this}},e.Base.mix(e.M.editor_atto
 .Editor,[E]),S.ATTRS={},S.prototype={_selections:null,_lastSelection:null,_focusFromClick:!1,_gesturestartededitor:!1,setupSelectionWatchers:function(){return this.on("atto:selectionchanged",this.saveSelection,this),this.editor.on("focus",this.restoreSelection,this),this.editor.on("mousedown",function(){this._focusFromClick=!0},this),this.editor.on("blur",function(){this._focusFromClick=!1,this.updateOriginal()},this),this.editor.on(["keyup","focus"],function(t){e.soon(e.bind(this._hasSelectionChanged,this,t))},this),e.one(document.body).on("gesturemovestart",function(e){this._wrapper.contains(e.target._node)?this._gesturestartededitor=!0:this._gesturestartededitor=!1},null,this),e.one(document.body).on("gesturemoveend",function(t){if(!this._gesturestartededitor)return;e.soon(e.bind(this._hasSelectionChanged,this,t))},{standAlone:!0},this),this},isActive:function(){var e=i.createRange(),t=i.getSelection();return t.rangeCount?!document.activeElement||!this.editor.compareTo(document.activeElement)&&!this.editor.contains(document.activeElement)?!1:(e.selectNode(this.editor.getDOMNode()),e.intersectsRange(t.getRangeAt(0))):!1},getSelectionFromNode:function(e){var t=i.createRange();return t.selectNode(e.getDOMNode()),[t]},saveSelection:function(){this.isActive()&&(this._selections=this.getSelection())},restoreSelection:function(){this._focusFromClick||this._selections&&this.setSelection(this._selections),this._focusFromClick=!1},getSelection:function(){return i.getSelection().getAllRanges()},selectionContainsNode:function(e){return i.getSelection().containsNode(e.getDOMNode(),!0)},selectionFilterMatches:function(e,t,n){typeof n=="undefined"&&(n=!0),t||(t=this.getSelectedNodes());var r=t.size()>0,i=!1,s=this.editor,o=function(e){return e===s};return s.one(e)?(t.each(function(t){if(n){if(!r||!t.ancestor(e,!0,o))r=!1}else!i&&t.ancestor(e,!0,o)&&(i=!0)},this),n?r:i):!1},getSelectedNodes:function(){var t=new e.NodeList,n,r,s,o,u;r=i.getSelection(),r.rangeCount?s=r.getRangeAt(0):s=i.createRange(),s.collapsed&&s.commonAncestorContainer!==this.editor.getDOMNode()&&s.commonAncestorContainer!==e.config.doc&&(s=s.cloneRange(),s.selectNode(s.commonAncestorContainer)),n=s.getNodes();for(u=0;u<n.length;u++)o=e.one(n[u]),this.editor.contains(o)&&t.push(o);return t},_hasSelectionChanged:function(e){var t=i.getSelection(),n,r=!1;return t.rangeCount?n=t.getRangeAt(0):n=i.createRange(),this._lastSelection&&!this._lastSelection.equals(n)?(r=!0,this._fireSelectionChanged(e)):(this._lastSelection=n,r)},_fireSelectionChanged:function(e){this.fire("atto:selectionchanged",{event:e,selectedNodes:this.getSelectedNodes()})},getSelectionParentNode:function(){var e=i.getSelection();return e.rangeCount?e.getRangeAt(0).commonAncestorContainer:!1},setSelection:function(e){var t=i.getSelection();t.setRanges(e)},insertContentAtFocusPoint:function(t){var n=i.getSelection(),r,s=e.Node.create(t);return n.rangeCount&&(r=n.getRangeAt(0)),r&&(r.deleteContents(),r.insertNode(s.getDOMNode())),s}},e.Base.mix(e.M.editor_atto.Editor,[S]),x.ATTRS={},x.prototype={disableCssStyling:function(){try{document.execCommand("styleWithCSS",0,!1)}catch(e){try{document.execCommand("useCSS",0,!0)}catch(t){try{document.execCommand("styleWithCSS",!1,!1)}catch(n){}}}},enableCssStyling:function(){try{document.execCommand("styleWithCSS",0,!0)}catch(e){try{document.execCommand("useCSS",0,!1)}catch(t){try{document.execCommand("styleWithCSS",!1,!0)}catch(n){}}}},toggleInlineSelectionClass:function(e){var t=e.join(" "),n=i.createClassApplier(t,{normalize:!0});n.toggleSelection()},formatSelectionInlineStyle:function(e){var t=this.PLACEHOLDER_CLASS,n=i.createClassApplier(t,{normalize:!0});n.applyToSelection(),this.editor.all("."+t).each(function(n){n.removeClass(t).setStyles(e)},this)},formatSelectionBlock:function(t,n){var r=this.getSelectionParentNode(),i,s,o,u,a,f;if(!r)return!1;i=this.editor,r=e.one(r),s=r.ancestor(function(e){var t=e.get("tagName");return t&&(t=t.toLowerCase()),e===i||t==="td"||t==="th"},!0),s&&(i=s),o=r.ancestor(this.BLOCK_TAGS.join(", "),!0),o&&(a=o.ancestor(function(e){return e===i},!1),a||(o=!1)),o||(u=e.Node.create("<p></p>"),i.get("childNodes").each(function(e){u.append(e.remove())}),i.append(u),o=u),t&&t!==""&&(f=e.Node.create("<"+t+"></"+t+">"),f.setAttrs(o.getAttrs()),o.get("childNodes").each(function(e){e.remove(),f.append(e)}),o.replace(f),o=f),n&&o.setAttrs(n);var l=this.getSelectionFromNode(o);return this.setSelection(l),o}},e.Base.mix(e.M.editor_atto.Editor,[x]),T.ATTRS={filepickeroptions:{value:{}}},T.prototype={canShowFilepicker:function(e){return typeof this.get("filepickeroptions")[e]!="undefined"},showFilepicker:function(t,n,r){var i=this;e.use("core_filepicker",function(e){var s=e.clone(i.get("filepickeroptions")[t],!0);s.formcallback=n,r&&(s.magicscope=r),M.core_filepicker.show(e,s)})}},e.Base.mix(e.M.editor_atto.Editor,[T])},"@VERSION@",{requires:["node","transition","io","overlay","escape","event","event-simulate","event-custom","node-event-html5","node-event-simulate","yui-throttle","moodle-core-notification-dialogue","moodle-core-notification-confirm","moodle-editor_atto-rangy","handlebars","timers","querystring-stringify"]});
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index fea357374aa85..c373535b85af8 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
@@ -1356,7 +1356,7 @@ EditorClean.prototype = {
 
             // Source: "http://www.codinghorror.com/blog/2006/01/cleaning-words-nasty-html.html"
             // Remove forbidden tags for content, title, meta, style, st0-9, head, font, html, body, link.
-            {regex: /<\/?(?:title|meta|style|st\d|head|font|html|body|link)[^>]*?>/gi, replace: ""}
+            {regex: /<\/?(?:title|meta|style|st\d|head\b|font|html|body|link)[^>]*?>/gi, replace: ""}
         ];
 
         return this._filterContentWithRules(content, rules);
diff --git a/lib/editor/atto/yui/src/editor/js/clean.js b/lib/editor/atto/yui/src/editor/js/clean.js
index 1763547e5670b..cfb35e79d5652 100644
--- a/lib/editor/atto/yui/src/editor/js/clean.js
+++ b/lib/editor/atto/yui/src/editor/js/clean.js
@@ -98,7 +98,7 @@ EditorClean.prototype = {
 
             // Source: "http://www.codinghorror.com/blog/2006/01/cleaning-words-nasty-html.html"
             // Remove forbidden tags for content, title, meta, style, st0-9, head, font, html, body, link.
-            {regex: /<\/?(?:title|meta|style|st\d|head|font|html|body|link)[^>]*?>/gi, replace: ""}
+            {regex: /<\/?(?:title|meta|style|st\d|head\b|font|html|body|link)[^>]*?>/gi, replace: ""}
         ];
 
         return this._filterContentWithRules(content, rules);
diff --git a/lib/editor/tinymce/db/upgrade.php b/lib/editor/tinymce/db/upgrade.php
index 76c25ef4749f9..09e2a487747ce 100644
--- a/lib/editor/tinymce/db/upgrade.php
+++ b/lib/editor/tinymce/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_editor_tinymce_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
index 5408bf68fb20e..25c8cbc4b4b36 100644
--- a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
+++ b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_tinymce_spellchecker_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/tinymce/tests/behat/disablecontrol.feature b/lib/editor/tinymce/tests/behat/disablecontrol.feature
index d8cc6da908ddf..084738321b928 100644
--- a/lib/editor/tinymce/tests/behat/disablecontrol.feature
+++ b/lib/editor/tinymce/tests/behat/disablecontrol.feature
@@ -22,7 +22,7 @@ Feature: Tinymce with enable/disable function.
 
   @javascript
   Scenario: Check disable Tinymce editor.
-    When I click on "option[value=1]" "css_element" in the "select#id_mycontrol" "css_element"
+    When I set the field "My control" to "Disable"
     Then the "class" attribute of "a#id_myeditor_pdw_toggle" "css_element" should contain "mceButtonDisabled"
     And the "class" attribute of "table#id_myeditor_formatselect" "css_element" should contain "mceListBoxDisabled"
     And the "class" attribute of "a#id_myeditor_bold" "css_element" should contain "mceButtonDisabled"
@@ -39,7 +39,7 @@ Feature: Tinymce with enable/disable function.
 
   @javascript
   Scenario: Check enable Tinymce editor.
-    When I click on "option[value=0]" "css_element" in the "select#id_mycontrol" "css_element"
+    When I set the field "My control" to "Enable"
     Then the "class" attribute of "a#id_myeditor_pdw_toggle" "css_element" should contain "mceButtonEnabled"
     And the "class" attribute of "table#id_myeditor_formatselect" "css_element" should contain "mceListBoxEnabled"
     And the "class" attribute of "a#id_myeditor_bold" "css_element" should contain "mceButtonEnabled"
diff --git a/lib/environmentlib.php b/lib/environmentlib.php
index dbf2520b2555d..3daebaebc6410 100644
--- a/lib/environmentlib.php
+++ b/lib/environmentlib.php
@@ -1628,3 +1628,14 @@ function restrict_php_version_72(&$result) {
 function restrict_php_version_73(&$result) {
     return restrict_php_version($result, '7.3');
 }
+
+/**
+ * Check if the current PHP version is greater than or equal to
+ * PHP version 7.4.
+ *
+ * @param object $result an environment_results instance
+ * @return bool result of version check
+ */
+function restrict_php_version_74(&$result) {
+    return restrict_php_version($result, '7.4');
+}
diff --git a/lib/filelib.php b/lib/filelib.php
index 16d17fb220f09..c541731829fc6 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -1044,7 +1044,8 @@ function file_save_draft_area_files($draftitemid, $contextid, $component, $filea
 
     // Do not merge files, leave it as it was.
     if ($draftitemid === IGNORE_FILE_MERGE) {
-        return null;
+        // Safely return $text, no need to rewrite pluginfile because this is mostly comming from an external client like the app.
+        return $text;
     }
 
     $usercontext = context_user::instance($USER->id);
@@ -4237,7 +4238,7 @@ function file_pluginfile($relativepath, $forcedownload, $preview = null, $offlin
 
         } else if ($filearea == GRADE_FEEDBACK_FILEAREA || $filearea == GRADE_HISTORY_FEEDBACK_FILEAREA) {
             if ($context->contextlevel != CONTEXT_MODULE) {
-                send_file_not_found;
+                send_file_not_found();
             }
 
             require_login($course, false);
diff --git a/lib/filestorage/tests/file_storage_test.php b/lib/filestorage/tests/file_storage_test.php
index c667040cfce56..eaf72ec262180 100644
--- a/lib/filestorage/tests/file_storage_test.php
+++ b/lib/filestorage/tests/file_storage_test.php
@@ -43,7 +43,6 @@ class core_files_file_storage_testcase extends advanced_testcase {
      * Files can be created from strings.
      *
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string() {
         global $DB;
@@ -119,7 +118,6 @@ public function test_create_file_from_string() {
      * Local files can be added to the filepool
      *
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname() {
         global $CFG, $DB;
@@ -204,7 +202,6 @@ public function test_create_file_from_pathname() {
      * Tests get get file.
      *
      * @covers ::get_file
-     * @covers ::<!public>
      */
     public function test_get_file() {
         global $CFG;
@@ -245,7 +242,6 @@ public function test_get_file() {
      * @param stored_file $file
      * @depends test_get_file
      * @covers ::get_file_preview
-     * @covers ::<!public>
      */
     public function test_get_file_preview(stored_file $file) {
         global $CFG;
@@ -269,7 +265,6 @@ public function test_get_file_preview(stored_file $file) {
      * Tests for get_file_preview without an image.
      *
      * @covers ::get_file_preview
-     * @covers ::<!public>
      */
     public function test_get_file_preview_nonimage() {
         $this->resetAfterTest(true);
@@ -297,7 +292,6 @@ public function test_get_file_preview_nonimage() {
      *
      * @copyright 2012 Dongsheng Cai {@link http://dongsheng.org}
      * @covers stored_file::rename
-     * @covers ::<!public>
      */
     public function test_file_renaming() {
         global $CFG;
@@ -344,7 +338,6 @@ public function test_file_renaming() {
      *
      * @copyright 2012 Dongsheng Cai {@link http://dongsheng.org}
      * @covers ::create_file_from_reference
-     * @covers ::<!public>
      */
     public function test_create_file_from_reference() {
         global $CFG, $DB;
@@ -431,7 +424,6 @@ public function test_create_file_from_reference() {
      *
      * @copyright 2012 Dongsheng Cai {@link http://dongsheng.org}
      * @covers ::create_file_from_reference
-     * @covers ::<!public>
      */
     public function test_create_file_from_reference_with_content_hash() {
         global $CFG, $DB;
@@ -541,7 +533,6 @@ private function setup_three_private_files() {
      * Tests for get_area_files
      *
      * @covers ::get_area_files
-     * @covers ::<!public>
      */
     public function test_get_area_files() {
         $user = $this->setup_three_private_files();
@@ -602,7 +593,6 @@ public function test_get_area_files() {
      * Tests for get_area_tree
      *
      * @covers ::get_area_tree
-     * @covers ::<!public>
      */
     public function test_get_area_tree() {
         $user = $this->setup_three_private_files();
@@ -662,7 +652,6 @@ public function test_get_area_tree() {
      * Tests for get_file_by_id
      *
      * @covers ::get_file_by_id
-     * @covers ::<!public>
      */
     public function test_get_file_by_id() {
         $user = $this->setup_three_private_files();
@@ -684,7 +673,6 @@ public function test_get_file_by_id() {
      * Tests for get_file_by_hash
      *
      * @covers ::get_file_by_hash
-     * @covers ::<!public>
      */
     public function test_get_file_by_hash() {
         $user = $this->setup_three_private_files();
@@ -705,7 +693,6 @@ public function test_get_file_by_hash() {
      * Tests for get_external_files
      *
      * @covers ::get_external_files
-     * @covers ::<!public>
      */
     public function test_get_external_files() {
         $user = $this->setup_three_private_files();
@@ -772,7 +759,6 @@ public function test_get_external_files() {
      * Tests for create_directory with a negative contextid.
      *
      * @covers ::create_directory
-     * @covers ::<!public>
      */
     public function test_create_directory_contextid_negative() {
         $fs = get_file_storage();
@@ -785,7 +771,6 @@ public function test_create_directory_contextid_negative() {
      * Tests for create_directory with an invalid contextid.
      *
      * @covers ::create_directory
-     * @covers ::<!public>
      */
     public function test_create_directory_contextid_invalid() {
         $fs = get_file_storage();
@@ -798,7 +783,6 @@ public function test_create_directory_contextid_invalid() {
      * Tests for create_directory with an invalid component.
      *
      * @covers ::create_directory
-     * @covers ::<!public>
      */
     public function test_create_directory_component_invalid() {
         $fs = get_file_storage();
@@ -812,7 +796,6 @@ public function test_create_directory_component_invalid() {
      * Tests for create_directory with an invalid filearea.
      *
      * @covers ::create_directory
-     * @covers ::<!public>
      */
     public function test_create_directory_filearea_invalid() {
         $fs = get_file_storage();
@@ -826,7 +809,6 @@ public function test_create_directory_filearea_invalid() {
      * Tests for create_directory with a negative itemid
      *
      * @covers ::create_directory
-     * @covers ::<!public>
      */
     public function test_create_directory_itemid_negative() {
         $fs = get_file_storage();
@@ -840,7 +822,6 @@ public function test_create_directory_itemid_negative() {
      * Tests for create_directory with an invalid itemid
      *
      * @covers ::create_directory
-     * @covers ::<!public>
      */
     public function test_create_directory_itemid_invalid() {
         $fs = get_file_storage();
@@ -854,7 +835,6 @@ public function test_create_directory_itemid_invalid() {
      * Tests for create_directory with an invalid filepath
      *
      * @covers ::create_directory
-     * @covers ::<!public>
      */
     public function test_create_directory_filepath_invalid() {
         $fs = get_file_storage();
@@ -868,7 +848,6 @@ public function test_create_directory_filepath_invalid() {
      * Tests for get_directory_files.
      *
      * @covers ::get_directory_files
-     * @covers ::<!public>
      */
     public function test_get_directory_files() {
         $user = $this->setup_three_private_files();
@@ -931,7 +910,6 @@ public function test_get_directory_files() {
      * Tests for search_references.
      *
      * @covers ::search_references
-     * @covers ::<!public>
      */
     public function test_search_references() {
         $user = $this->setup_three_private_files();
@@ -1009,7 +987,6 @@ public function test_search_references() {
      * Tests for delete_area_files.
      *
      * @covers ::delete_area_files
-     * @covers ::<!public>
      */
     public function test_delete_area_files() {
         $user = $this->setup_three_private_files();
@@ -1030,7 +1007,6 @@ public function test_delete_area_files() {
      * Tests for delete_area_files using an itemid.
      *
      * @covers ::delete_area_files
-     * @covers ::<!public>
      */
     public function test_delete_area_files_itemid() {
         $user = $this->setup_three_private_files();
@@ -1050,7 +1026,6 @@ public function test_delete_area_files_itemid() {
      * Tests for delete_area_files_select.
      *
      * @covers ::delete_area_files_select
-     * @covers ::<!public>
      */
     public function test_delete_area_files_select() {
         $user = $this->setup_three_private_files();
@@ -1071,7 +1046,6 @@ public function test_delete_area_files_select() {
      * Tests for delete_component_files.
      *
      * @covers ::delete_component_files
-     * @covers ::<!public>
      */
     public function test_delete_component_files() {
         $user = $this->setup_three_private_files();
@@ -1088,7 +1062,6 @@ public function test_delete_component_files() {
      * Tests for create_file_from_url.
      *
      * @covers ::create_file_from_url
-     * @covers ::<!public>
      */
     public function test_create_file_from_url() {
         $this->resetAfterTest(true);
@@ -1124,7 +1097,6 @@ public function test_create_file_from_url() {
      * Tests for cron.
      *
      * @covers ::cron
-     * @covers ::<!public>
      */
     public function test_cron() {
         $this->resetAfterTest(true);
@@ -1141,7 +1113,6 @@ public function test_cron() {
      * Tests for is_area_empty.
      *
      * @covers ::is_area_empty
-     * @covers ::<!public>
      */
     public function test_is_area_empty() {
         $user = $this->setup_three_private_files();
@@ -1159,7 +1130,6 @@ public function test_is_area_empty() {
      * Tests for move_area_files_to_new_context.
      *
      * @covers ::move_area_files_to_new_context
-     * @covers ::<!public>
      */
     public function test_move_area_files_to_new_context() {
         $this->resetAfterTest(true);
@@ -1214,7 +1184,6 @@ public function test_move_area_files_to_new_context() {
      * Tests for convert_image.
      *
      * @covers ::convert_image
-     * @covers ::<!public>
      */
     public function test_convert_image() {
         global $CFG;
@@ -1248,7 +1217,6 @@ public function test_convert_image() {
      * Tests for convert_image with a PNG.
      *
      * @covers ::convert_image
-     * @covers ::<!public>
      */
     public function test_convert_image_png() {
         global $CFG;
@@ -1329,7 +1297,6 @@ private function generate_file_record() {
     /**
      * @expectedException        file_exception
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_file_invalid() {
         $this->resetAfterTest(true);
@@ -1346,7 +1313,6 @@ public function test_create_file_from_storedfile_file_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid contextid
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_contextid_invalid() {
         $this->resetAfterTest(true);
@@ -1367,7 +1333,6 @@ public function test_create_file_from_storedfile_contextid_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid component
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_component_invalid() {
         $this->resetAfterTest(true);
@@ -1388,7 +1353,6 @@ public function test_create_file_from_storedfile_component_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid filearea
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_filearea_invalid() {
         $this->resetAfterTest(true);
@@ -1409,7 +1373,6 @@ public function test_create_file_from_storedfile_filearea_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid itemid
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_itemid_invalid() {
         $this->resetAfterTest(true);
@@ -1430,7 +1393,6 @@ public function test_create_file_from_storedfile_itemid_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file path
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_filepath_invalid() {
         $this->resetAfterTest(true);
@@ -1451,7 +1413,6 @@ public function test_create_file_from_storedfile_filepath_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file name
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_filename_invalid() {
         $this->resetAfterTest(true);
@@ -1471,7 +1432,6 @@ public function test_create_file_from_storedfile_filename_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file timecreated
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_timecreated_invalid() {
         $this->resetAfterTest(true);
@@ -1492,7 +1452,6 @@ public function test_create_file_from_storedfile_timecreated_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file timemodified
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_timemodified_invalid() {
         $this->resetAfterTest(true);
@@ -1513,7 +1472,6 @@ public function test_create_file_from_storedfile_timemodified_invalid() {
      * @expectedException        stored_file_creation_exception
      * @expectedExceptionMessage Can not create file "1/core/phpunit/0/testfile.txt"
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile_duplicate() {
         $this->resetAfterTest(true);
@@ -1532,7 +1490,6 @@ public function test_create_file_from_storedfile_duplicate() {
      * Tests for create_file_from_storedfile.
      *
      * @covers ::create_file_from_storedfile
-     * @covers ::<!public>
      */
     public function test_create_file_from_storedfile() {
         $this->resetAfterTest(true);
@@ -1572,7 +1529,6 @@ public function test_create_file_from_storedfile() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid contextid
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_contextid_invalid() {
         $this->resetAfterTest(true);
@@ -1589,7 +1545,6 @@ public function test_create_file_from_string_contextid_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid component
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_component_invalid() {
         $this->resetAfterTest(true);
@@ -1606,7 +1561,6 @@ public function test_create_file_from_string_component_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid filearea
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_filearea_invalid() {
         $this->resetAfterTest(true);
@@ -1623,7 +1577,6 @@ public function test_create_file_from_string_filearea_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid itemid
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_itemid_invalid() {
         $this->resetAfterTest(true);
@@ -1640,7 +1593,6 @@ public function test_create_file_from_string_itemid_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file path
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_filepath_invalid() {
         $this->resetAfterTest(true);
@@ -1657,7 +1609,6 @@ public function test_create_file_from_string_filepath_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file name
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_filename_invalid() {
         $this->resetAfterTest(true);
@@ -1674,7 +1625,6 @@ public function test_create_file_from_string_filename_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file timecreated
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_timecreated_invalid() {
         $this->resetAfterTest(true);
@@ -1693,7 +1643,6 @@ public function test_create_file_from_string_timecreated_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file timemodified
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_timemodified_invalid() {
         $this->resetAfterTest(true);
@@ -1709,7 +1658,6 @@ public function test_create_file_from_string_timemodified_invalid() {
     /**
      * Tests for create_file_from_string with a duplicate string.
      * @covers ::create_file_from_string
-     * @covers ::<!public>
      */
     public function test_create_file_from_string_duplicate() {
         $this->resetAfterTest(true);
@@ -1728,7 +1676,6 @@ public function test_create_file_from_string_duplicate() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid contextid
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_contextid_invalid() {
         global $CFG;
@@ -1748,7 +1695,6 @@ public function test_create_file_from_pathname_contextid_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid component
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_component_invalid() {
         global $CFG;
@@ -1768,7 +1714,6 @@ public function test_create_file_from_pathname_component_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid filearea
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_filearea_invalid() {
         global $CFG;
@@ -1788,7 +1733,6 @@ public function test_create_file_from_pathname_filearea_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid itemid
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_itemid_invalid() {
         global $CFG;
@@ -1808,7 +1752,6 @@ public function test_create_file_from_pathname_itemid_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file path
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_filepath_invalid() {
         global $CFG;
@@ -1828,7 +1771,6 @@ public function test_create_file_from_pathname_filepath_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file name
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_filename_invalid() {
         global $CFG;
@@ -1848,7 +1790,6 @@ public function test_create_file_from_pathname_filename_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file timecreated
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_timecreated_invalid() {
         global $CFG;
@@ -1868,7 +1809,6 @@ public function test_create_file_from_pathname_timecreated_invalid() {
      * @expectedException        file_exception
      * @expectedExceptionMessage Invalid file timemodified
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_timemodified_invalid() {
         global $CFG;
@@ -1888,7 +1828,6 @@ public function test_create_file_from_pathname_timemodified_invalid() {
      * @expectedException        stored_file_creation_exception
      * @expectedExceptionMessage Can not create file "1/core/phpunit/0/testfile.txt"
      * @covers ::create_file_from_pathname
-     * @covers ::<!public>
      */
     public function test_create_file_from_pathname_duplicate_file() {
         global $CFG;
@@ -1910,7 +1849,6 @@ public function test_create_file_from_pathname_duplicate_file() {
      * Calling stored_file::delete_reference() on a non-reference file throws coding_exception
      *
      * @covers stored_file::delete_reference
-     * @covers ::<!public>
      */
     public function test_delete_reference_on_nonreference() {
 
@@ -1939,7 +1877,6 @@ public function test_delete_reference_on_nonreference() {
      * symlinks to the same original
      *
      * @covers stored_file::delete_reference
-     * @covers ::<!public>
      */
     public function test_delete_reference_one_symlink_does_not_rule_them_all() {
 
@@ -2109,7 +2046,6 @@ public function test_update_reference_internal() {
      * Tests for get_unused_filename.
      *
      * @covers ::get_unused_filename
-     * @covers ::<!public>
      */
     public function test_get_unused_filename() {
         global $USER;
@@ -2178,7 +2114,6 @@ public function test_get_unused_filename() {
      * file could not be found.
      *
      * @covers ::mimetype
-     * @covers ::<!public>
      */
     public function test_mimetype_not_found() {
         $mimetype = file_storage::mimetype('/path/to/nonexistent/file');
@@ -2194,7 +2129,6 @@ public function test_mimetype_not_found() {
      * errors and behaves as expected.
      *
      * @covers ::mimetype
-     * @covers ::<!public>
      */
     public function test_mimetype_known() {
         $filepath = __DIR__ . '/fixtures/testimage.jpg';
@@ -2207,7 +2141,6 @@ public function test_mimetype_known() {
      * file could not be found.
      *
      * @covers ::mimetype
-     * @covers ::<!public>
      */
     public function test_mimetype_from_file_not_found() {
         $mimetype = file_storage::mimetype_from_file('/path/to/nonexistent/file');
@@ -2223,7 +2156,6 @@ public function test_mimetype_from_file_not_found() {
      * errors and behaves as expected.
      *
      * @covers ::mimetype
-     * @covers ::<!public>
      */
     public function test_mimetype_from_file_known() {
         $filepath = __DIR__ . '/fixtures/testimage.jpg';
diff --git a/lib/filestorage/tests/file_system_filedir_test.php b/lib/filestorage/tests/file_system_filedir_test.php
index 76f75a294e236..7c33987e2dbe5 100644
--- a/lib/filestorage/tests/file_system_filedir_test.php
+++ b/lib/filestorage/tests/file_system_filedir_test.php
@@ -140,7 +140,6 @@ protected function get_testable_mock($mockedmethods = []) {
      * is not writable.
      *
      * @covers ::__construct
-     * @covers ::<!public>
      */
     public function test_readonly_filesystem_filedir() {
         $this->resetAfterTest();
@@ -165,7 +164,6 @@ public function test_readonly_filesystem_filedir() {
      * is not writable.
      *
      * @covers ::__construct
-     * @covers ::<!public>
      */
     public function test_readonly_filesystem_trashdir() {
         $this->resetAfterTest();
@@ -189,7 +187,6 @@ public function test_readonly_filesystem_trashdir() {
      * Test that the standard Moodle warning message is put into the filedir.
      *
      * @covers ::__construct
-     * @covers ::<!public>
      */
     public function test_warnings_put_in_place() {
         $this->resetAfterTest();
@@ -210,7 +207,6 @@ public function test_warnings_put_in_place() {
      * simply calls get_local_path_from_hash.
      *
      * @covers ::get_remote_path_from_hash
-     * @covers ::<!public>
      */
     public function test_get_remote_path_from_hash() {
         $filecontent = 'example content';
@@ -238,7 +234,6 @@ public function test_get_remote_path_from_hash() {
      * a failed recovery.
      *
      * @covers ::get_local_path_from_storedfile
-     * @covers ::<!public>
      */
     public function test_get_local_path_from_storedfile_with_recovery() {
         $filecontent = 'example content';
@@ -269,7 +264,6 @@ public function test_get_local_path_from_storedfile_with_recovery() {
      * a failed recovery.
      *
      * @covers ::get_local_path_from_storedfile
-     * @covers ::<!public>
      */
     public function test_get_local_path_from_storedfile_without_recovery() {
         $filecontent = 'example content';
@@ -303,7 +297,6 @@ public function test_get_local_path_from_storedfile_without_recovery() {
      * @param   string  $hashdir Expected format of content directory
      *
      * @covers ::get_fulldir_from_hash
-     * @covers ::<!public>
      */
     public function test_get_fulldir_from_hash($hash, $hashdir) {
         global $CFG;
@@ -326,7 +319,6 @@ public function test_get_fulldir_from_hash($hash, $hashdir) {
      * @param   string  $hashdir Expected format of content directory
      *
      * @covers ::get_fulldir_from_storedfile
-     * @covers ::<!public>
      */
     public function test_get_fulldir_from_storedfile($hash, $hashdir) {
         global $CFG;
@@ -359,7 +351,6 @@ public function test_get_fulldir_from_storedfile($hash, $hashdir) {
      * @param   string  $hashdir Expected format of content directory
      *
      * @covers ::get_contentdir_from_hash
-     * @covers ::<!public>
      */
     public function test_get_contentdir_from_hash($hash, $hashdir) {
         $method = new ReflectionMethod(file_system_filedir::class, 'get_contentdir_from_hash');
@@ -380,7 +371,6 @@ public function test_get_contentdir_from_hash($hash, $hashdir) {
      * @param   string  $hashdir Expected format of content directory
      *
      * @covers ::get_contentpath_from_hash
-     * @covers ::<!public>
      */
     public function test_get_contentpath_from_hash($hash, $hashdir) {
         $method = new ReflectionMethod(file_system_filedir::class, 'get_contentpath_from_hash');
@@ -402,7 +392,6 @@ public function test_get_contentpath_from_hash($hash, $hashdir) {
      * @param   string  $hashdir Expected format of content directory
      *
      * @covers ::get_trash_fullpath_from_hash
-     * @covers ::<!public>
      */
     public function test_get_trash_fullpath_from_hash($hash, $hashdir) {
         global $CFG;
@@ -425,7 +414,6 @@ public function test_get_trash_fullpath_from_hash($hash, $hashdir) {
      * @param   string  $hashdir Expected format of content directory
      *
      * @covers ::get_trash_fulldir_from_hash
-     * @covers ::<!public>
      */
     public function test_get_trash_fulldir_from_hash($hash, $hashdir) {
         global $CFG;
@@ -443,7 +431,6 @@ public function test_get_trash_fulldir_from_hash($hash, $hashdir) {
      * Ensure that copying a file to a target from a stored_file works as anticipated.
      *
      * @covers ::copy_content_from_storedfile
-     * @covers ::<!public>
      */
     public function test_copy_content_from_storedfile() {
         $this->resetAfterTest();
@@ -482,7 +469,6 @@ public function test_copy_content_from_storedfile() {
      * Ensure that content recovery works.
      *
      * @covers ::recover_file
-     * @covers ::<!public>
      */
     public function test_recover_file() {
         $this->resetAfterTest();
@@ -523,7 +509,6 @@ public function test_recover_file() {
      * Ensure that content recovery works.
      *
      * @covers ::recover_file
-     * @covers ::<!public>
      */
     public function test_recover_file_already_present() {
         $this->resetAfterTest();
@@ -563,7 +548,6 @@ public function test_recover_file_already_present() {
      * Ensure that content recovery works.
      *
      * @covers ::recover_file
-     * @covers ::<!public>
      */
     public function test_recover_file_size_mismatch() {
         $this->resetAfterTest();
@@ -601,7 +585,6 @@ public function test_recover_file_size_mismatch() {
      * Ensure that content recovery works.
      *
      * @covers ::recover_file
-     * @covers ::<!public>
      */
     public function test_recover_file_has_mismatch() {
         $this->resetAfterTest();
@@ -640,7 +623,6 @@ public function test_recover_file_has_mismatch() {
      * alt trash directory.
      *
      * @covers ::recover_file
-     * @covers ::<!public>
      */
     public function test_recover_file_alttrash() {
         $this->resetAfterTest();
@@ -676,7 +658,6 @@ public function test_recover_file_alttrash() {
      * file to the pool when the pool directory structure is not writable.
      *
      * @covers ::recover_file
-     * @covers ::<!public>
      */
     public function test_recover_file_contentdir_readonly() {
         $this->resetAfterTest();
@@ -714,7 +695,6 @@ public function test_recover_file_contentdir_readonly() {
      * Test adding a file to the pool.
      *
      * @covers ::add_file_from_path
-     * @covers ::<!public>
      */
     public function test_add_file_from_path() {
         $this->resetAfterTest();
@@ -751,7 +731,6 @@ public function test_add_file_from_path() {
      * unavailable file to the pool is attempted.
      *
      * @covers ::add_file_from_path
-     * @covers ::<!public>
      */
     public function test_add_file_from_path_file_unavailable() {
         $this->resetAfterTest();
@@ -772,7 +751,6 @@ public function test_add_file_from_path_file_unavailable() {
      * the wrong contenthash when adding a file to the pool.
      *
      * @covers ::add_file_from_path
-     * @covers ::<!public>
      */
     public function test_add_file_from_path_mismatched_hash() {
         $this->resetAfterTest();
@@ -795,7 +773,6 @@ public function test_add_file_from_path_mismatched_hash() {
      * file in the pool has the wrong contenthash
      *
      * @covers ::add_file_from_path
-     * @covers ::<!public>
      */
     public function test_add_file_from_path_existing_content_invalid() {
         $this->resetAfterTest();
@@ -841,7 +818,6 @@ public function test_add_file_from_path_existing_content_invalid() {
      * file to the pool when the pool directory structure is not writable.
      *
      * @covers ::add_file_from_path
-     * @covers ::<!public>
      */
     public function test_add_file_from_path_existing_cannot_write_hashpath() {
         $this->resetAfterTest();
@@ -875,7 +851,6 @@ public function test_add_file_from_path_existing_cannot_write_hashpath() {
      * Test adding a string to the pool.
      *
      * @covers ::add_file_from_string
-     * @covers ::<!public>
      */
     public function test_add_file_from_string() {
         $this->resetAfterTest();
@@ -903,7 +878,6 @@ public function test_add_file_from_string() {
      * string to the pool when the pool directory structure is not writable.
      *
      * @covers ::add_file_from_string
-     * @covers ::<!public>
      */
     public function test_add_file_from_string_existing_cannot_write_hashpath() {
         $this->resetAfterTest();
@@ -935,7 +909,6 @@ public function test_add_file_from_string_existing_cannot_write_hashpath() {
      * contenthash is already present.
      *
      * @covers ::add_file_from_string
-     * @covers ::<!public>
      */
     public function test_add_file_from_string_existing_matches() {
         $this->resetAfterTest();
@@ -970,7 +943,6 @@ public function test_add_file_from_string_existing_matches() {
      * Test the cleanup of deleted files when there are no files to delete.
      *
      * @covers ::remove_file
-     * @covers ::<!public>
      */
     public function test_remove_file_missing() {
         $this->resetAfterTest();
@@ -994,7 +966,6 @@ public function test_remove_file_missing() {
      * trash for that path.
      *
      * @covers ::remove_file
-     * @covers ::<!public>
      */
     public function test_remove_file_existing_trash() {
         $this->resetAfterTest();
@@ -1024,7 +995,6 @@ public function test_remove_file_existing_trash() {
      * Ensure that remove_file does nothing with an empty file.
      *
      * @covers ::remove_file
-     * @covers ::<!public>
      */
     public function test_remove_file_empty() {
         $this->resetAfterTest();
@@ -1048,7 +1018,6 @@ public function test_remove_file_empty() {
      * in use.
      *
      * @covers ::remove_file
-     * @covers ::<!public>
      */
     public function test_remove_file_in_use() {
         $this->resetAfterTest();
@@ -1082,7 +1051,6 @@ public function test_remove_file_in_use() {
      * longer in use.
      *
      * @covers ::remove_file
-     * @covers ::<!public>
      */
     public function test_remove_file_expired() {
         $this->resetAfterTest();
@@ -1115,7 +1083,6 @@ public function test_remove_file_expired() {
      * Test purging the cache.
      *
      * @covers ::empty_trash
-     * @covers ::<!public>
      */
     public function test_empty_trash() {
         $this->resetAfterTest();
diff --git a/lib/filestorage/tests/file_system_test.php b/lib/filestorage/tests/file_system_test.php
index fbcba725c8850..3f44311e39dfd 100644
--- a/lib/filestorage/tests/file_system_test.php
+++ b/lib/filestorage/tests/file_system_test.php
@@ -109,7 +109,6 @@ protected function get_testable_mock($mockedmethods = []) {
     /**
      * Ensure that the file system is not clonable.
      *
-     * @covers ::<!public>
      */
     public function test_not_cloneable() {
         $reflection = new ReflectionClass('file_system');
@@ -119,7 +118,6 @@ public function test_not_cloneable() {
     /**
      * Ensure that the filedir file_system extension is used by default.
      *
-     * @covers ::<!public>
      */
     public function test_default_class() {
         $this->resetAfterTest();
@@ -137,7 +135,6 @@ public function test_default_class() {
     /**
      * Ensure that the specified file_system extension class is used.
      *
-     * @covers ::<!public>
      */
     public function test_supplied_class() {
         global $CFG;
@@ -160,7 +157,6 @@ public function test_supplied_class() {
      * Test that the readfile function outputs content to disk.
      *
      * @covers ::readfile
-     * @covers ::<!public>
      */
     public function test_readfile_remote() {
         global $CFG;
@@ -194,7 +190,6 @@ public function test_readfile_remote() {
      * Test that the readfile function outputs content to disk.
      *
      * @covers ::readfile
-     * @covers ::<!public>
      */
     public function test_readfile_local() {
         global $CFG;
@@ -233,7 +228,6 @@ public function test_readfile_local() {
      * @param   bool    $fetch Whether the combination of args should have caused a fetch
      *
      * @covers ::get_local_path_from_storedfile
-     * @covers ::<!public>
      */
     public function test_get_local_path_from_storedfile($args, $fetch) {
         $filepath = '/path/to/file';
@@ -263,7 +257,6 @@ public function test_get_local_path_from_storedfile($args, $fetch) {
      * fetch.
      *
      * @covers ::get_remote_path_from_storedfile
-     * @covers ::<!public>
      */
     public function test_get_remote_path_from_storedfile() {
         $filepath = '/path/to/file';
@@ -296,7 +289,6 @@ public function test_get_remote_path_from_storedfile() {
      * Fetching the file is optional.
      *
      * @covers ::is_file_readable_locally_by_hash
-     * @covers ::<!public>
      */
     public function test_is_file_readable_locally_by_hash() {
         $filecontent = 'example content';
@@ -318,7 +310,6 @@ public function test_is_file_readable_locally_by_hash() {
      * Test the stock implementation of is_file_readable_locally_by_hash with an empty file.
      *
      * @covers ::is_file_readable_locally_by_hash
-     * @covers ::<!public>
      */
     public function test_is_file_readable_locally_by_hash_empty() {
         $filecontent = '';
@@ -338,7 +329,6 @@ public function test_is_file_readable_locally_by_hash_empty() {
      * Test the stock implementation of is_file_readable_remotely_by_storedfile with a valid file.
      *
      * @covers ::is_file_readable_remotely_by_hash
-     * @covers ::<!public>
      */
     public function test_is_file_readable_remotely_by_hash() {
         $filecontent = 'example content';
@@ -359,7 +349,6 @@ public function test_is_file_readable_remotely_by_hash() {
      * Test the stock implementation of is_file_readable_remotely_by_storedfile with a valid file.
      *
      * @covers ::is_file_readable_remotely_by_hash
-     * @covers ::<!public>
      */
     public function test_is_file_readable_remotely_by_hash_empty() {
         $filecontent = '';
@@ -379,7 +368,6 @@ public function test_is_file_readable_remotely_by_hash_empty() {
      * Test the stock implementation of is_file_readable_remotely_by_storedfile with a valid file.
      *
      * @covers ::is_file_readable_remotely_by_hash
-     * @covers ::<!public>
      */
     public function test_is_file_readable_remotely_by_hash_not_found() {
         $filecontent = 'example content';
@@ -400,7 +388,6 @@ public function test_is_file_readable_remotely_by_hash_not_found() {
      * Test the stock implementation of is_file_readable_remotely_by_storedfile with a valid file.
      *
      * @covers ::is_file_readable_remotely_by_storedfile
-     * @covers ::<!public>
      */
     public function test_is_file_readable_remotely_by_storedfile() {
         $file = $this->get_stored_file('example content');
@@ -419,7 +406,6 @@ public function test_is_file_readable_remotely_by_storedfile() {
      * Test the stock implementation of is_file_readable_remotely_by_storedfile with a valid file.
      *
      * @covers ::is_file_readable_remotely_by_storedfile
-     * @covers ::<!public>
      */
     public function test_is_file_readable_remotely_by_storedfile_empty() {
         $fs = $this->get_testable_mock([
@@ -437,7 +423,6 @@ public function test_is_file_readable_remotely_by_storedfile_empty() {
      * Test the stock implementation of is_file_readable_locally_by_storedfile with an empty file.
      *
      * @covers ::is_file_readable_locally_by_storedfile
-     * @covers ::<!public>
      */
     public function test_is_file_readable_locally_by_storedfile_empty() {
         $fs = $this->get_testable_mock([
@@ -455,7 +440,6 @@ public function test_is_file_readable_locally_by_storedfile_empty() {
      * Test the stock implementation of is_file_readable_remotely_by_storedfile with a valid file.
      *
      * @covers ::is_file_readable_locally_by_storedfile
-     * @covers ::<!public>
      */
     public function test_is_file_readable_remotely_by_storedfile_not_found() {
         $file = $this->get_stored_file('example content');
@@ -474,7 +458,6 @@ public function test_is_file_readable_remotely_by_storedfile_not_found() {
      * Test the stock implementation of is_file_readable_locally_by_storedfile with a valid file.
      *
      * @covers ::is_file_readable_locally_by_storedfile
-     * @covers ::<!public>
      */
     public function test_is_file_readable_locally_by_storedfile_unreadable() {
         $fs = $this->get_testable_mock([
@@ -493,7 +476,6 @@ public function test_is_file_readable_locally_by_storedfile_unreadable() {
      * Test the stock implementation of is_file_readable_locally_by_storedfile with a valid file should pass fetch.
      *
      * @covers ::is_file_readable_locally_by_storedfile
-     * @covers ::<!public>
      */
     public function test_is_file_readable_locally_by_storedfile_passes_fetch() {
         $fs = $this->get_testable_mock([
@@ -512,7 +494,6 @@ public function test_is_file_readable_locally_by_storedfile_passes_fetch() {
      * Ensure that is_file_removable returns correctly for an empty file.
      *
      * @covers ::is_file_removable
-     * @covers ::<!public>
      */
     public function test_is_file_removable_empty() {
         $filecontent = '';
@@ -528,7 +509,6 @@ public function test_is_file_removable_empty() {
      * Ensure that is_file_removable returns false if the file is still in use.
      *
      * @covers ::is_file_removable
-     * @covers ::<!public>
      */
     public function test_is_file_removable_in_use() {
         $this->resetAfterTest();
@@ -553,7 +533,6 @@ public function test_is_file_removable_in_use() {
      * Ensure that is_file_removable returns false if the file is not in use.
      *
      * @covers ::is_file_removable
-     * @covers ::<!public>
      */
     public function test_is_file_removable_not_in_use() {
         $this->resetAfterTest();
@@ -578,7 +557,6 @@ public function test_is_file_removable_not_in_use() {
      * Test the stock implementation of get_content.
      *
      * @covers ::get_content
-     * @covers ::<!public>
      */
     public function test_get_content() {
         global $CFG;
@@ -604,7 +582,6 @@ public function test_get_content() {
      * Test the stock implementation of get_content.
      *
      * @covers ::get_content
-     * @covers ::<!public>
      */
     public function test_get_content_empty() {
         global $CFG;
@@ -628,7 +605,6 @@ public function test_get_content_empty() {
      * file, and passes the path to the packer.
      *
      * @covers ::list_files
-     * @covers ::<!public>
      */
     public function test_list_files() {
         $filecontent = 'example content';
@@ -661,7 +637,6 @@ public function test_list_files() {
      * file, and passes the path to the packer.
      *
      * @covers ::extract_to_pathname
-     * @covers ::<!public>
      */
     public function test_extract_to_pathname() {
         $filecontent = 'example content';
@@ -695,7 +670,6 @@ public function test_extract_to_pathname() {
      * file, and passes the path to the packer.
      *
      * @covers ::extract_to_storage
-     * @covers ::<!public>
      */
     public function test_extract_to_storage() {
         $filecontent = 'example content';
@@ -737,7 +711,6 @@ public function test_extract_to_storage() {
      * Ensure that the add_storedfile_to_archive function requires a local copy of the
      * file, and passes the path to the archive.
      *
-     * @covers ::<!public>
      */
     public function test_add_storedfile_to_archive_directory() {
         $file = $this->get_stored_file('', '.');
@@ -774,7 +747,6 @@ public function test_add_storedfile_to_archive_directory() {
      * Ensure that the add_storedfile_to_archive function requires a local copy of the
      * file, and passes the path to the archive.
      *
-     * @covers ::<!public>
      */
     public function test_add_storedfile_to_archive_file() {
         $file = $this->get_stored_file('example content');
@@ -816,7 +788,6 @@ public function test_add_storedfile_to_archive_file() {
      * file, and passes the path to curl_file_create.
      *
      * @covers ::add_to_curl_request
-     * @covers ::<!public>
      */
     public function test_add_to_curl_request() {
         $file = $this->get_stored_file('example content');
@@ -841,7 +812,6 @@ public function test_add_to_curl_request() {
      * passed was deemed to not be an image.
      *
      * @covers ::get_imageinfo
-     * @covers ::<!public>
      */
     public function test_get_imageinfo_not_image() {
         $filecontent = 'example content';
@@ -863,7 +833,6 @@ public function test_get_imageinfo_not_image() {
      * Ensure that test_get_imageinfo_not_image returns imageinfo.
      *
      * @covers ::get_imageinfo
-     * @covers ::<!public>
      */
     public function test_get_imageinfo() {
         $filepath = '/path/to/file';
@@ -900,7 +869,6 @@ public function test_get_imageinfo() {
      * empty file size.
      *
      * @covers ::is_image_from_storedfile
-     * @covers ::<!public>
      */
     public function test_is_image_empty_filesize() {
         $filecontent = 'example content';
@@ -922,7 +890,6 @@ public function test_is_image_empty_filesize() {
      * @param   string  $mimetype Mimetype to test
      * @param   bool    $isimage Whether this mimetype should be detected as an image
      * @covers ::is_image_from_storedfile
-     * @covers ::<!public>
      */
     public function test_is_image_from_storedfile_mimetype($mimetype, $isimage) {
         $filecontent = 'example content';
@@ -941,7 +908,6 @@ public function test_is_image_from_storedfile_mimetype($mimetype, $isimage) {
      * for an image.
      *
      * @covers ::get_imageinfo_from_path
-     * @covers ::<!public>
      */
     public function test_get_imageinfo_from_path() {
         $filepath = __DIR__ . "/fixtures/testimage.jpg";
@@ -964,7 +930,6 @@ public function test_get_imageinfo_from_path() {
      * for a file which is not an image.
      *
      * @covers ::get_imageinfo_from_path
-     * @covers ::<!public>
      */
     public function test_get_imageinfo_from_path_no_image() {
         $filepath = __FILE__;
@@ -983,7 +948,6 @@ public function test_get_imageinfo_from_path_no_image() {
      * Ensure that get_content_file_handle returns a valid file handle.
      *
      * @covers ::get_content_file_handle
-     * @covers ::<!public>
      */
     public function test_get_content_file_handle_default() {
         $filecontent = 'example content';
@@ -1004,7 +968,6 @@ public function test_get_content_file_handle_default() {
      * Ensure that get_content_file_handle returns a valid file handle for a gz file.
      *
      * @covers ::get_content_file_handle
-     * @covers ::<!public>
      */
     public function test_get_content_file_handle_gz() {
         $filecontent = 'example content';
@@ -1024,7 +987,6 @@ public function test_get_content_file_handle_gz() {
      * Ensure that get_content_file_handle returns an exception when calling for a invalid file handle type.
      *
      * @covers ::get_content_file_handle
-     * @covers ::<!public>
      */
     public function test_get_content_file_handle_invalid() {
         $filecontent = 'example content';
@@ -1043,7 +1005,6 @@ public function test_get_content_file_handle_invalid() {
      * a file whose filename suggests mimetype.
      *
      * @covers ::mimetype_from_hash
-     * @covers ::<!public>
      */
     public function test_mimetype_from_hash_using_filename() {
         $filepath = '/path/to/file/not/currently/on/disk';
@@ -1063,7 +1024,6 @@ public function test_mimetype_from_hash_using_filename() {
      * a locally available file whose filename does not suggest mimetype.
      *
      * @covers ::mimetype_from_hash
-     * @covers ::<!public>
      */
     public function test_mimetype_from_hash_using_file_content() {
         $filecontent = 'example content';
@@ -1083,7 +1043,6 @@ public function test_mimetype_from_hash_using_file_content() {
      * a remotely available file whose filename does not suggest mimetype.
      *
      * @covers ::mimetype_from_hash
-     * @covers ::<!public>
      */
     public function test_mimetype_from_hash_using_file_content_remote() {
         $filepath = '/path/to/file/not/currently/on/disk';
@@ -1112,7 +1071,6 @@ public function test_mimetype_from_hash_using_file_content_remote() {
      * a file whose filename suggests mimetype.
      *
      * @covers ::mimetype_from_storedfile
-     * @covers ::<!public>
      */
     public function test_mimetype_from_storedfile_empty() {
         $file = $this->get_stored_file('');
@@ -1127,7 +1085,6 @@ public function test_mimetype_from_storedfile_empty() {
      * a file whose filename suggests mimetype.
      *
      * @covers ::mimetype_from_storedfile
-     * @covers ::<!public>
      */
     public function test_mimetype_from_storedfile_using_filename() {
         $filepath = '/path/to/file/not/currently/on/disk';
@@ -1145,7 +1102,6 @@ public function test_mimetype_from_storedfile_using_filename() {
      * a locally available file whose filename does not suggest mimetype.
      *
      * @covers ::mimetype_from_storedfile
-     * @covers ::<!public>
      */
     public function test_mimetype_from_storedfile_using_file_content() {
         $filepath = __DIR__ . "/fixtures/testimage.jpg";
@@ -1163,7 +1119,6 @@ public function test_mimetype_from_storedfile_using_file_content() {
      * a remotely available file whose filename does not suggest mimetype.
      *
      * @covers ::mimetype_from_storedfile
-     * @covers ::<!public>
      */
     public function test_mimetype_from_storedfile_using_file_content_remote() {
         $filepath = __DIR__ . "/fixtures/testimage.jpg";
@@ -1216,3 +1171,4 @@ public function get_local_path_from_storedfile_provider() {
         ];
     }
 }
+
diff --git a/lib/filterlib.php b/lib/filterlib.php
index f210a257de50d..a68f222fe3015 100644
--- a/lib/filterlib.php
+++ b/lib/filterlib.php
@@ -38,7 +38,7 @@
  *  keys. It must be something rare enough to avoid having matches with
  *  filterobjects. MDL-18165
  */
-define('TEXTFILTER_EXCL_SEPARATOR', '-%-');
+define('TEXTFILTER_EXCL_SEPARATOR', chr(0x1F) . '%' . chr(0x1F));
 
 
 /**
diff --git a/lib/form/dndupload.js b/lib/form/dndupload.js
index 8b4ed1577f372..2d460c4e1d71a 100644
--- a/lib/form/dndupload.js
+++ b/lib/form/dndupload.js
@@ -445,18 +445,27 @@ M.form_dndupload.init = function(Y, options) {
                 if (dispfilename.length > 50) {
                     dispfilename = dispfilename.substr(0, 49)+'&hellip;';
                 }
-                var progressouter = this.container.create('<span>'+dispfilename+': <span class="dndupload-progress-outer"><span class="dndupload-progress-inner">&nbsp;</span></span><br /></span>');
-                var progressinner = progressouter.one('.dndupload-progress-inner');
+                var progressouter = this.container.create(dispfilename +
+                    '<div class="progress">' +
+                    '   <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">' +
+                    '       <span class="sr-only"></span>' +
+                    '   </div>' +
+                    '</div>');
+                var progressinner = progressouter.one('.progress-bar');
+                var progressinnertext = progressinner.one('.sr-only');
                 var progresscontainer = this.container.one('.dndupload-progressbars');
                 progresscontainer.appendChild(progressouter);
 
                 this.progressbars[filename] = {
                     progressouter: progressouter,
-                    progressinner: progressinner
+                    progressinner: progressinner,
+                    progressinnertext: progressinnertext
                 };
             }
 
             this.progressbars[filename].progressinner.setStyle('width', percent + '%');
+            this.progressbars[filename].progressinner.setAttribute('aria-valuenow', percent);
+            this.progressbars[filename].progressinnertext.setContent(percent + '% ' + M.util.get_string('complete', 'moodle'));
         }
     };
 
diff --git a/lib/form/duration.php b/lib/form/duration.php
index 7fecd867fbb47..d1c8eee40aa53 100644
--- a/lib/form/duration.php
+++ b/lib/form/duration.php
@@ -241,10 +241,10 @@ function accept(&$renderer, $required = false, $error = null) {
      * Override of standard quickforms method.
      *
      * @param  array $submitValues
-     * @param  bool  $notused Not used.
+     * @param  bool  $assoc  whether to return the value as associative array
      * @return array field name => value. The value is the time interval in seconds.
      */
-    function exportValue(&$submitValues, $notused = false) {
+    function exportValue(&$submitValues, $assoc = false) {
         // Get the values from all the child elements.
         $valuearray = array();
         foreach ($this->_elements as $element) {
@@ -259,8 +259,8 @@ function exportValue(&$submitValues, $notused = false) {
             return null;
         }
         if ($this->_options['optional'] && empty($valuearray['enabled'])) {
-            return array($this->getName() => 0);
+            return $this->_prepareValue(0, $assoc);
         }
-        return array($this->getName() => $valuearray['number'] * $valuearray['timeunit']);
+        return $this->_prepareValue($valuearray['number'] * $valuearray['timeunit'], $assoc);
     }
 }
diff --git a/lib/form/float.php b/lib/form/float.php
index 8f375c2b986a3..e1685f207de46 100644
--- a/lib/form/float.php
+++ b/lib/form/float.php
@@ -175,12 +175,18 @@ public function _getPersistantData() {
      */
     private function format_float($value) {
         if (is_numeric($value)) {
-            if ($value > 0) {
-                $decimals = strlen($value) - strlen(floor($value)) - 1;
+            // We want to keep trailing zeros after the decimal point if there is any.
+            // Therefore we cannot just call format_float() and pass -1 as the number of decimal points.
+            $pieces = preg_split('/E/i', $value); // In case it is in the scientific format.
+            $decimalpos = strpos($pieces[0], '.');
+            if ($decimalpos !== false) {
+                $decimalpart = substr($pieces[0], $decimalpos + 1);
+                $decimals = strlen($decimalpart);
             } else {
-                $decimals = strlen($value) - strlen(ceil($value)) - 1;
+                $decimals = 0;
             }
-            $value = format_float($value, $decimals);
+            $pieces[0] = format_float($pieces[0], $decimals);
+            $value = implode('E', $pieces);
         }
         return $value;
     }
diff --git a/lib/form/modgrade.php b/lib/form/modgrade.php
index b843629f31fca..7983b6bb40fad 100644
--- a/lib/form/modgrade.php
+++ b/lib/form/modgrade.php
@@ -285,10 +285,18 @@ public function exportValue(&$submitvalues, $notused = false) {
     protected function process_value($type='none', $scale=null, $point=null, $rescalegrades=null) {
         global $COURSE;
         $val = 0;
-        if ($this->isupdate && $this->hasgrades && $this->canrescale && $this->currentgradetype == 'point' && empty($rescalegrades)) {
-            // If the maxgrade field is disabled with javascript, no value is sent with the form and mform assumes the default.
+
+        // If the maxgrade field is disabled with javascript, no value is sent with the form and mform assumes the default.
+        if ($this->isupdate && $this->hasgrades && $this->currentgradetype == 'point') {
+            // If the user cannot rescale, then return the original.
+            $returnoriginal = !$this->canrescale;
+
             // If the user was forced to choose a rescale option - and they haven't - prevent any changes to the max grade.
-            return (string)unformat_float($this->currentgrade);
+            $returnoriginal = $returnoriginal || ($this->canrescale && empty($rescalegrades));
+
+            if ($returnoriginal) {
+                return (string)unformat_float($this->currentgrade);
+            }
         }
         switch ($type) {
             case 'point':
diff --git a/lib/form/templatable_form_element.php b/lib/form/templatable_form_element.php
index 447a822c91898..870897da6f929 100644
--- a/lib/form/templatable_form_element.php
+++ b/lib/form/templatable_form_element.php
@@ -82,7 +82,8 @@ public function export_for_template(renderer_base $output) {
         $context['type'] = $this->getType();
         $context['attributes'] = implode(' ', $otherattributes);
         $context['emptylabel'] = ($this->getLabel() === '');
-        $context['iderror'] = preg_replace('/^id_/', 'id_error_', $context['id']);
+        $context['iderror'] = preg_replace('/_id_/', '_id_error_', $context['id']);
+        $context['iderror'] = preg_replace('/^id_/', 'id_error_', $context['iderror']);
 
         // Elements with multiple values need array syntax.
         if ($this->getAttribute('multiple')) {
diff --git a/lib/form/templates/element-checkbox.mustache b/lib/form/templates/element-checkbox.mustache
index 785290533ee2d..e83e49465e741 100644
--- a/lib/form/templates/element-checkbox.mustache
+++ b/lib/form/templates/element-checkbox.mustache
@@ -1,5 +1,10 @@
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
     <div class="col-md-3">
+        <span class="float-sm-right text-nowrap">
+            {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}}
+            {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
+            {{{helpbutton}}}
+        </span>
         {{#text}}
             <label for="{{element.id}}">
                 {{{label}}}
diff --git a/lib/form/templates/element-radio.mustache b/lib/form/templates/element-radio.mustache
index b052bda35a0ef..b0d5d73063054 100644
--- a/lib/form/templates/element-radio.mustache
+++ b/lib/form/templates/element-radio.mustache
@@ -20,7 +20,7 @@
     </div>
     <div class="col-md-9 checkbox">
         <div class="form-check">
-        <span class="text-nowrap">
+        <span>
             <label class="form-check-label">
                 {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
                     <input type="hidden" name="{{element.name}}" value="{{element.value}}">
diff --git a/lib/form/templates/element-select-inline.mustache b/lib/form/templates/element-select-inline.mustache
index 1dcb34fd0dd31..1400b4ce14f69 100644
--- a/lib/form/templates/element-select-inline.mustache
+++ b/lib/form/templates/element-select-inline.mustache
@@ -9,7 +9,8 @@
                    {{#error}}is-invalid{{/error}}"
         name="{{element.name}}"
         id="{{element.id}}"
-        {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
+        {{#element.multiple}}multiple{{/element.multiple}}
+        {{#element.size}}size="{{element.size}}"{{/element.size}}
         {{#error}}
             autofocus aria-describedby="{{element.iderror}}"
         {{/error}}
diff --git a/lib/form/templates/element-select.mustache b/lib/form/templates/element-select.mustache
index f701053acab37..1d320b302473c 100644
--- a/lib/form/templates/element-select.mustache
+++ b/lib/form/templates/element-select.mustache
@@ -102,7 +102,8 @@
                        {{#error}}is-invalid{{/error}}"
             name="{{element.name}}"
             id="{{element.id}}"
-            {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
+            {{#element.multiple}}multiple{{/element.multiple}}
+            {{#element.size}}size="{{element.size}}"{{/element.size}}
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
diff --git a/lib/form/templates/element-selectgroups-inline.mustache b/lib/form/templates/element-selectgroups-inline.mustache
index 0164335aafe8b..84b449dcbeaa4 100644
--- a/lib/form/templates/element-selectgroups-inline.mustache
+++ b/lib/form/templates/element-selectgroups-inline.mustache
@@ -4,6 +4,7 @@
     <select class="form-control custom-select {{#error}}is-invalid{{/error}}" name="{{element.name}}"
         id="{{element.id}}"
         {{#element.multiple}}multiple{{/element.multiple}}
+        {{#element.size}}size="{{element.size}}"{{/element.size}}
         {{#error}}
             autofocus aria-describedby="{{element.iderror}}"
         {{/error}}
diff --git a/lib/form/templates/element-selectgroups.mustache b/lib/form/templates/element-selectgroups.mustache
index 15738f722b878..987e9962377a7 100644
--- a/lib/form/templates/element-selectgroups.mustache
+++ b/lib/form/templates/element-selectgroups.mustache
@@ -4,6 +4,7 @@
         <select class="form-control custom-select {{#error}}is-invalid{{/error}}" name="{{element.name}}"
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
+            {{#element.size}}size="{{element.size}}"{{/element.size}}
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
diff --git a/lib/form/templates/element-selectwithlink.mustache b/lib/form/templates/element-selectwithlink.mustache
index b49e0a5154b44..28c58745ad897 100644
--- a/lib/form/templates/element-selectwithlink.mustache
+++ b/lib/form/templates/element-selectwithlink.mustache
@@ -4,6 +4,7 @@
         <select class="custom-select {{#error}}is-invalid{{/error}}" name="{{element.name}}"
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
+            {{#element.size}}size="{{element.size}}"{{/element.size}}
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
diff --git a/lib/form/templates/element-textarea.mustache b/lib/form/templates/element-textarea.mustache
index 7b7750ef637c6..41eb2b4005627 100644
--- a/lib/form/templates/element-textarea.mustache
+++ b/lib/form/templates/element-textarea.mustache
@@ -1,6 +1,5 @@
 {{< core_form/element-template }}
     {{$element}}
-        {{^element.frozen}}
         <textarea
             name="{{element.name}}"
             id="{{element.id}}"
@@ -8,10 +7,10 @@
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
-            {{{element.attributes}}} >{{element.value}}</textarea>
-        {{/element.frozen}}
-        {{#element.frozen}}
-            {{element.value}}
-        {{/element.frozen}}
+            {{{element.attributes}}}
+            {{#element.frozen}}
+            readonly {{#element.hardfrozen}}disabled{{/element.hardfrozen}}
+            {{/element.frozen}}
+        >{{element.value}}</textarea>
     {{/element}}
 {{/ core_form/element-template }}
diff --git a/lib/form/tests/behat/autocomplete.feature b/lib/form/tests/behat/autocomplete.feature
new file mode 100644
index 0000000000000..b6882dfaa65dd
--- /dev/null
+++ b/lib/form/tests/behat/autocomplete.feature
@@ -0,0 +1,28 @@
+@core @javascript @core_form
+Feature: Autocomplete functionality in forms
+  For forms including autocomplete elements
+  As a user
+  I need to use the autocomplete form element
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname |
+      | user1    | Jane      | Jones    |
+      | user2    | Sam       | Smith    |
+    And I log in as "admin"
+
+  Scenario: Use autocomplete element which accepts a single value
+    When I navigate to "Users > Privacy and policies > Data requests" in site administration
+    And I follow "New request"
+    And I open the autocomplete suggestions list
+    And I click on "Jane Jones" item in the autocomplete list
+    Then "Jane Jones" "autocomplete_selection" should exist
+    # Change selection
+    And I open the autocomplete suggestions list
+    And I click on "Sam Smith" item in the autocomplete list
+    And "Sam Smith" "autocomplete_selection" should exist
+    And "Jane Jones" "autocomplete_selection" should not exist
+    # Remove selection
+    And I click on "Sam Smith" "autocomplete_selection"
+    And "Sam Smith" "autocomplete_selection" should not exist
+    And I should see "No selection" in the ".form-autocomplete-selection" "css_element"
\ No newline at end of file
diff --git a/lib/form/tests/duration_test.php b/lib/form/tests/duration_test.php
index 35900d9372a4a..af5bba5d521b6 100644
--- a/lib/form/tests/duration_test.php
+++ b/lib/form/tests/duration_test.php
@@ -108,25 +108,43 @@ public function test_seconds_to_unit() {
      * Testcase to check generated timestamp
      */
     public function test_exportValue() {
+        /** @var MoodleQuickForm_duration $el */
         $el = $this->mform->addElement('duration', 'testel');
         $values = array('testel' => array('number' => 10, 'timeunit' => 1));
-        $this->assertEquals(array('testel' => 10), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 10), $el->exportValue($values, true));
+        $this->assertEquals(10, $el->exportValue($values));
         $values = array('testel' => array('number' => 3, 'timeunit' => 60));
-        $this->assertEquals(array('testel' => 180), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 180), $el->exportValue($values, true));
+        $this->assertEquals(180, $el->exportValue($values));
         $values = array('testel' => array('number' => 1.5, 'timeunit' => 60));
-        $this->assertEquals(array('testel' => 90), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 90), $el->exportValue($values, true));
+        $this->assertEquals(90, $el->exportValue($values));
         $values = array('testel' => array('number' => 2, 'timeunit' => 3600));
-        $this->assertEquals(array('testel' => 7200), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 7200), $el->exportValue($values, true));
+        $this->assertEquals(7200, $el->exportValue($values));
         $values = array('testel' => array('number' => 1, 'timeunit' => 86400));
-        $this->assertEquals(array('testel' => 86400), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 86400), $el->exportValue($values, true));
+        $this->assertEquals(86400, $el->exportValue($values));
         $values = array('testel' => array('number' => 0, 'timeunit' => 3600));
-        $this->assertEquals(array('testel' => 0), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 0), $el->exportValue($values, true));
+        $this->assertEquals(0, $el->exportValue($values));
 
         $el = $this->mform->addElement('duration', 'testel', null, array('optional' => true));
         $values = array('testel' => array('number' => 10, 'timeunit' => 1));
-        $this->assertEquals(array('testel' => 0), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 0), $el->exportValue($values, true));
+        $this->assertEquals(0, $el->exportValue($values));
         $values = array('testel' => array('number' => 20, 'timeunit' => 1, 'enabled' => 1));
-        $this->assertEquals(array('testel' => 20), $el->exportValue($values));
+        $this->assertEquals(array('testel' => 20), $el->exportValue($values, true));
+        $this->assertEquals(20, $el->exportValue($values));
+
+        // Optional element.
+        $el2 = $this->mform->addElement('duration', 'testel', '', ['optional' => true]);
+        $values = array('testel' => array('number' => 10, 'timeunit' => 1, 'enabled' => 1));
+        $this->assertEquals(array('testel' => 10), $el2->exportValue($values, true));
+        $this->assertEquals(10, $el2->exportValue($values));
+        $values = array('testel' => array('number' => 10, 'timeunit' => 1, 'enabled' => 0));
+        $this->assertEquals(array('testel' => 0), $el2->exportValue($values, true));
+        $this->assertEquals(null, $el2->exportValue($values));
     }
 }
 
diff --git a/lib/formslib.php b/lib/formslib.php
index bc0d5812326c4..2dd9b33a90c7d 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -1448,6 +1448,16 @@ public function set_display_vertical() {
         $oldclass = $this->_form->getAttribute('class');
         $this->_form->updateAttributes(array('class' => $oldclass . ' full-width-labels'));
     }
+
+    /**
+     * Set the initial 'dirty' state of the form.
+     *
+     * @param bool $state
+     * @since Moodle 3.7.1
+     */
+    public function set_initial_dirty_state($state = false) {
+        $this->_form->set_initial_dirty_state($state);
+    }
 }
 
 /**
@@ -1503,6 +1513,13 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
     /** @var bool whether to automatically initialise M.formchangechecker for this form. */
     protected $_use_form_change_checker = true;
 
+    /**
+     * The initial state of the dirty state.
+     *
+     * @var bool
+     */
+    protected $_initial_form_dirty_state = false;
+
     /**
      * The form name is derived from the class name of the wrapper minus the trailing form
      * It is a name with words joined by underscores whereas the id attribute is words joined by underscores.
@@ -1721,6 +1738,26 @@ function setDisableShortforms ($disable = true) {
         $this->_disableShortforms = $disable;
     }
 
+    /**
+     * Set the initial 'dirty' state of the form.
+     *
+     * @param bool $state
+     * @since Moodle 3.7.1
+     */
+    public function set_initial_dirty_state($state = false) {
+        $this->_initial_form_dirty_state = $state;
+    }
+
+    /**
+     * Is the form currently set to dirty?
+     *
+     * @return boolean Initial dirty state.
+     * @since Moodle 3.7.1
+     */
+    public function is_dirty() {
+        return $this->_initial_form_dirty_state;
+    }
+
     /**
      * Call this method if you don't want the formchangechecker JavaScript to be
      * automatically initialised for this form.
@@ -2433,14 +2470,16 @@ function validate_' . $this->_formName . '_' . $escapedElementName . '(element,
 ';
                 }
             }
+            // This handles both randomised (MDL-65217) and non-randomised IDs.
+            $errorid = preg_replace('/^id_/', 'id_error_', $this->_attributes['id']);
             $validateJS .= '
       ret = validate_' . $this->_formName . '_' . $escapedElementName.'(frm.elements[\''.$elementName.'\'], \''.$escapedElementName.'\') && ret;
       if (!ret && !first_focus) {
         first_focus = true;
         Y.use(\'moodle-core-event\', function() {
             Y.Global.fire(M.core.globalEvents.FORM_ERROR, {formid: \'' . $this->_attributes['id'] . '\',
-                                                           elementid: \'id_error_' . $escapedElementName . '\'});
-            document.getElementById(\'id_error_' . $escapedElementName . '\').focus();
+                                                           elementid: \'' . $errorid. '\'});
+            document.getElementById(\'' . $errorid . '\').focus();
         });
       }
 ';
@@ -2964,7 +3003,8 @@ function startForm(&$form){
             $PAGE->requires->yui_module('moodle-core-formchangechecker',
                     'M.core_formchangechecker.init',
                     array(array(
-                        'formid' => $formid
+                        'formid' => $formid,
+                        'initialdirtystate' => $form->is_dirty(),
                     ))
             );
             $PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');
diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index a668f23be5947..f9130cdec065d 100644
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -2589,13 +2589,14 @@ public static function set_properties(&$instance, $params) {
      */
     public function set_hidden($hidden, $cascade=false) {
         $this->load_grade_item();
-        //this hides the associated grade item (the course total)
-        $this->grade_item->set_hidden($hidden, $cascade);
         //this hides the category itself and everything it contains
         parent::set_hidden($hidden, $cascade);
 
         if ($cascade) {
 
+            // This hides the associated grade item (the course/category total).
+            $this->grade_item->set_hidden($hidden, $cascade);
+
             if ($children = grade_item::fetch_all(array('categoryid'=>$this->id))) {
 
                 foreach ($children as $child) {
@@ -2619,9 +2620,7 @@ public function set_hidden($hidden, $cascade=false) {
             if ($category_array && array_key_exists($this->parent, $category_array)) {
                 $category = $category_array[$this->parent];
                 //call set_hidden on the category regardless of whether it is hidden as its parent might be hidden
-                //if($category->is_hidden()) {
-                    $category->set_hidden($hidden, false);
-                //}
+                $category->set_hidden($hidden, false);
             }
         }
     }
diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index 769f69dfd3c53..185b74ac8d1c0 100644
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -670,9 +670,7 @@ public function set_hidden($hidden, $cascade=false) {
             if ($category_array && array_key_exists($this->categoryid, $category_array)) {
                 $category = $category_array[$this->categoryid];
                 //call set_hidden on the category regardless of whether it is hidden as its parent might be hidden
-                //if($category->is_hidden()) {
-                    $category->set_hidden($hidden, false);
-                //}
+                $category->set_hidden($hidden, false);
             }
         }
     }
diff --git a/lib/grade/tests/grade_category_test.php b/lib/grade/tests/grade_category_test.php
index 86201f1f6c0ac..03a6fe1e52715 100644
--- a/lib/grade/tests/grade_category_test.php
+++ b/lib/grade/tests/grade_category_test.php
@@ -63,6 +63,7 @@ public function test_grade_category() {
         $this->sub_test_grade_category_is_hidden();
         $this->sub_test_grade_category_set_hidden();
         $this->sub_test_grade_category_can_control_visibility();
+        $this->sub_test_grade_category_total_visibility();
 
         // This won't work until MDL-11837 is complete.
         // $this->sub_test_grade_category_generate_grades();
@@ -784,7 +785,7 @@ protected function sub_test_grade_category_is_hidden() {
     protected function sub_test_grade_category_set_hidden() {
         $category = new grade_category($this->grade_categories[0]);
         $this->assertTrue(method_exists($category, 'set_hidden'));
-        $category->set_hidden(1);
+        $category->set_hidden(1, true);
         $category->load_grade_item();
         $this->assertEquals(true, $category->grade_item->is_hidden());
     }
@@ -858,4 +859,43 @@ protected function sub_test_grade_category_aggregation_uses_extracredit() {
         $this->assertFalse(grade_category::aggregation_uses_extracredit(GRADE_AGGREGATE_MIN));
         $this->assertFalse(grade_category::aggregation_uses_extracredit(GRADE_AGGREGATE_MODE));
     }
+
+    /**
+     * Test for category total visibility.
+     */
+    protected function sub_test_grade_category_total_visibility() {
+        // 15 is a manual grade item in grade_categories[5].
+        $category = new grade_category($this->grade_categories[5], true);
+        $gradeitem = new grade_item($this->grade_items[15], true);
+
+        // Hide grade category.
+        $category->set_hidden(true, true);
+        $this->assertTrue($category->is_hidden());
+        // Category total is hidden.
+        $categorytotal = $category->get_grade_item();
+        $this->assertTrue($categorytotal->is_hidden());
+        // Manual grade is hidden.
+        $gradeitem->update_from_db();
+        $this->assertTrue($gradeitem->is_hidden());
+
+        // Unhide manual grade item.
+        $gradeitem->set_hidden(false);
+        $this->assertFalse($gradeitem->is_hidden());
+        // Category is unhidden.
+        $category->update_from_db();
+        $this->assertFalse($category->is_hidden());
+        // Category total remain hidden.
+        $categorytotal = $category->get_grade_item();
+        $this->assertTrue($categorytotal->is_hidden());
+
+        // Edit manual grade item.
+        $this->assertFalse($gradeitem->is_locked());
+        $gradeitem->set_locked(true);
+        $gradeitem->update_from_db();
+        $this->assertTrue($gradeitem->is_locked());
+        // Category total should still be hidden.
+        $category->update_from_db();
+        $categorytotal = $category->get_grade_item();
+        $this->assertTrue($categorytotal->is_hidden());
+    }
 }
diff --git a/lib/installlib.php b/lib/installlib.php
index 48bcdef79a369..e412b7d86d083 100644
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -179,6 +179,9 @@ function install_helpbutton($url, $title='') {
  * @return string
  */
 function install_db_validate($database, $dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions) {
+    if (!preg_match('/^[a-z_]*$/', $prefix)) {
+        return get_string('invaliddbprefix', 'install');
+    }
     try {
         try {
             $database->connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions);
@@ -380,9 +383,9 @@ function install_print_footer($config, $reload=false) {
     global $CFG;
 
     if ($config->stage > INSTALL_WELCOME) {
-        $first = '<input type="submit" id="previousbutton" class="btn btn-secondary" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
+        $first = '<input type="submit" id="previousbutton" class="btn btn-secondary ml-auto" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
     } else {
-        $first = '<input type="submit" id="previousbutton" class="btn btn-secondary" name="next" value="'.s(get_string('reload')).'" />';
+        $first = '<input type="submit" id="previousbutton" class="btn btn-secondary ml-auto" name="next" value="'.s(get_string('reload')).'" />';
         $first .= '<script type="text/javascript">
 //<![CDATA[
     var first = document.getElementById("previousbutton");
@@ -393,12 +396,12 @@ function install_print_footer($config, $reload=false) {
     }
 
     if ($reload) {
-        $next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1" name="next" value="'.s(get_string('reload')).'" />';
+        $next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1 mr-auto" name="next" value="'.s(get_string('reload')).'" />';
     } else {
-        $next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1" name="next" value="'.s(get_string('next')).' &raquo;" />';
+        $next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1 mr-auto" name="next" value="'.s(get_string('next')).' &raquo;" />';
     }
 
-    echo '</fieldset><fieldset id="nav_buttons" class="mb-3">'.$first.$next.'</fieldset>';
+    echo '</fieldset><div id="nav_buttons" class="mb-3 btn-group w-100 flex-row-reverse">'.$next.$first.'</div>';
 
     $homelink  = '<div class="sitelink">'.
        '<a title="Moodle '. $CFG->target_release .'" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">'.
diff --git a/lib/maxmind/readme_moodle.txt b/lib/maxmind/readme_moodle.txt
index e960210a053d7..ae75692851284 100644
--- a/lib/maxmind/readme_moodle.txt
+++ b/lib/maxmind/readme_moodle.txt
@@ -27,4 +27,4 @@ unzip v1.1.3.zip
 mv GeoIP2-php-2.6.0/src/ /path/to/moodle/lib/maxmind/GeoIp2/
 mv MaxMind-DB-Reader-php-1.1.3/src/MaxMind/ /path/to/moodle/lib/maxmind/MaxMind/
 
-4) Run unit tests on iplookup/tests/geoip_test.php with PHPUNIT_LONGTEST defined.
+4) Run unit tests on iplookup/tests/geoip_test.php.
diff --git a/lib/mlbackend/python/classes/processor.php b/lib/mlbackend/python/classes/processor.php
index fa6bfe51cd702..48483e23dd2f5 100644
--- a/lib/mlbackend/python/classes/processor.php
+++ b/lib/mlbackend/python/classes/processor.php
@@ -38,7 +38,7 @@ class processor implements  \core_analytics\classifier, \core_analytics\regresso
     /**
      * The required version of the python package that performs all calculations.
      */
-    const REQUIRED_PIP_PACKAGE_VERSION = '1.0.0';
+    const REQUIRED_PIP_PACKAGE_VERSION = '1.0.1';
 
     /**
      * The path to the Python bin.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 820dc47554593..e7f5e847be48f 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -491,11 +491,10 @@
  */
 define('HUB_HUBDIRECTORYURL', "https://hubdirectory.moodle.org");
 
-
 /**
- * Moodle.net url (should be moodle.net)
+ * URL of the Moodle sites registration portal.
  */
-define('HUB_MOODLEORGHUBURL', "https://moodle.net");
+defined('HUB_MOODLEORGHUBURL') || define('HUB_MOODLEORGHUBURL', 'https://stats.moodle.org');
 define('HUB_OLDMOODLEORGHUBURL', "http://hub.moodle.org");
 
 /**
@@ -1412,6 +1411,14 @@ function set_config($name, $value, $plugin=null) {
                 $config->value = $value;
                 $DB->insert_record('config', $config, false);
             }
+            // When setting config during a Behat test (in the CLI script, not in the web browser
+            // requests), remember which ones are set so that we can clear them later.
+            if (defined('BEHAT_TEST')) {
+                if (!property_exists($CFG, 'behat_cli_added_config')) {
+                    $CFG->behat_cli_added_config = [];
+                }
+                $CFG->behat_cli_added_config[$name] = true;
+            }
         }
         if ($name === 'siteidentifier') {
             cache_helper::update_site_identifier($value);
@@ -3223,6 +3230,8 @@ function require_user_key_login($script, $instance = null, $keyvalue = null) {
         print_error('invaliduserid');
     }
 
+    core_user::require_active_user($user, true, true);
+
     // Emulate normal session.
     enrol_check_plugins($user);
     \core\session\manager::set_user($user);
@@ -4211,8 +4220,17 @@ function delete_user(stdClass $user) {
     // This might be slow but it is really needed - modules might do some extra cleanup!
     role_unassign_all(array('userid' => $user->id));
 
+    // Notify the competency subsystem.
+    \core_competency\api::hook_user_deleted($user->id);
+
     // Now do a brute force cleanup.
 
+    // Delete all user events and subscription events.
+    $DB->delete_records_select('event', 'userid = :userid AND subscriptionid IS NOT NULL', ['userid' => $user->id]);
+
+    // Now, delete all calendar subscription from the user.
+    $DB->delete_records('event_subscriptions', ['userid' => $user->id]);
+
     // Remove from all cohorts.
     $DB->delete_records('cohort_members', array('userid' => $user->id));
 
@@ -4818,7 +4836,12 @@ function get_complete_user_data($field, $value, $mnethostid = null, $throwexcept
     $field = core_text::strtolower($field);
 
     // List of case insensitive fields.
-    $caseinsensitivefields = ['username', 'email'];
+    $caseinsensitivefields = ['email'];
+
+    // Username input is forced to lowercase and should be case sensitive.
+    if ($field == 'username') {
+        $value = core_text::strtolower($value);
+    }
 
     // Build the WHERE clause for an SQL query.
     $params = array('fieldval' => $value);
@@ -5762,7 +5785,7 @@ function get_mailer($action='get') {
         } else {
             // Use SMTP directly.
             $mailer->isSMTP();
-            if (!empty($CFG->debugsmtp)) {
+            if (!empty($CFG->debugsmtp) && (!empty($CFG->debugdeveloper))) {
                 $mailer->SMTPDebug = 3;
             }
             // Specify main and backup servers.
@@ -7027,21 +7050,12 @@ function current_language() {
  */
 function get_parent_language($lang=null) {
 
-    // Let's hack around the current language.
-    if (!empty($lang)) {
-        $oldforcelang = force_current_language($lang);
-    }
+    $parentlang = get_string_manager()->get_string('parentlanguage', 'langconfig', null, $lang);
 
-    $parentlang = get_string('parentlanguage', 'langconfig');
     if ($parentlang === 'en') {
         $parentlang = '';
     }
 
-    // Let's hack around the current language.
-    if (!empty($lang)) {
-        force_current_language($oldforcelang);
-    }
-
     return $parentlang;
 }
 
@@ -8593,9 +8607,10 @@ function generate_password($maxlen=10) {
  * then it will display '5.4' instead of '5.400' or '5' instead of '5.000'.
  *
  * @param float $float The float to print
- * @param int $decimalpoints The number of decimal places to print.
+ * @param int $decimalpoints The number of decimal places to print. -1 is a special value for auto detect (full precision).
  * @param bool $localized use localized decimal separator
- * @param bool $stripzeros If true, removes final zeros after decimal point
+ * @param bool $stripzeros If true, removes final zeros after decimal point. It will be ignored and the trailing zeros after
+ *                         the decimal point are always striped if $decimalpoints is -1.
  * @return string locale float
  */
 function format_float($float, $decimalpoints=1, $localized=true, $stripzeros=false) {
@@ -8607,10 +8622,17 @@ function format_float($float, $decimalpoints=1, $localized=true, $stripzeros=fal
     } else {
         $separator = '.';
     }
+    if ($decimalpoints == -1) {
+        // The following counts the number of decimals.
+        // It is safe as both floatval() and round() functions have same behaviour when non-numeric values are provided.
+        $floatval = floatval($float);
+        for ($decimalpoints = 0; $floatval != round($float, $decimalpoints); $decimalpoints++);
+    }
+
     $result = number_format($float, $decimalpoints, $separator, '');
     if ($stripzeros) {
         // Remove zeros and final dot if not needed.
-        $result = preg_replace('~(' . preg_quote($separator) . ')?0+$~', '', $result);
+        $result = preg_replace('~(' . preg_quote($separator, '~') . ')?0+$~', '', $result);
     }
     return $result;
 }
@@ -9464,7 +9486,7 @@ function get_performance_info() {
                     $mode = ' <span title="request cache">[r]</span>';
                     break;
             }
-            $html .= '<ul class="cache-definition-stats list-unstyled ml-1 mb-1 cache-mode-'.$modeclass.' card d-inline-block">';
+            $html .= '<li class="d-inline-flex"><ul class="cache-definition-stats list-unstyled ml-1 mb-1 cache-mode-'.$modeclass.' card d-inline-block">';
             $html .= '<li class="cache-definition-stats-heading p-t-1 card-header bg-dark bg-inverse font-weight-bold">' .
                 $definition . $mode.'</li>';
             $text .= "$definition {";
@@ -9487,7 +9509,7 @@ function get_performance_info() {
                     $html .= "<li class=\"cache-store-stats $cachestoreclass p-x-1\">&nbsp;</li>";
                 }
             }
-            $html .= '</ul>';
+            $html .= '</ul></li>';
             $text .= '} ';
         }
         $html .= '</ul> ';
diff --git a/lib/myprofilelib.php b/lib/myprofilelib.php
index 397d5b3e16c9c..87c792dbcd160 100644
--- a/lib/myprofilelib.php
+++ b/lib/myprofilelib.php
@@ -227,7 +227,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
         $tree->add_node($node);
     }
 
-    if (!isset($hiddenfields['mycourses'])) {
+    if ($iscurrentuser || !isset($hiddenfields['mycourses'])) {
         $showallcourses = optional_param('showallcourses', 0, PARAM_INT);
         if ($mycourses = enrol_get_all_users_courses($user->id, true, null)) {
             $shown = 0;
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index bae521fa62810..13711e0bcc1b5 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -1483,9 +1483,7 @@ public function initialise() {
         }
 
         // Give the local plugins a chance to include some navigation if they want.
-        foreach (get_plugin_list_with_function('local', 'extend_navigation') as $function) {
-            $function($this);
-        }
+        $this->load_local_plugin_navigation();
 
         // Remove any empty root nodes
         foreach ($this->rootnodes as $node) {
@@ -1517,6 +1515,15 @@ public function initialise() {
         return true;
     }
 
+    /**
+     * This function gives local plugins an opportunity to modify navigation.
+     */
+    protected function load_local_plugin_navigation() {
+        foreach (get_plugin_list_with_function('local', 'extend_navigation') as $function) {
+            $function($this);
+        }
+    }
+
     /**
      * Returns true if the current user is a parent of the user being currently viewed.
      *
@@ -3261,6 +3268,9 @@ public function initialise() {
             $this->load_for_user(null, true);
         }
 
+        // Give the local plugins a chance to include some navigation if they want.
+        $this->load_local_plugin_navigation();
+
         $this->find_expandable($this->expandable);
         return $this->expandable;
     }
@@ -4530,13 +4540,6 @@ protected function load_course_settings($forceopen = false) {
             $coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, 'import', new pix_icon('i/import', ''));
         }
 
-        // Publish course on a hub
-        if ($adminoptions->publish) {
-            $url = new moodle_url('/course/publish/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('publish', 'core_hub'), $url, self::TYPE_SETTING, null, 'publish',
-                new pix_icon('i/publish', ''));
-        }
-
         // Reset this course
         if ($adminoptions->reset) {
             $url = new moodle_url('/course/reset.php', array('id'=>$course->id));
diff --git a/lib/outputfragmentrequirementslib.php b/lib/outputfragmentrequirementslib.php
index 0ae13fbb7899b..da753ef3332eb 100644
--- a/lib/outputfragmentrequirementslib.php
+++ b/lib/outputfragmentrequirementslib.php
@@ -57,8 +57,10 @@ protected function get_amd_footercode() {
         $output = '';
 
         // First include must be to a module with no dependencies, this prevents multiple requests.
-        $prefix = "require(['core/first'], function() {\n";
+        $prefix = 'M.util.js_pending("core/first");';
+        $prefix .= "require(['core/first'], function() {\n";
         $suffix = "\n});";
+        $suffix .= 'M.util.js_complete("core/first");';
         $output .= html_writer::script($prefix . implode(";\n", $this->amdjscode) . $suffix);
         return $output;
     }
diff --git a/lib/outputlib.php b/lib/outputlib.php
index a62786a6c413a..9863eac7b3f0d 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -739,7 +739,11 @@ private function __construct($config) {
         $this->name     = $config->name;
         $this->dir      = $config->dir;
 
-        $baseconfig = $config;
+        if ($this->name != self::DEFAULT_THEME) {
+            $baseconfig = self::find_theme_config(self::DEFAULT_THEME, $this->settings);
+        } else {
+            $baseconfig = $config;
+        }
 
         $configurable = array(
             'parents', 'sheets', 'parents_exclude_sheets', 'plugins_exclude_sheets', 'usefallback',
@@ -1543,7 +1547,7 @@ protected function get_css_content_from_scss($themedesigner) {
      * @return string Return compiled css.
      */
     public function get_precompiled_css_content() {
-        $configs = [$this] + $this->parent_configs;
+        $configs = array_reverse($this->parent_configs) + [$this];
         $css = '';
 
         foreach ($configs as $config) {
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 3901907b46620..abd7bfe68f68c 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -120,12 +120,16 @@ protected function get_mustache() {
                              'userdate' => array($userdatehelper, 'transform'),
                          );
 
-            $this->mustache = new Mustache_Engine(array(
+            $this->mustache = new \core\output\mustache_engine(array(
                 'cache' => $cachedir,
                 'escape' => 's',
                 'loader' => $loader,
                 'helpers' => $helpers,
-                'pragmas' => [Mustache_Engine::PRAGMA_BLOCKS]));
+                'pragmas' => [Mustache_Engine::PRAGMA_BLOCKS],
+                // Don't allow the JavaScript helper to be executed from within another
+                // helper. If it's allowed it can be used by users to inject malicious
+                // JS into the page.
+                'blacklistednestedhelpers' => ['js']));
 
         }
 
@@ -2799,8 +2803,8 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
             $output .= $this->header();
         }
 
-        $message = '<p class="errormessage">' . $message . '</p>'.
-                '<p class="errorcode"><a href="' . $moreinfourl . '">' .
+        $message = '<p class="errormessage">' . s($message) . '</p>'.
+                '<p class="errorcode"><a href="' . s($moreinfourl) . '">' .
                 get_string('moreinformation') . '</a></p>';
         if (empty($CFG->rolesactive)) {
             $message .= '<p class="errormessage">' . get_string('installproblem', 'error') . '</p>';
@@ -4031,10 +4035,10 @@ public function page_title() {
     }
 
     /**
-     * Returns the URL for the favicon.
+     * Returns the moodle_url for the favicon.
      *
      * @since Moodle 2.5.1 2.6
-     * @return string The favicon URL
+     * @return moodle_url The moodle_url for the favicon
      */
     public function favicon() {
         return $this->image_url('favicon', 'theme');
diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index c7c0aa14070de..bab8815e144d2 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -795,7 +795,7 @@ protected function find_module($component) {
                                                         array('dndenabled_inbox', 'moodle'), array('fileexists', 'moodle'), array('maxbytesfile', 'error'),
                                                         array('sizegb', 'moodle'), array('sizemb', 'moodle'), array('sizekb', 'moodle'), array('sizeb', 'moodle'),
                                                         array('maxareabytesreached', 'moodle'), array('serverconnection', 'error'),
-                                                        array('changesmadereallygoaway', 'moodle')
+                                                        array('changesmadereallygoaway', 'moodle'), array('complete', 'moodle')
                                                     ));
                     break;
             }
@@ -1016,7 +1016,9 @@ public function js_call_amd($fullmodule, $func = null, $params = array()) {
 
         $component = clean_param($component, PARAM_COMPONENT);
         $module = clean_param($module, PARAM_ALPHANUMEXT);
+        $modname = "{$component}/{$module}";
 
+        $functioncode = [];
         if ($func !== null) {
             $func = clean_param($func, PARAM_ALPHANUMEXT);
 
@@ -1035,12 +1037,14 @@ public function js_call_amd($fullmodule, $func = null, $params = array()) {
                 }
             }
 
-            $js = 'require(["' . $component . '/' . $module . '"], function(amd) { amd.' . $func . '(' . $strparams . '); });';
-
-        } else {
-            $js = 'require(["' . $component . '/' . $module . '"]);';
+            $functioncode[] = "amd.{$func}({$strparams});";
         }
 
+        $functioncode[] = "M.util.js_complete('{$modname}');";
+
+        $initcode = implode(' ', $functioncode);
+        $js = "M.util.js_pending('{$modname}'); require(['{$modname}'], function(amd) {{$initcode}});";
+
         $this->js_amd_inline($js);
     }
 
@@ -1362,8 +1366,10 @@ protected function get_amd_footercode() {
         }
 
         // First include must be to a module with no dependencies, this prevents multiple requests.
-        $prefix = "require(['core/first'], function() {\n";
-        $suffix = "\n});";
+        $prefix = 'M.util.js_pending("core/first");';
+        $prefix .= "require(['core/first'], function() {\n";
+        $suffix = 'M.util.js_complete("core/first");';
+        $suffix .= "\n});";
         $output .= html_writer::script($prefix . implode(";\n", $this->amdjscode) . $suffix);
         return $output;
     }
diff --git a/lib/pear/HTML/QuickForm/RuleRegistry.php b/lib/pear/HTML/QuickForm/RuleRegistry.php
index f25e37f81def9..08ba246891a75 100644
--- a/lib/pear/HTML/QuickForm/RuleRegistry.php
+++ b/lib/pear/HTML/QuickForm/RuleRegistry.php
@@ -302,15 +302,13 @@ function _getJsValue(&$element, $elementName, $reset = false, $index = null)
                     "    }\n";
             }
 
+        } elseif ($element->getType() == 'advcheckbox') {
+            $value = "  value{$jsIndex} = frm.elements['$elementName'][1].checked ?" .
+                    " frm.elements['$elementName'][1].value : frm.elements['$elementName'][0].value;\n";
+            $tmp_reset .= $reset ? "    field[1].checked = field[1].defaultChecked;\n" : '';
         } elseif ($element->getType() == 'checkbox') {
-            if (is_a($element, 'html_quickform_advcheckbox')) {
-                $value = "  value{$jsIndex} = frm.elements['$elementName'][1].checked? frm.elements['$elementName'][1].value: frm.elements['$elementName'][0].value;\n";
-                $tmp_reset .= $reset ? "    field[1].checked = field[1].defaultChecked;\n" : '';
-            } else {
-                $value = "  value{$jsIndex} = frm.elements['$elementName'].checked? '1': '';\n";
-                $tmp_reset .= $reset ? "    field.checked = field.defaultChecked;\n" : '';
-            }
-
+            $value = "  value{$jsIndex} = frm.elements['$elementName'].checked? '1': '';\n";
+            $tmp_reset .= $reset ? "    field.checked = field.defaultChecked;\n" : '';
         } elseif ($element->getType() == 'radio') {
             $value = "  value{$jsIndex} = '';\n" .
                      // Fix for bug #5644
diff --git a/lib/phpmailer/README_MOODLE.txt b/lib/phpmailer/README_MOODLE.txt
index 6b176304c4bea..a64500af16222 100644
--- a/lib/phpmailer/README_MOODLE.txt
+++ b/lib/phpmailer/README_MOODLE.txt
@@ -29,3 +29,6 @@ Local changes (to verify/apply with new imports):
     lib/phpmailer/src/PHPMailer.php: FILTER_FLAG_HOST_REQUIRED is deprecated and
     implied with FILTER_VALIDATE_URL. This was fixed upstream by
     https://github.com/PHPMailer/PHPMailer/pull/1551
+
+- MDL-65749: Applied security patch for mitigating CVE-2018-19296
+    https://github.com/PHPMailer/PHPMailer/commit/8e653bb79643abad30ae60b1aad6966c0810b896
\ No newline at end of file
diff --git a/lib/phpmailer/src/PHPMailer.php b/lib/phpmailer/src/PHPMailer.php
index b5b98652054f0..d006dc5df6137 100644
--- a/lib/phpmailer/src/PHPMailer.php
+++ b/lib/phpmailer/src/PHPMailer.php
@@ -1423,7 +1423,10 @@ public function preSend()
             if (!empty($this->DKIM_domain)
                 and !empty($this->DKIM_selector)
                 and (!empty($this->DKIM_private_string)
-                    or (!empty($this->DKIM_private) and file_exists($this->DKIM_private))
+                    or (!empty($this->DKIM_private)
+                        and static::isPermittedPath($this->DKIM_private)
+                        and file_exists($this->DKIM_private)
+                    )
                 )
             ) {
                 $header_dkim = $this->DKIM_Add(
@@ -1600,6 +1603,20 @@ protected static function isShellSafe($string)
         return true;
     }
 
+    /**
+     * Check whether a file path is of a permitted type.
+     * Used to reject URLs and phar files from functions that access local file paths,
+     * such as addAttachment.
+     *
+     * @param string $path A relative or absolute path to a file.
+     *
+     * @return bool
+     */
+    protected static function isPermittedPath($path)
+    {
+        return !preg_match('#^[a-z]+://#i', $path);
+    }
+
     /**
      * Send mail using the PHP mail() function.
      *
@@ -1989,7 +2006,7 @@ public function setLanguage($langcode = 'en', $lang_path = '')
         // There is no English translation file
         if ('en' != $langcode) {
             // Make sure language file path is readable
-            if (!file_exists($lang_file)) {
+            if (!static::isPermittedPath($lang_file) || !file_exists($lang_file)) {
                 $foundlang = false;
             } else {
                 // Overwrite language-specific strings.
@@ -2727,6 +2744,8 @@ public function textLine($value)
      * Add an attachment from a path on the filesystem.
      * Never use a user-supplied path to a file!
      * Returns false if the file could not be found or read.
+     * Explicitly *does not* support passing URLs; PHPMailer is not an HTTP client.
+     * If you need to do that, fetch the resource yourself and pass it in via a local file or string.
      *
      * @param string $path        Path to the attachment
      * @param string $name        Overrides the attachment name
@@ -2741,7 +2760,7 @@ public function textLine($value)
     public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
     {
         try {
-            if (!@is_file($path)) {
+            if (!static::isPermittedPath($path) || !@is_file($path)) {
                 throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
             }
 
@@ -2923,7 +2942,7 @@ protected function attachAll($disposition_type, $boundary)
     protected function encodeFile($path, $encoding = 'base64')
     {
         try {
-            if (!file_exists($path)) {
+            if (!static::isPermittedPath($path) || !file_exists($path)) {
                 throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
             $file_buffer = file_get_contents($path);
@@ -3263,7 +3282,7 @@ public function addStringAttachment(
      */
     public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
     {
-        if (!@is_file($path)) {
+        if (!static::isPermittedPath($path) || !@is_file($path)) {
             $this->setError($this->lang('file_access') . $path);
 
             return false;
diff --git a/lib/phpunit/bootstrap.php b/lib/phpunit/bootstrap.php
index 9bb548a67f4eb..d0261e2d6e32f 100644
--- a/lib/phpunit/bootstrap.php
+++ b/lib/phpunit/bootstrap.php
@@ -80,8 +80,6 @@
 }
 unset($phpunitversion);
 
-define('NO_OUTPUT_BUFFERING', true);
-
 // only load CFG from config.php, stop ASAP in lib/setup.php
 define('ABORT_AFTER_CONFIG', true);
 require(__DIR__ . '/../../config.php');
diff --git a/lib/phpunit/classes/advanced_testcase.php b/lib/phpunit/classes/advanced_testcase.php
index b65db0c2c980f..41a7da01b1ee2 100644
--- a/lib/phpunit/classes/advanced_testcase.php
+++ b/lib/phpunit/classes/advanced_testcase.php
@@ -56,7 +56,7 @@ final public function __construct($name = null, array $data = array(), $dataName
 
         $this->setBackupGlobals(false);
         $this->setBackupStaticAttributes(false);
-        $this->setRunTestInSeparateProcess(false);
+        $this->setPreserveGlobalState(false);
     }
 
     /**
@@ -490,19 +490,6 @@ public function redirectEvents() {
         return phpunit_util::start_event_redirection();
     }
 
-    /**
-     * Cleanup after all tests are executed.
-     *
-     * Note: do not forget to call this if overridden...
-     *
-     * @static
-     * @return void
-     */
-    public static function tearDownAfterClass() {
-        self::resetAllData();
-    }
-
-
     /**
      * Reset all database tables, restore global state and clear caches and optionally purge dataroot dir.
      *
diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php
index 798b69cccb36d..2605f6fde1574 100644
--- a/lib/phpunit/classes/util.php
+++ b/lib/phpunit/classes/util.php
@@ -252,6 +252,9 @@ public static function reset_all_data($detectchanges = false) {
         if (class_exists('\core\update\checker')) {
             \core\update\checker::reset_caches(true);
         }
+        if (class_exists('\core_course\customfield\course_handler')) {
+            \core_course\customfield\course_handler::reset_caches();
+        }
 
         // Clear static cache within restore.
         if (class_exists('restore_section_structure_step')) {
@@ -984,4 +987,16 @@ protected static function get_coverage_info(string $fulldir): ?phpunit_coverage_
 
         return null;
     }
+
+    /**
+     * Whether the current process is an isolated test process.
+     *
+     * @return bool
+     */
+    public static function is_in_isolated_process(): bool {
+        // Note: There is no function to call, or much to go by in order to tell whether we are in an isolated process
+        // during Bootstrap, when this function is called.
+        // We can do so by testing the existence of the wrapper function, but there is nothing set until that point.
+        return function_exists('__phpunit_run_isolated_test');
+    }
 }
diff --git a/lib/phpunit/tests/advanced_test.php b/lib/phpunit/tests/advanced_test.php
index 39c7c16f42c11..525325d2a3823 100644
--- a/lib/phpunit/tests/advanced_test.php
+++ b/lib/phpunit/tests/advanced_test.php
@@ -539,6 +539,10 @@ public function test_message_redirection() {
      * @depends test_message_redirection
      */
     public function test_message_redirection_noreset($sink) {
+        if ($this->isInIsolation()) {
+            $this->markTestSkipped('State cannot be carried over between tests in isolated tests');
+        }
+
         $this->preventResetByRollback(); // Messaging is not compatible with transactions...
         $this->resetAfterTest();
 
diff --git a/lib/questionlib.php b/lib/questionlib.php
index a089358fa572b..e7de6c840c4cf 100644
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -119,34 +119,32 @@ function question_save_qtype_order($neworder, $config = null) {
  * @return boolean whether any of these questions are being used by any part of Moodle.
  */
 function questions_in_use($questionids) {
-    global $CFG;
 
+    // Are they used by the core question system?
     if (question_engine::questions_in_use($questionids)) {
         return true;
     }
 
-    foreach (core_component::get_plugin_list('mod') as $module => $path) {
-        $lib = $path . '/lib.php';
-        if (is_readable($lib)) {
-            include_once($lib);
+    // Check if any plugins are using these questions.
+    $callbacksbytype = get_plugins_with_function('questions_in_use');
+    foreach ($callbacksbytype as $callbacks) {
+        foreach ($callbacks as $function) {
+            if ($function($questionids)) {
+                return true;
+            }
+        }
+    }
 
-            $fn = $module . '_questions_in_use';
-            if (function_exists($fn)) {
-                if ($fn($questionids)) {
-                    return true;
-                }
-            } else {
+    // Finally check legacy callback.
+    $legacycallbacks = get_plugin_list_with_function('mod', 'question_list_instances');
+    foreach ($legacycallbacks as $plugin => $function) {
+        if (isset($callbacksbytype['mod'][substr($plugin, 4)])) {
+            continue; // Already done.
+        }
 
-                // Fallback for legacy modules.
-                $fn = $module . '_question_list_instances';
-                if (function_exists($fn)) {
-                    foreach ($questionids as $questionid) {
-                        $instances = $fn($questionid);
-                        if (!empty($instances)) {
-                            return true;
-                        }
-                    }
-                }
+        foreach ($questionids as $questionid) {
+            if (!empty($function($questionid))) {
+                return true;
             }
         }
     }
@@ -511,7 +509,8 @@ function question_save_from_deletion($questionids, $newcontextid, $oldplace,
         $newcategory = new stdClass();
         $newcategory->parent = question_get_top_category($newcontextid, true)->id;
         $newcategory->contextid = $newcontextid;
-        $newcategory->name = get_string('questionsrescuedfrom', 'question', $oldplace);
+        // Max length of column name in question_categories is 255.
+        $newcategory->name = shorten_text(get_string('questionsrescuedfrom', 'question', $oldplace), 255);
         $newcategory->info = get_string('questionsrescuedfrominfo', 'question', $oldplace);
         $newcategory->sortorder = 999;
         $newcategory->stamp = make_unique_id_code();
@@ -806,7 +805,7 @@ function question_preview_url($questionid, $preferredbehaviour = null,
     }
 
     if (!is_null($maxmark)) {
-        $params['maxmark'] = format_float($maxmark, strlen($maxmark), true, true);
+        $params['maxmark'] = format_float($maxmark, -1);
     }
 
     if (!is_null($displayoptions)) {
@@ -1349,7 +1348,8 @@ function question_make_default_categories($contexts) {
             // Otherwise, we need to make one
             $category = new stdClass();
             $contextname = $context->get_context_name(false, true);
-            $category->name = get_string('defaultfor', 'question', $contextname);
+            // Max length of name field is 255.
+            $category->name = shorten_text(get_string('defaultfor', 'question', $contextname), 255);
             $category->info = get_string('defaultinfofor', 'question', $contextname);
             $category->contextid = $context->id;
             $category->parent = $topcategory->id;
@@ -1659,7 +1659,8 @@ protected function generate_context_to_string_array($contexts) {
 /**
  * Check capability on category
  *
- * @param int|stdClass $questionorid object or id. If an object is passed, it should include ->contextid and ->createdby.
+ * @param int|stdClass|question_definition $questionorid object or id.
+ *      If an object is passed, it should include ->contextid and ->createdby.
  * @param string $cap 'add', 'edit', 'view', 'use', 'move' or 'tag'.
  * @param int $notused no longer used.
  * @return bool this user has the capability $cap for this question $question?
diff --git a/lib/setup.php b/lib/setup.php
index 52f67c761d064..2cf12822c6dc7 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -620,8 +620,12 @@
 setup_DB();
 
 if (PHPUNIT_TEST and !PHPUNIT_UTIL) {
-    // make sure tests do not run in parallel
-    test_lock::acquire('phpunit');
+    // Make sure tests do not run in parallel.
+    $suffix = '';
+    if (phpunit_util::is_in_isolated_process()) {
+        $suffix = '.isolated';
+    }
+    test_lock::acquire('phpunit', $suffix);
     $dbhash = null;
     try {
         if ($dbhash = $DB->get_field('config', 'value', array('name'=>'phpunittest'))) {
diff --git a/lib/setuplib.php b/lib/setuplib.php
index c7b74efe243db..5d6e828f63a2d 100644
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -610,25 +610,25 @@ function get_exception_info($ex) {
 }
 
 /**
- * Generate a uuid.
+ * Generate a V4 UUID.
  *
- * Unique is hard. Very hard. Attempt to use the PECL UUID functions if available, and if not then revert to
+ * Unique is hard. Very hard. Attempt to use the PECL UUID function if available, and if not then revert to
  * constructing the uuid using mt_rand.
  *
  * It is important that this token is not solely based on time as this could lead
  * to duplicates in a clustered environment (especially on VMs due to poor time precision).
  *
+ * @see https://tools.ietf.org/html/rfc4122
+ *
  * @return string The uuid.
  */
 function generate_uuid() {
     $uuid = '';
 
-    if (function_exists("uuid_create")) {
-        $context = null;
-        uuid_create($context);
-
-        uuid_make($context, UUID_MAKE_V4);
-        uuid_export($context, UUID_FMT_STR, $uuid);
+    // Check if PECL UUID extension is available.
+    if (function_exists('uuid_time')) {
+        // Create a V4 UUID.
+        $uuid = uuid_create(UUID_TYPE_RANDOM);
     } else {
         // Fallback uuid generation based on:
         // "http://www.php.net/manual/en/function.uniqid.php#94959".
diff --git a/lib/statslib.php b/lib/statslib.php
index a8970faa62e98..f449f07f5607c 100644
--- a/lib/statslib.php
+++ b/lib/statslib.php
@@ -1196,11 +1196,13 @@ function stats_get_parameters($time,$report,$courseid,$mode,$roleid=0) {
         break;
 
     case STATS_REPORT_USER_VIEW:
-        $param->fields = 'statsreads as line1, statswrites as line2, statsreads+statswrites as line3';
+        $param->fields = 'timeend, SUM(statsreads) AS line1, SUM(statswrites) AS line2, SUM(statsreads+statswrites) AS line3';
+        $param->fieldscomplete = true;
         $param->line1 = get_string('statsuserreads');
         $param->line2 = get_string('statsuserwrites');
         $param->line3 = get_string('statsuseractivity');
         $param->stattype = 'activity';
+        $param->extras = "GROUP BY timeend";
         break;
 
     // ******************** STATS_MODE_RANKED ******************** //
diff --git a/lib/tablelib.php b/lib/tablelib.php
index d1213b89b4742..e61f9ba7fb6a6 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -35,6 +35,7 @@
 define('TABLE_VAR_ILAST',  5);
 define('TABLE_VAR_PAGE',   6);
 define('TABLE_VAR_RESET',  7);
+define('TABLE_VAR_DIR',    8);
 /**#@-*/
 
 /**#@+
@@ -150,7 +151,8 @@ function __construct($uniqueid) {
             TABLE_VAR_IFIRST => 'tifirst',
             TABLE_VAR_ILAST  => 'tilast',
             TABLE_VAR_PAGE   => 'page',
-            TABLE_VAR_RESET  => 'treset'
+            TABLE_VAR_RESET  => 'treset',
+            TABLE_VAR_DIR    => 'tdir',
         );
     }
 
@@ -516,14 +518,16 @@ function setup() {
                 (isset($this->columns[$sortcol]) || in_array($sortcol, get_all_user_name_fields())
                 && isset($this->columns['fullname']))) {
 
+            $sortdir = optional_param($this->request[TABLE_VAR_DIR], $this->sort_default_order, PARAM_INT);
+
             if (array_key_exists($sortcol, $this->prefs['sortby'])) {
                 // This key already exists somewhere. Change its sortorder and bring it to the top.
-                $sortorder = $this->prefs['sortby'][$sortcol] == SORT_ASC ? SORT_DESC : SORT_ASC;
+                $sortorder = $this->prefs['sortby'][$sortcol] = $sortdir;
                 unset($this->prefs['sortby'][$sortcol]);
                 $this->prefs['sortby'] = array_merge(array($sortcol => $sortorder), $this->prefs['sortby']);
             } else {
                 // Key doesn't exist, so just add it to the beginning of the array, ascending order
-                $this->prefs['sortby'] = array_merge(array($sortcol => SORT_ASC), $this->prefs['sortby']);
+                $this->prefs['sortby'] = array_merge(array($sortcol => $sortdir), $this->prefs['sortby']);
             }
 
             // Finally, make sure that no more than $this->maxsortkeys are present into the array
@@ -859,9 +863,9 @@ function format_row($row) {
      * @return string contents of cell in column 'fullname', for this row.
      */
     function col_fullname($row) {
-        global $COURSE;
+        global $PAGE, $COURSE;
 
-        $name = fullname($row);
+        $name = fullname($row, has_capability('moodle/site:viewfullnames', $PAGE->context));
         if ($this->download) {
             return $name;
         }
@@ -1362,8 +1366,19 @@ protected function sort_order_name($isprimary, $order) {
      * @return string HTML fragment.
      */
     protected function sort_link($text, $column, $isprimary, $order) {
-        return html_writer::link($this->baseurl->out(false,
-                array($this->request[TABLE_VAR_SORT] => $column)),
+        // If we are already sorting by this column, switch direction.
+        if (array_key_exists($column, $this->prefs['sortby'])) {
+            $sortorder = $this->prefs['sortby'][$column] == SORT_ASC ? SORT_DESC : SORT_ASC;
+        } else {
+            $sortorder = $order;
+        }
+
+        $params = [
+            $this->request[TABLE_VAR_SORT] => $column,
+            $this->request[TABLE_VAR_DIR] => $sortorder,
+        ];
+
+        return html_writer::link($this->baseurl->out(false, $params),
                 $text . get_accesshide(get_string('sortby') . ' ' .
                 $text . ' ' . $this->sort_order_name($isprimary, $order))) . ' ' .
                 $this->sort_icon($isprimary, $order);
diff --git a/lib/tcpdf/CHANGELOG.TXT b/lib/tcpdf/CHANGELOG.TXT
index 64c3d47adcc9a..3bdae3e2450c6 100644
--- a/lib/tcpdf/CHANGELOG.TXT
+++ b/lib/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,18 @@
+6.2.25
+	- Fix support for image URLs.
+
+6.2.24
+	- Support remote urls when checking if file exists.
+
+6.2.23
+	- Simplify file_exists function.
+
+6.2.22
+	- Fix for security vulnerability: Using the phar:// wrapper it was possible to trigger the unserialization of user provided data.
+
+6.2.19
+	- Merge various fixes for PHP 7.3 compatibility and security.
+
 6.2.13 (2016-06-10)
 	- IMPORTANT: A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this version will not receive any additional development or support. This version should be considered obsolete, new projects should use the new version as soon it will become stable.
 
diff --git a/lib/tcpdf/README.md b/lib/tcpdf/README.md
new file mode 100644
index 0000000000000..baa518137cb47
--- /dev/null
+++ b/lib/tcpdf/README.md
@@ -0,0 +1,84 @@
+# TCPDF
+*PHP PDF Library*
+
+[![Donate via PayPal](https://img.shields.io/badge/donate-paypal-87ceeb.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20TCPDF%20project)
+*Please consider supporting this project by making a donation via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20TCPDF%20project)*
+
+* **category**    Library
+* **author**      Nicola Asuni <info@tecnick.com>
+* **copyright**   2002-2018 Nicola Asuni - Tecnick.com LTD
+* **license**     http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
+* **link**        http://www.tcpdf.org
+* **source**      https://github.com/tecnickcom/TCPDF
+
+
+## IMPORTANT
+A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this version will not receive any additional development or support.
+This version should be considered obsolete, new projects should use the new version as soon it will become stable.
+
+
+
+## Description
+
+PHP library for generating PDF documents on-the-fly.
+
+### Main Features:
+* no external libraries are required for the basic functions;
+* all standard page formats, custom page formats, custom margins and units of measure;
+* UTF-8 Unicode and Right-To-Left languages;
+* TrueTypeUnicode, OpenTypeUnicode v1, TrueType, OpenType v1, Type1 and CID-0 fonts;
+* font subsetting;
+* methods to publish some XHTML + CSS code, Javascript and Forms;
+* images, graphic (geometric figures) and transformation methods;
+* supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/script/formats.php)
+* 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extension, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;
+* JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;
+* automatic page header and footer management;
+* document encryption up to 256 bit and digital signature certifications;
+* transactions to UNDO commands;
+* PDF annotations, including links, text and file attachments;
+* text rendering modes (fill, stroke and clipping);
+* multiple columns mode;
+* no-write page regions;
+* bookmarks, named destinations and table of content;
+* text hyphenation;
+* text stretching and spacing (tracking);
+* automatic page break, line break and text alignments including justification;
+* automatic page numbering and page groups;
+* move and delete pages;
+* page compression (requires php-zlib extension);
+* XOBject Templates;
+* Layers and object visibility.
+* PDF/A-1b support.
+
+### Third party fonts:
+
+This library may include third party font files released with different licenses.
+
+All the PHP files on the fonts directory are subject to the general TCPDF license (GNU-LGPLv3),
+they do not contain any binary data but just a description of the general properties of a particular font.
+These files can be also generated on the fly using the font utilities and TCPDF methods.
+
+All the original binary TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files).
+
+The binary files (.z) that begins with the prefix "free" have been extracted from the GNU FreeFont collection (GNU-GPLv3).
+The binary files (.z) that begins with the prefix "pdfa" have been derived from the GNU FreeFont, so they are subject to the same license.
+For the details of Copyright, License and other information, please check the files inside the directory fonts/freefont-20120503
+Link : http://www.gnu.org/software/freefont/
+
+The binary files (.z) that begins with the prefix "dejavu" have been extracted from the DejaVu fonts 2.33 (Bitstream) collection.
+For the details of Copyright, License and other information, please check the files inside the directory fonts/dejavu-fonts-ttf-2.33
+Link : http://dejavu-fonts.org
+
+The binary files (.z) that begins with the prefix "ae" have been extracted from the Arabeyes.org collection (GNU-GPLv2).
+Link : http://projects.arabeyes.org/
+
+### ICC profile:
+
+TCPDF includes the sRGB.icc profile from the icc-profiles-free Debian package:
+https://packages.debian.org/source/stable/icc-profiles-free
+
+
+## Developer(s) Contact
+
+* Nicola Asuni <info@tecnick.com>
diff --git a/lib/tcpdf/composer.json b/lib/tcpdf/composer.json
index 578649e546f02..1ffb6a6af7abd 100644
--- a/lib/tcpdf/composer.json
+++ b/lib/tcpdf/composer.json
@@ -1,38 +1,46 @@
 {
-	"name": "tecnickcom/tcpdf",
-	"version": "6.2.13",
-	"homepage": "http://www.tcpdf.org/",
-	"type": "library",
-	"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
-	"keywords": ["PDF","tcpdf","PDFD32000-2008","qrcode","datamatrix","pdf417","barcodes"],
-	"license": "LGPLv3",
-	"authors": [
-	{
-		"name": "Nicola Asuni",
-		"email": "info@tecnick.com",
-		"homepage": "http://nicolaasuni.tecnick.com"
-	}
-	],
-	"require": {
-		"php": ">=5.3.0"
-	},
-	"autoload": {
-		"classmap": [
-		"config",
-		"include",
-		"tcpdf.php",
-		"tcpdf_parser.php",
-		"tcpdf_barcodes_1d.php",
-		"tcpdf_barcodes_2d.php",
-		"include/tcpdf_colors.php",
-		"include/tcpdf_filters.php",
-		"include/tcpdf_font_data.php",
-		"include/tcpdf_fonts.php",
-		"include/tcpdf_images.php",
-		"include/tcpdf_static.php",
-		"include/barcodes/datamatrix.php",
-		"include/barcodes/pdf417.php",
-		"include/barcodes/qrcode.php"
-		]
-	}
+  "name": "tecnickcom/tcpdf",
+  "version": "6.2.26",
+  "homepage": "http://www.tcpdf.org/",
+  "type": "library",
+  "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
+  "keywords": [
+    "PDF",
+    "tcpdf",
+    "PDFD32000-2008",
+    "qrcode",
+    "datamatrix",
+    "pdf417",
+    "barcodes"
+  ],
+  "license": "LGPL-3.0",
+  "authors": [
+    {
+      "name": "Nicola Asuni",
+      "email": "info@tecnick.com",
+      "role": "lead"
+    }
+  ],
+  "require": {
+    "php": ">=5.3.0"
+  },
+  "autoload": {
+    "classmap": [
+      "config",
+      "include",
+      "tcpdf.php",
+      "tcpdf_parser.php",
+      "tcpdf_barcodes_1d.php",
+      "tcpdf_barcodes_2d.php",
+      "include/tcpdf_colors.php",
+      "include/tcpdf_filters.php",
+      "include/tcpdf_font_data.php",
+      "include/tcpdf_fonts.php",
+      "include/tcpdf_images.php",
+      "include/tcpdf_static.php",
+      "include/barcodes/datamatrix.php",
+      "include/barcodes/pdf417.php",
+      "include/barcodes/qrcode.php"
+    ]
+  }
 }
diff --git a/lib/tcpdf/include/barcodes/pdf417.php b/lib/tcpdf/include/barcodes/pdf417.php
index 4fbe6522c9231..3b1774eaae46d 100644
--- a/lib/tcpdf/include/barcodes/pdf417.php
+++ b/lib/tcpdf/include/barcodes/pdf417.php
@@ -740,16 +740,6 @@ public function getBarcodeArray() {
 	 * @protected
 	 */
 	protected function getErrorCorrectionLevel($ecl, $numcw) {
-		// get maximum correction level
-		$maxecl = 8; // starting error level
-		$maxerrsize = (928 - $numcw); // available codewords for error
-		while ($maxecl > 0) {
-			$errsize = (2 << $ecl);
-			if ($maxerrsize >= $errsize) {
-				break;
-			}
-			--$maxecl;
-		}
 		// check for automatic levels
 		if (($ecl < 0) OR ($ecl > 8)) {
 			if ($numcw < 41) {
@@ -764,6 +754,16 @@ protected function getErrorCorrectionLevel($ecl, $numcw) {
 				$ecl = $maxecl;
 			}
 		}
+		// get maximum correction level
+		$maxecl = 8; // starting error level
+		$maxerrsize = (928 - $numcw); // available codewords for error
+		while ($maxecl > 0) {
+			$errsize = (2 << $ecl);
+			if ($maxerrsize >= $errsize) {
+				break;
+			}
+			--$maxecl;
+		}
 		if ($ecl > $maxecl) {
 			$ecl = $maxecl;
 		}
diff --git a/lib/tcpdf/include/sRGB.icc b/lib/tcpdf/include/sRGB.icc
index 71e33830223c4..1d8f7419c3bf2 100644
Binary files a/lib/tcpdf/include/sRGB.icc and b/lib/tcpdf/include/sRGB.icc differ
diff --git a/lib/tcpdf/include/tcpdf_fonts.php b/lib/tcpdf/include/tcpdf_fonts.php
index 70ca89393d926..9242ca4bfdb52 100644
--- a/lib/tcpdf/include/tcpdf_fonts.php
+++ b/lib/tcpdf/include/tcpdf_fonts.php
@@ -70,7 +70,7 @@ class TCPDF_FONTS {
 	 * @public static
 	 */
 	public static function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $outpath='', $platid=3, $encid=1, $addcbbox=false, $link=false) {
-		if (!file_exists($fontfile)) {
+		if (!TCPDF_STATIC::file_exists($fontfile)) {
 			// Could not find file
 			return false;
 		}
@@ -95,7 +95,7 @@ public static function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $
 			$outpath = self::_getfontpath();
 		}
 		// check if this font already exist
-		if (@file_exists($outpath.$font_name.'.php')) {
+		if (@TCPDF_STATIC::file_exists($outpath.$font_name.'.php')) {
 			// this font already exist (delete it from fonts folder to rebuild it)
 			return $font_name;
 		}
@@ -665,7 +665,7 @@ public static function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $
 								$glyphIdArray[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
 								$offset += 2;
 							}
-							for ($k = 0; $k < $segCount; ++$k) {
+							for ($k = 0; $k < $segCount - 1; ++$k) {
 								for ($c = $startCount[$k]; $c <= $endCount[$k]; ++$c) {
 									if ($idRangeOffset[$k] == 0) {
 										$g = ($idDelta[$k] + $c) % 65536;
@@ -1543,11 +1543,11 @@ public static function _getfontpath() {
 	public static function getFontFullPath($file, $fontdir=false) {
 		$fontfile = '';
 		// search files on various directories
-		if (($fontdir !== false) AND @file_exists($fontdir.$file)) {
+		if (($fontdir !== false) AND @TCPDF_STATIC::file_exists($fontdir.$file)) {
 			$fontfile = $fontdir.$file;
-		} elseif (@file_exists(self::_getfontpath().$file)) {
+		} elseif (@TCPDF_STATIC::file_exists(self::_getfontpath().$file)) {
 			$fontfile = self::_getfontpath().$file;
-		} elseif (@file_exists($file)) {
+		} elseif (@TCPDF_STATIC::file_exists($file)) {
 			$fontfile = $file;
 		}
 		return $fontfile;
@@ -2003,7 +2003,11 @@ public static function UTF8StringToArray($str, $isunicode=true, &$currentfont) {
 			$chars = str_split($str);
 			$carr = array_map('ord', $chars);
 		}
-		$currentfont['subsetchars'] += array_fill_keys($carr, true);
+		if (is_array($currentfont['subsetchars']) && is_array($carr)) {
+			$currentfont['subsetchars'] += array_fill_keys($carr, true);
+		} else {
+			$currentfont['subsetchars'] = array_merge($currentfont['subsetchars'], $carr);
+		}
 		return $carr;
 	}
 
diff --git a/lib/tcpdf/include/tcpdf_images.php b/lib/tcpdf/include/tcpdf_images.php
index c2e3c36f93058..86b3c20dbd8b5 100644
--- a/lib/tcpdf/include/tcpdf_images.php
+++ b/lib/tcpdf/include/tcpdf_images.php
@@ -161,12 +161,8 @@ public static function _toJPEG($image, $quality, $tempfile) {
 	 */
 	public static function _parsejpeg($file) {
 		// check if is a local file
-		if (!@file_exists($file)) {
-			// try to encode spaces on filename
-			$tfile = str_replace(' ', '%20', $file);
-			if (@file_exists($tfile)) {
-				$file = $tfile;
-			}
+		if (!@TCPDF_STATIC::file_exists($file)) {
+			return false;
 		}
 		$a = getimagesize($file);
 		if (empty($a)) {
diff --git a/lib/tcpdf/include/tcpdf_static.php b/lib/tcpdf/include/tcpdf_static.php
index 16353e0068509..df1b28e1ef874 100644
--- a/lib/tcpdf/include/tcpdf_static.php
+++ b/lib/tcpdf/include/tcpdf_static.php
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.2.13';
+	private static $tcpdf_version = '6.2.26';
 
 	/**
 	 * String alias for total number of pages.
@@ -1774,39 +1774,6 @@ public static function getVectorsAngle($x1, $y1, $x2, $y2) {
 		return $angle;
 	}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// ====================================================================================================================
-// REIMPLEMENTED
-// ====================================================================================================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 	/**
 	 * Split string by a regular expression.
 	 * This is a wrapper for the preg_split function to avoid the bug: https://bugs.php.net/bug.php?id=45850
@@ -1854,6 +1821,49 @@ public static function fopenLocal($filename, $mode) {
 		return fopen($filename, $mode);
 	}
 
+	/**
+	 * Check if the URL exist.
+	 * @param url (string) URL to check.
+	 * @return Returns TRUE if the URL exists; FALSE otherwise.
+	 * @public static
+	 */
+	public static function url_exists($url) {
+		$crs = curl_init();
+		curl_setopt($crs, CURLOPT_URL, $url);
+		curl_setopt($crs, CURLOPT_NOBODY, true);
+		curl_setopt($crs, CURLOPT_FAILONERROR, true);
+		if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
+			curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
+		}
+		curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($crs, CURLOPT_TIMEOUT, 30);
+		curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
+		curl_exec($crs);
+		$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
+		curl_close($crs);
+		return ($code == 200);
+	}
+
+	/**
+	 * Wrapper for file_exists.
+	 * Checks whether a file or directory exists.
+	 * Only allows some protocols and local files.
+	 * @param filename (string) Path to the file or directory. 
+	 * @return Returns TRUE if the file or directory specified by filename exists; FALSE otherwise.  
+	 * @public static
+	 */
+	public static function file_exists($filename) {
+		if (preg_match('|^https?://|', $filename) == 1) {
+			return self::url_exists($filename);
+		}
+		if (strpos($filename, '://')) {
+			return false; // only support http and https wrappers for security reasons
+		}
+		return @file_exists($filename);
+	}
+
 	/**
 	 * Reads entire file into a string.
 	 * The file can be also an URL.
@@ -1910,12 +1920,14 @@ public static function fileGetContents($file) {
 		    && !preg_match('%^//%', $file)
 		) {
 		    $urldata = @parse_url($_SERVER['SCRIPT_URI']);
-		    return $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
+		    $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
 		}
 		//
 		$alt = array_unique($alt);
-		//var_dump($alt);exit;//DEBUG
 		foreach ($alt as $path) {
+			if (!self::file_exists($path)) {
+				return false;
+			}
 			$ret = @file_get_contents($path);
 			if ($ret !== false) {
 			    return $ret;
@@ -1949,8 +1961,6 @@ public static function fileGetContents($file) {
 		return false;
 	}
 
-    
-
 	/**
 	 * Get ULONG from string (Big Endian 32-bit unsigned integer).
 	 * @param $str (string) string from where to extract value
diff --git a/lib/tcpdf/readme_moodle.txt b/lib/tcpdf/readme_moodle.txt
index 6c124ac19e4a8..f3ea107f06ff1 100644
--- a/lib/tcpdf/readme_moodle.txt
+++ b/lib/tcpdf/readme_moodle.txt
@@ -1,12 +1,23 @@
-Description of TCPDF library import 6.2.13
-===========================================
+Description of TCPDF library import 6.2.26
+==========================================
 * download library from https://github.com/tecnickcom/TCPDF/releases
 * delete examples/, tools/ and tcpdf_import.php
 * remove tcpdf_import.php from composer.json
 * remove all fonts that were not already present
 * visit http://127.0.0.1/lib/tests/other/pdflibtestpage.php and view the pdf
-* check the status of https://github.com/tecnickcom/TCPDF/pull/74 and re-apply if not merged/closed (6.2.16 and up should contain it).
-* verify that https://github.com/tecnickcom/TCPDF/pull/91 is included in the imported library (6.2.25 and up should contain it).
+
+Important
+---------
+A new version of the libray is being developed @ https://github.com/tecnickcom/tc-lib-pdf . Check periodically when it's ready
+and if it's a drop-in replacement for the legacy tcpdf one.
+
+2019/05/06
+----------
+Upgrade to tcpdf TCPDF 6.2.26 (MDL-64794)
+by Eloy Lafuente <stronk7@moodle.org>
+
+- https://github.com/tecnickcom/TCPDF/pull/74 has been already merged upstream (6.2.16 and up), so we don't need to apply it.
+- https://github.com/tecnickcom/TCPDF/pull/91 has been already merged upstream (6.2.19 and up), so we don't need to apply it.
 
 2017/10/02
 ----------
diff --git a/lib/tcpdf/tcpdf.php b/lib/tcpdf/tcpdf.php
index 23025a0c7af3c..24ef434ab8a58 100644
--- a/lib/tcpdf/tcpdf.php
+++ b/lib/tcpdf/tcpdf.php
@@ -1,13 +1,13 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.2.13
+// Version     : 6.2.26
 // Begin       : 2002-08-03
-// Last Update : 2015-06-18
+// Last Update : 2018-09-14
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2018 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.2.8
+ * @version 6.2.26
  */
 
 // TCPDF configuration
@@ -128,8 +128,11 @@
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.2.8
+ * @version 6.2.26
  * @author Nicola Asuni - info@tecnick.com
+ * @IgnoreAnnotation("protected")
+ * @IgnoreAnnotation("public")
+ * @IgnoreAnnotation("pre")
  */
 class TCPDF {
 
@@ -1994,10 +1997,6 @@ public function __construct($orientation='P', $unit='mm', $format='A4', $unicode
 	 * @since 1.53.0.TC016
 	 */
 	public function __destruct() {
-		// restore internal encoding
-		if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
-			mb_internal_encoding($this->internal_encoding);
-		}
 		// cleanup
 		$this->_destroy(true);
 	}
@@ -4257,7 +4256,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 		// true when the font style variation is missing
 		$missing_style = false;
 		// search and include font file
-		if (TCPDF_STATIC::empty_string($fontfile) OR (!@file_exists($fontfile))) {
+		if (TCPDF_STATIC::empty_string($fontfile) OR (!@TCPDF_STATIC::file_exists($fontfile))) {
 			// build a standard filenames for specified font
 			$tmp_fontfile = str_replace(' ', '', $family).strtolower($style).'.php';
 			$fontfile = TCPDF_FONTS::getFontFullPath($tmp_fontfile, $fontdir);
@@ -4269,7 +4268,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 			}
 		}
 		// include font file
-		if (!TCPDF_STATIC::empty_string($fontfile) AND (@file_exists($fontfile))) {
+		if (!TCPDF_STATIC::empty_string($fontfile) AND (@TCPDF_STATIC::file_exists($fontfile))) {
 			include($fontfile);
 		} else {
 			$this->Error('Could not include font definition file: '.$family.'');
@@ -4453,6 +4452,7 @@ public function SetFont($family, $style='', $size=null, $fontfile='', $subset='d
 	 * @see SetFont()
 	 */
 	public function SetFontSize($size, $out=true) {
+		$size = (float)$size;
 		// font size in points
 		$this->FontSizePt = $size;
 		// font size in user units
@@ -4809,19 +4809,19 @@ public function Annotation($x, $y, $w, $h, $text, $opt=array('Subtype'=>'Text'),
 		$this->PageAnnots[$page][] = array('n' => ++$this->n, 'x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
 		if (!$this->pdfa_mode) {
 			if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!TCPDF_STATIC::empty_string($opt['FS']))
-				AND (@file_exists($opt['FS']) OR TCPDF_STATIC::isValidURL($opt['FS']))
+				AND (@TCPDF_STATIC::file_exists($opt['FS']) OR TCPDF_STATIC::isValidURL($opt['FS']))
 				AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
 				$this->embeddedfiles[basename($opt['FS'])] = array('f' => ++$this->n, 'n' => ++$this->n, 'file' => $opt['FS']);
 			}
 		}
 		// Add widgets annotation's icons
-		if (isset($opt['mk']['i']) AND @file_exists($opt['mk']['i'])) {
+		if (isset($opt['mk']['i']) AND @TCPDF_STATIC::file_exists($opt['mk']['i'])) {
 			$this->Image($opt['mk']['i'], '', '', 10, 10, '', '', '', false, 300, '', false, false, 0, false, true);
 		}
-		if (isset($opt['mk']['ri']) AND @file_exists($opt['mk']['ri'])) {
+		if (isset($opt['mk']['ri']) AND @TCPDF_STATIC::file_exists($opt['mk']['ri'])) {
 			$this->Image($opt['mk']['ri'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
 		}
-		if (isset($opt['mk']['ix']) AND @file_exists($opt['mk']['ix'])) {
+		if (isset($opt['mk']['ix']) AND @TCPDF_STATIC::file_exists($opt['mk']['ix'])) {
 			$this->Image($opt['mk']['ix'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
 		}
 	}
@@ -5769,10 +5769,9 @@ public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=
 			$this->resetLastH();
 		}
 		if (!TCPDF_STATIC::empty_string($y)) {
-			$this->SetY($y);
-		} else {
-			$y = $this->GetY();
+			$this->SetY($y); // set y in order to convert negative y values to positive ones
 		}
+		$y = $this->GetY();
 		$resth = 0;
 		if (($h > 0) AND $this->inPageBody() AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
 			// spit cell in more pages/columns
@@ -6845,13 +6844,9 @@ public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $alig
 				$file = substr($file, 1);
 				$exurl = $file;
 			}
-			// check if is a local file
-			if (!@file_exists($file)) {
-				// try to encode spaces on filename
-				$tfile = str_replace(' ', '%20', $file);
-				if (@file_exists($tfile)) {
-					$file = $tfile;
-				}
+			// check if file exist and it is valid
+			if (!@TCPDF_STATIC::file_exists($file)) {
+				return false;
 			}
 			if (($imsize = @getimagesize($file)) === FALSE) {
 				if (in_array($file, $this->imagekeys)) {
@@ -7750,6 +7745,10 @@ public function Output($name='doc.pdf', $dest='I') {
 	 * @since 4.5.016 (2009-02-24)
 	 */
 	public function _destroy($destroyall=false, $preserve_objcopy=false) {
+		// restore internal encoding
+		if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
+			mb_internal_encoding($this->internal_encoding);
+		}
 		if ($destroyall AND !$preserve_objcopy) {
 			// remove all temporary files
 			$tmpfiles = glob(K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_*');
@@ -8157,7 +8156,9 @@ protected function _putannotsobjs() {
 						$annots .= ' /FT /'.$pl['opt']['ft'];
 						$formfield = true;
 					}
-					$annots .= ' /Contents '.$this->_textstring($pl['txt'], $annot_obj_id);
+					if ($pl['opt']['subtype'] !== 'Link') {
+						$annots .= ' /Contents '.$this->_textstring($pl['txt'], $annot_obj_id);
+					}
 					$annots .= ' /P '.$this->page_obj_id[$n].' 0 R';
 					$annots .= ' /NM '.$this->_datastring(sprintf('%04u-%04u', $n, $key), $annot_obj_id);
 					$annots .= ' /M '.$this->_datestring($annot_obj_id, $this->doc_modification_timestamp);
@@ -9646,7 +9647,7 @@ protected function _putXMP() {
 	protected function _putcatalog() {
 		// put XMP
 		$xmpobj = $this->_putXMP();
-		// if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
+		// if required, add standard sRGB ICC colour profile
 		if ($this->pdfa_mode OR $this->force_srgb) {
 			$iccobj = $this->_newobj();
 			$icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
@@ -12582,7 +12583,7 @@ protected function _addfield($type, $name, $x, $y, $w, $h, $prop) {
 		$k = $this->k;
 		$this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%u,[%F,%F,%F,%F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
 		$this->javascript .= 'f'.$name.'.textSize='.$this->FontSizePt.";\n";
-		foreach ($prop as $key => $val) {
+		foreach($prop as $key => $val) {
 			if (strcmp(substr($key, -5), 'Color') == 0) {
 				$val = TCPDF_COLORS::_JScolor($val);
 			} else {
@@ -15190,7 +15191,7 @@ public function getBarcode() {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style='', $align='') {
+	public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style=array(), $align='') {
 		if (TCPDF_STATIC::empty_string(trim($code))) {
 			return;
 		}
@@ -15509,7 +15510,7 @@ public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='
 	 * @since 4.5.037 (2009-04-07)
 	 * @public
 	 */
-	public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style='', $align='', $distort=false) {
+	public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style=array(), $align='', $distort=false) {
 		if (TCPDF_STATIC::empty_string(trim($code))) {
 			return;
 		}
@@ -16545,9 +16546,9 @@ protected function getHtmlDomArray($html) {
 					// get attributes
 					preg_match_all('/([^=\s]*)[\s]*=[\s]*"([^"]*)"/', $element, $attr_array, PREG_PATTERN_ORDER);
 					$dom[$key]['attribute'] = array(); // reset attribute array
-					foreach ($attr_array[1] as $id => $name) {
-						$dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
-					}
+                    foreach($attr_array[1] as $id => $name) {
+                        $dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
+                    }
 					if (!empty($css)) {
 						// merge CSS style to current style
 						list($dom[$key]['csssel'], $dom[$key]['cssdata']) = TCPDF_STATIC::getCSSdataArray($dom, $key, $css);
@@ -16558,10 +16559,10 @@ protected function getHtmlDomArray($html) {
 						// get style attributes
 						preg_match_all('/([^;:\s]*):([^;]*)/', $dom[$key]['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
 						$dom[$key]['style'] = array(); // reset style attribute array
-						foreach ($style_array[1] as $id => $name) {
-							// in case of duplicate attribute the last replace the previous
-							$dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
-						}
+                        foreach($style_array[1] as $id => $name) {
+                            // in case of duplicate attribute the last replace the previous
+                            $dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
+                        }
 						// --- get some style attributes ---
 						// text direction
 						if (isset($dom[$key]['style']['direction'])) {
@@ -17176,10 +17177,10 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 		if ($cell) {
 			if ($this->rtl) {
 				$this->x -= $this->cell_padding['R'];
-				$this->lMargin += $this->cell_padding['R'];
+				$this->lMargin += $this->cell_padding['L'];
 			} else {
 				$this->x += $this->cell_padding['L'];
-				$this->rMargin += $this->cell_padding['L'];
+				$this->rMargin += $this->cell_padding['R'];
 			}
 		}
 		if ($this->customlistindent >= 0) {
@@ -18316,7 +18317,8 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 				}
 				// text
 				$this->htmlvspace = 0;
-				if ((!$this->premode) AND $this->isRTLTextDir()) {
+				$isRTLString = preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_RTL, $dom[$key]['value']) || preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_ARABIC, $dom[$key]['value']);
+				if ((!$this->premode) AND $this->isRTLTextDir() AND !$isRTLString) {
 					// reverse spaces order
 					$lsp = ''; // left spaces
 					$rsp = ''; // right spaces
@@ -18331,7 +18333,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 				if ($newline) {
 					if (!$this->premode) {
 						$prelen = strlen($dom[$key]['value']);
-						if ($this->isRTLTextDir()) {
+						if ($this->isRTLTextDir() AND !$isRTLString) {
 							// right trim except non-breaking space
 							$dom[$key]['value'] = $this->stringRightTrim($dom[$key]['value']);
 						} else {
@@ -18815,100 +18817,122 @@ protected function openHTMLTagHandler($dom, $key, $cell) {
 				break;
 			}
 			case 'img': {
-				if (!empty($tag['attribute']['src'])) {
-					if ($tag['attribute']['src'][0] === '@') {
-						// data stream
-						$tag['attribute']['src'] = '@'.base64_decode(substr($tag['attribute']['src'], 1));
-						$type = '';
-					} else {
-						// get image type
-						$type = TCPDF_IMAGES::getImageFileType($tag['attribute']['src']);
-					}
-					if (!isset($tag['width'])) {
-						$tag['width'] = 0;
-					}
-					if (!isset($tag['height'])) {
-						$tag['height'] = 0;
-					}
-					//if (!isset($tag['attribute']['align'])) {
-						// the only alignment supported is "bottom"
-						// further development is required for other modes.
-						$tag['attribute']['align'] = 'bottom';
-					//}
-					switch($tag['attribute']['align']) {
-						case 'top': {
-							$align = 'T';
-							break;
-						}
-						case 'middle': {
-							$align = 'M';
-							break;
-						}
-						case 'bottom': {
-							$align = 'B';
-							break;
+				if (empty($tag['attribute']['src'])) {
+					break;
+				}
+				$imgsrc = $tag['attribute']['src'];
+				if ($imgsrc[0] === '@') {
+					// data stream
+					$imgsrc = '@'.base64_decode(substr($imgsrc, 1));
+					$type = '';
+				} else {
+					if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
+						// fix image path
+						$findroot = strpos($imgsrc, $_SERVER['DOCUMENT_ROOT']);
+						if (($findroot === false) OR ($findroot > 1)) {
+							if (substr($_SERVER['DOCUMENT_ROOT'], -1) == '/') {
+								$imgsrc = substr($_SERVER['DOCUMENT_ROOT'], 0, -1).$imgsrc;
+							} else {
+								$imgsrc = $_SERVER['DOCUMENT_ROOT'].$imgsrc;
+							}
 						}
-						default: {
-							$align = 'B';
-							break;
+						$imgsrc = urldecode($imgsrc);
+						$testscrtype = @parse_url($imgsrc);
+						if (empty($testscrtype['query'])) {
+							// convert URL to server path
+							$imgsrc = str_replace(K_PATH_URL, K_PATH_MAIN, $imgsrc);
+						} elseif (preg_match('|^https?://|', $imgsrc) !== 1) {
+							// convert URL to server path
+							$imgsrc = str_replace(K_PATH_MAIN, K_PATH_URL, $imgsrc);
 						}
 					}
-					$prevy = $this->y;
-					$xpos = $this->x;
-					$imglink = '';
-					if (isset($this->HREF['url']) AND !TCPDF_STATIC::empty_string($this->HREF['url'])) {
-						$imglink = $this->HREF['url'];
-						if ($imglink[0] == '#') {
-							// convert url to internal link
-							$lnkdata = explode(',', $imglink);
-							if (isset($lnkdata[0])) {
-								$page = intval(substr($lnkdata[0], 1));
-								if (empty($page) OR ($page <= 0)) {
-									$page = $this->page;
-								}
-								if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
-									$lnky = floatval($lnkdata[1]);
-								} else {
-									$lnky = 0;
-								}
-								$imglink = $this->AddLink();
-								$this->SetLink($imglink, $lnky, $page);
+					// get image type
+					$type = TCPDF_IMAGES::getImageFileType($imgsrc);
+				}
+				if (!isset($tag['width'])) {
+					$tag['width'] = 0;
+				}
+				if (!isset($tag['height'])) {
+					$tag['height'] = 0;
+				}
+				//if (!isset($tag['attribute']['align'])) {
+					// the only alignment supported is "bottom"
+					// further development is required for other modes.
+					$tag['attribute']['align'] = 'bottom';
+				//}
+				switch($tag['attribute']['align']) {
+					case 'top': {
+						$align = 'T';
+						break;
+					}
+					case 'middle': {
+						$align = 'M';
+						break;
+					}
+					case 'bottom': {
+						$align = 'B';
+						break;
+					}
+					default: {
+						$align = 'B';
+						break;
+					}
+				}
+				$prevy = $this->y;
+				$xpos = $this->x;
+				$imglink = '';
+				if (isset($this->HREF['url']) AND !TCPDF_STATIC::empty_string($this->HREF['url'])) {
+					$imglink = $this->HREF['url'];
+					if ($imglink[0] == '#') {
+						// convert url to internal link
+						$lnkdata = explode(',', $imglink);
+						if (isset($lnkdata[0])) {
+							$page = intval(substr($lnkdata[0], 1));
+							if (empty($page) OR ($page <= 0)) {
+								$page = $this->page;
+							}
+							if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
+								$lnky = floatval($lnkdata[1]);
+							} else {
+								$lnky = 0;
 							}
+							$imglink = $this->AddLink();
+							$this->SetLink($imglink, $lnky, $page);
 						}
 					}
-					$border = 0;
-					if (isset($tag['border']) AND !empty($tag['border'])) {
-						// currently only support 1 (frame) or a combination of 'LTRB'
-						$border = $tag['border'];
-					}
-					$iw = '';
-					if (isset($tag['width'])) {
-						$iw = $this->getHTMLUnitToUnits($tag['width'], ($tag['fontsize'] / $this->k), 'px', false);
-					}
-					$ih = '';
-					if (isset($tag['height'])) {
-						$ih = $this->getHTMLUnitToUnits($tag['height'], ($tag['fontsize'] / $this->k), 'px', false);
-					}
-					if (($type == 'eps') OR ($type == 'ai')) {
-						$this->ImageEps($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
-					} elseif ($type == 'svg') {
-						$this->ImageSVG($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
-					} else {
-						$this->Image($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
+				}
+				$border = 0;
+				if (isset($tag['border']) AND !empty($tag['border'])) {
+					// currently only support 1 (frame) or a combination of 'LTRB'
+					$border = $tag['border'];
+				}
+				$iw = '';
+				if (isset($tag['width'])) {
+					$iw = $this->getHTMLUnitToUnits($tag['width'], ($tag['fontsize'] / $this->k), 'px', false);
+				}
+				$ih = '';
+				if (isset($tag['height'])) {
+					$ih = $this->getHTMLUnitToUnits($tag['height'], ($tag['fontsize'] / $this->k), 'px', false);
+				}
+				if (($type == 'eps') OR ($type == 'ai')) {
+					$this->ImageEps($imgsrc, $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
+				} elseif ($type == 'svg') {
+					$this->ImageSVG($imgsrc, $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
+				} else {
+					$this->Image($imgsrc, $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
+				}
+				switch($align) {
+					case 'T': {
+						$this->y = $prevy;
+						break;
 					}
-					switch($align) {
-						case 'T': {
-							$this->y = $prevy;
-							break;
-						}
-						case 'M': {
-							$this->y = (($this->img_rb_y + $prevy - ($this->getCellHeight($tag['fontsize'] / $this->k))) / 2);
-							break;
-						}
-						case 'B': {
-							$this->y = $this->img_rb_y - ($this->getCellHeight($tag['fontsize'] / $this->k) - ($this->getFontDescent($tag['fontname'], $tag['fontstyle'], $tag['fontsize']) * $this->cell_height_ratio));
-							break;
-						}
+					case 'M': {
+						$this->y = (($this->img_rb_y + $prevy - ($this->getCellHeight($tag['fontsize'] / $this->k))) / 2);
+						break;
+					}
+					case 'B': {
+						$this->y = $this->img_rb_y - ($this->getCellHeight($tag['fontsize'] / $this->k) - ($this->getFontDescent($tag['fontname'], $tag['fontstyle'], $tag['fontsize']) * $this->cell_height_ratio));
+						break;
 					}
 				}
 				break;
@@ -21511,7 +21535,7 @@ public function addHTMLTOC($page='', $toc_name='TOC', $templates=array(), $corre
 			} else {
 				// placemark to be replaced with the correct number
 				$pagenum = '{#'.($outline['p']).'}';
-				if ($templates['F'.$outline['l']]) {
+				if (isset($templates['F'.$outline['l']]) && $templates['F'.$outline['l']]) {
 					$pagenum = '{'.$pagenum.'}';
 				}
 				$maxpage = max($maxpage, $outline['p']);
@@ -24204,9 +24228,12 @@ protected function startSVGElementHandler($parser, $name, $attribs, $ctm=array()
 						}
 						$img = urldecode($img);
 						$testscrtype = @parse_url($img);
-						if (!isset($testscrtype['query']) OR empty($testscrtype['query'])) {
+						if (empty($testscrtype['query'])) {
 							// convert URL to server path
 							$img = str_replace(K_PATH_URL, K_PATH_MAIN, $img);
+						} elseif (preg_match('|^https?://|', $img) !== 1) {
+							// convert server path to URL
+							$img = str_replace(K_PATH_MAIN, K_PATH_URL, $img);
 						}
 					}
 					// get image type
diff --git a/lib/templates/filemanager_modal_generallayout.mustache b/lib/templates/filemanager_modal_generallayout.mustache
index 7a16342e1742a..456f705b803b1 100644
--- a/lib/templates/filemanager_modal_generallayout.mustache
+++ b/lib/templates/filemanager_modal_generallayout.mustache
@@ -2,7 +2,7 @@
     <div tabindex="0" class="file-picker fp-generallayout row" role="dialog" aria-live="assertive">
         <div class="fp-repo-area col-md-3 pr-2 nav nav-pills flex-column" role="tablist">
                 <div class="fp-repo nav-item" role="tab" aria-selected="false" tabindex="-1">
-                    <a href="#" class="nav-link" tabindex="-1"><img class="fp-repo-icon" alt=" " src="#" width="16" height="16" />&nbsp;<span class="fp-repo-name"></span></a>
+                    <a href="#" class="nav-link" tabindex="-1"><img class="fp-repo-icon" alt=" " width="16" height="16" />&nbsp;<span class="fp-repo-name"></span></a>
                 </div>
 
         </div>
@@ -60,4 +60,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/templates/filemanager_processexistingfile.mustache b/lib/templates/filemanager_processexistingfile.mustache
index 18714ac05a493..875f358049faf 100644
--- a/lib/templates/filemanager_processexistingfile.mustache
+++ b/lib/templates/filemanager_processexistingfile.mustache
@@ -1,8 +1,8 @@
 <div class="file-picker fp-dlg">
     <p class="fp-dlg-text"></p>
     <div class="fp-dlg-buttons">
-        <button class="fp-dlg-butoverwrite btn btn-primary">{{#str}}overwrite, repository{{/str}}</button>
-        <button class="fp-dlg-butrename btn btn-primary"></button>
-        <button class="fp-dlg-butcancel btn btn-secondary">{{#str}}cancel{{/str}}</button>
+        <button class="fp-dlg-butoverwrite btn btn-primary mb-1">{{#str}}overwrite, repository{{/str}}</button>
+        <button class="fp-dlg-butrename btn btn-primary mb-1"></button>
+        <button class="fp-dlg-butcancel btn btn-secondary mb-1">{{#str}}cancel{{/str}}</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/lib/templates/form_autocomplete_input.mustache b/lib/templates/form_autocomplete_input.mustache
index ea4614dcd9a7e..1b2ec1a7fb439 100644
--- a/lib/templates/form_autocomplete_input.mustache
+++ b/lib/templates/form_autocomplete_input.mustache
@@ -36,7 +36,10 @@
     { "inputID": 1, "suggestionsId": 2, "selectionId": 3, "downArrowId": 4, "placeholder": "Select something" }
 }}
 {{#showSuggestions}}
-<input type="text" id="{{inputId}}" class="form-control" list="{{suggestionsId}}" placeholder="{{placeholder}}" role="combobox" aria-expanded="false" autocomplete="off" autocorrect="off" autocapitalize="off" aria-autocomplete="list" aria-owns="{{suggestionsId}} {{selectionId}}" {{#tags}}data-tags="1"{{/tags}}/><span class="form-autocomplete-downarrow" id="{{downArrowId}}">&#x25BC;</span>
+<div class="d-inline-block position-relative">
+    <input type="text" id="{{inputId}}" class="form-control" list="{{suggestionsId}}" placeholder="{{placeholder}}" role="combobox" aria-expanded="false" autocomplete="off" autocorrect="off" autocapitalize="off" aria-autocomplete="list" aria-owns="{{suggestionsId}} {{selectionId}}" {{#tags}}data-tags="1"{{/tags}}/>
+    <span class="form-autocomplete-downarrow position-absolute p-1" id="{{downArrowId}}">&#x25BC;</span>
+</div>
 {{/showSuggestions}}
 {{^showSuggestions}}
 <input type="text" id="{{inputId}}" placeholder="{{placeholder}}" role="textbox" aria-owns="{{selectionId}}" {{#tags}}data-tags="1"{{/tags}}/>
diff --git a/lib/templates/form_autocomplete_selection.mustache b/lib/templates/form_autocomplete_selection.mustache
index c3053112a4846..932ad376952e1 100644
--- a/lib/templates/form_autocomplete_selection.mustache
+++ b/lib/templates/form_autocomplete_selection.mustache
@@ -17,7 +17,7 @@
 {{!
     @template core/form_autocomplete_selection
 
-    Moodle template for the currently selected items in an autocomplate form element.
+    Moodle template for the wrapper of currently selected items in an autocomplate form element.
 
     Classes required for JS:
     * none
@@ -28,8 +28,8 @@
     Context variables required for this template:
     * multiple True if this field allows multiple selections
     * selectionId The dom id of the current selection list.
-    * items List of items with label and value fields.
-    * noSelectionString String to use when no items are selected
+    * items List of items with label and value fields (used by the partial).
+    * noSelectionString String to use when no items are selected (used by the partial).
 
     Example context (json):
     { "multiple": true, "selectionId": 1, "items": [
@@ -39,12 +39,5 @@
 }}
 <div class="form-autocomplete-selection w-100 {{#multiple}}form-autocomplete-multiple{{/multiple}}" id="{{selectionId}}" role="list" aria-atomic="true" {{#multiple}}tabindex="0" aria-multiselectable="true"{{/multiple}}>
 <span class="accesshide">{{#str}}selecteditems, form{{/str}}</span>
-    {{#items}}
-        <span role="listitem" data-value="{{value}}" aria-selected="true" class="badge badge-info mb-3 mr-1" style="font-size: 100%">
-            {{#multiple}}<span aria-hidden="true">× </span>{{/multiple}}{{{label}}}
-        </span>
-    {{/items}}
-    {{^items}}
-        <span class="mb-3 mr-1">{{noSelectionString}}</span>
-    {{/items}}
+    {{> core/form_autocomplete_selection_items }}
 </div>
diff --git a/lib/templates/form_autocomplete_selection_items.mustache b/lib/templates/form_autocomplete_selection_items.mustache
new file mode 100644
index 0000000000000..22ff5f2c48ec7
--- /dev/null
+++ b/lib/templates/form_autocomplete_selection_items.mustache
@@ -0,0 +1,47 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core/form_autocomplete_selection_items
+
+    Moodle template for the currently selected items in an autocomplate form element.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * data-value
+
+    Context variables required for this template:
+    * items List of items with label and value fields.
+    *   - value Value of the selected item.
+    *   - label HTML representing the value.
+    * noSelectionString String to use when no items are selected
+
+    Example context (json):
+    { "items": [
+        { "label": "Item label with <strong>tags</strong>", "value": "5" },
+        { "label": "Another item label with <strong>tags</strong>", "value": "4" }
+    ], "noSelectionString": "No selection" }
+}}
+{{#items}}
+    <span role="listitem" data-value="{{value}}" aria-selected="true" class="badge badge-info mb-3 mr-1" style="font-size: 100%">
+        <span aria-hidden="true">× </span>{{{label}}}
+    </span>
+{{/items}}
+{{^items}}
+    <span class="mb-3 mr-1">{{noSelectionString}}</span>
+{{/items}}
diff --git a/lib/templates/form_autocomplete_suggestions.mustache b/lib/templates/form_autocomplete_suggestions.mustache
index 83866adb74225..a7cc56a4fd455 100644
--- a/lib/templates/form_autocomplete_suggestions.mustache
+++ b/lib/templates/form_autocomplete_suggestions.mustache
@@ -35,7 +35,7 @@
         { "label": "Another item label with <strong>tags</strong>", "value": "4" }
     ]}
 }}
-<ul class="form-autocomplete-suggestions" id="{{suggestionsId}}" role="listbox" aria-hidden="true">
+<ul class="form-autocomplete-suggestions" id="{{suggestionsId}}" role="listbox" aria-hidden="true" tabindex="-1">
     {{#options}}
         <li role="option" data-value="{{value}}">{{{label}}}</li>
     {{/options}}
diff --git a/lib/templates/loginform.mustache b/lib/templates/loginform.mustache
index 5f8066697da4d..27b8ec5bdfcd1 100644
--- a/lib/templates/loginform.mustache
+++ b/lib/templates/loginform.mustache
@@ -38,8 +38,9 @@
     * cookieshelpiconformatted - Formatted html of cookies help icon,
     * errorformatted - Formatted error,
     * logourl - Flag, logo url,
-    * sitename - Name of site.
-    * logintoken - Random token to protect login request.
+    * sitename - Name of site.,
+    * logintoken - Random token to protect login request.,
+    * maintenance - Maintenance message
 
     Example context (json):
     {
@@ -89,7 +90,8 @@
         "errorformatted": "",
         "logourl": false,
         "sitename": "Beer & Chips",
-        "logintoken": "randomstring"
+        "logintoken": "randomstring",
+        "maintenance": "For full access to this site, you need to login in as an admin."
     }
 }}
 
@@ -224,6 +226,22 @@
 </div>
 {{/hasinstructions}}
 
+{{#maintenance}}
+    <div class="row justify-content-center mt-3">
+        <div class="col-xl-6 col-sm-8">
+            <div class="card">
+                <div class="card-body">
+                    <div class="card-title">
+                        <h2>{{#str}}sitemaintenance, core_admin{{/str}}</h2>
+                    </div>
+                    <div>
+                        {{{maintenance}}}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{{/maintenance}}
 {{#js}}
     {{#error}}
         require(['jquery'], function($) {
diff --git a/lib/templates/paged_content_paging_bar.mustache b/lib/templates/paged_content_paging_bar.mustache
index 15fe22349388e..c8e36a40a6ae1 100644
--- a/lib/templates/paged_content_paging_bar.mustache
+++ b/lib/templates/paged_content_paging_bar.mustache
@@ -141,6 +141,9 @@
         {{^arialabels.paginationactivenavitemcomponents}}
             data-aria-label-components-pagination-active-item="pagedcontentnavigationactiveitem, core"
         {{/arialabels.paginationactivenavitemcomponents}}
+        {{#barsize}}
+            data-bar-size="{{.}}"
+        {{/barsize}}
     >
 
         <ul class="pagination mb-0">
@@ -161,11 +164,27 @@
                     {{$attributes}}data-control="first"{{/attributes}}
                 {{/ core/paged_content_paging_bar_item }}
             {{/first}}
+            {{#barsize}}
+                {{< core/paged_content_paging_bar_item }}
+                    {{$item-content}}
+                        <span aria-hidden="true">&hellip;</span>
+                    {{/item-content}}
+                    {{$attributes}}data-dots="beginning"{{/attributes}}
+                {{/ core/paged_content_paging_bar_item }}
+            {{/barsize}}
             {{#pages}}
                 {{< core/paged_content_paging_bar_item }}
                     {{$attributes}}data-page="true"{{/attributes}}
                 {{/ core/paged_content_paging_bar_item }}
             {{/pages}}
+            {{#barsize}}
+                {{< core/paged_content_paging_bar_item }}
+                    {{$item-content}}
+                        <span aria-hidden="true">&hellip;</span>
+                    {{/item-content}}
+                    {{$attributes}}data-dots="ending"{{/attributes}}
+                {{/ core/paged_content_paging_bar_item }}
+            {{/barsize}}
             {{#last}}
                 {{< core/paged_content_paging_bar_item }}
                     {{$item-content}}
diff --git a/lib/templates/select_time.mustache b/lib/templates/select_time.mustache
index f2c9029613ed1..df48117bd2cd3 100644
--- a/lib/templates/select_time.mustache
+++ b/lib/templates/select_time.mustache
@@ -31,7 +31,7 @@
     }
 }}
 <label for="{{id}}" class="sr-only">{{label}}</label>
-<select name="{{name}}" id="{{id}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}} class="form-control">
+<select name="{{name}}" id="{{id}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}} class="form-control custom-select">
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
     {{/options}}
diff --git a/lib/templates/single_select.mustache b/lib/templates/single_select.mustache
index 071d38c2e282a..288fa7e7bcacf 100644
--- a/lib/templates/single_select.mustache
+++ b/lib/templates/single_select.mustache
@@ -111,7 +111,7 @@
             {{/options}}
         </select>
         <noscript>
-            <input type="submit" class="btn btn-secondary" value="{{#str}}go, core{{/str}}">
+            <input type="submit" class="btn btn-secondary ml-1" value="{{#str}}go, core{{/str}}">
         </noscript>
     </form>
 </div>
diff --git a/lib/templates/url_select.mustache b/lib/templates/url_select.mustache
index e7d2293765781..16fe626c0cf6e 100644
--- a/lib/templates/url_select.mustache
+++ b/lib/templates/url_select.mustache
@@ -64,11 +64,11 @@
             {{/options}}
         </select>
         {{#showbutton}}
-            <input type="submit" class="btn btn-secondary" value="{{showbutton}}">
+            <input type="submit" class="btn btn-secondary ml-1" value="{{showbutton}}">
         {{/showbutton}}
         {{^showbutton}}
             <noscript>
-                <input type="submit" class="btn btn-secondary" value="{{#str}}go, core{{/str}}">
+                <input type="submit" class="btn btn-secondary ml-1" value="{{#str}}go, core{{/str}}">
             </noscript>
         {{/showbutton}}
     </form>
diff --git a/lib/testing/classes/test_lock.php b/lib/testing/classes/test_lock.php
index 169241e2c4739..2c8314ae6feb0 100644
--- a/lib/testing/classes/test_lock.php
+++ b/lib/testing/classes/test_lock.php
@@ -47,13 +47,15 @@ class test_lock {
      *
      * @internal
      * @static
-     * @param    string  $framework Test framework
-     * @return   void
+     * @param   string $framework phpunit|behat
+     * @param   string $lockfilesuffix A sub-type used by the framework
+     * @return  void
      */
-    public static function acquire($framework) {
+    public static function acquire(string $framework, string $lockfilesuffix = '') {
         global $CFG;
+
         $datarootpath = $CFG->{$framework . '_dataroot'} . '/' . $framework;
-        $lockfile = $datarootpath . '/lock';
+        $lockfile = "{$datarootpath}/lock{$lockfilesuffix}";
         if (!file_exists($datarootpath)) {
             // Dataroot not initialised yet.
             return;
@@ -62,36 +64,58 @@ public static function acquire($framework) {
             file_put_contents($lockfile, 'This file prevents concurrent execution of Moodle ' . $framework . ' tests');
             testing_fix_file_permissions($lockfile);
         }
-        if (self::$lockhandles[$framework] = fopen($lockfile, 'r')) {
+
+        $lockhandlename = self::get_lock_handle_name($framework, $lockfilesuffix);
+        if (self::$lockhandles[$lockhandlename] = fopen($lockfile, 'r')) {
             $wouldblock = null;
-            $locked = flock(self::$lockhandles[$framework], (LOCK_EX | LOCK_NB), $wouldblock);
+            $locked = flock(self::$lockhandles[$lockhandlename], (LOCK_EX | LOCK_NB), $wouldblock);
             if (!$locked) {
                 if ($wouldblock) {
                     echo "Waiting for other test execution to complete...\n";
                 }
-                $locked = flock(self::$lockhandles[$framework], LOCK_EX);
+                $locked = flock(self::$lockhandles[$lockhandlename], LOCK_EX);
             }
             if (!$locked) {
-                fclose(self::$lockhandles[$framework]);
-                self::$lockhandles[$framework] = null;
+                fclose(self::$lockhandles[$lockhandlename]);
+                self::$lockhandles[$lockhandlename] = null;
             }
         }
-        register_shutdown_function(array('test_lock', 'release'), $framework);
+        register_shutdown_function(['test_lock', 'release'], $framework, $lockfilesuffix);
     }
 
     /**
      * Note: do not call manually!
      * @internal
      * @static
-     * @param    string  $framework phpunit|behat
-     * @return   void
+     * @param   string $framework phpunit|behat
+     * @param   string $lockfilesuffix A sub-type used by the framework
+     * @return  void
      */
-    public static function release($framework) {
-        if (self::$lockhandles[$framework]) {
-            flock(self::$lockhandles[$framework], LOCK_UN);
-            fclose(self::$lockhandles[$framework]);
-            self::$lockhandles[$framework] = null;
+    public static function release(string $framework, string $lockfilesuffix = '') {
+        $lockhandlename = self::get_lock_handle_name($framework, $lockfilesuffix);
+
+        if (self::$lockhandles[$lockhandlename]) {
+            flock(self::$lockhandles[$lockhandlename], LOCK_UN);
+            fclose(self::$lockhandles[$lockhandlename]);
+            self::$lockhandles[$lockhandlename] = null;
         }
     }
 
+    /**
+     * Get the name of the lock handle stored in the class.
+     *
+     * @param   string $framework
+     * @param   string $lockfilesuffix
+     * @return  string
+     */
+    protected static function get_lock_handle_name(string $framework, string $lockfilesuffix): string {
+        $lockhandlepieces = [$framework];
+
+        if (!empty($lockfilesuffix)) {
+            $lockhandlepieces[] = $lockfilesuffix;
+        }
+
+        return implode('%', $lockhandlepieces);
+    }
+
 }
diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php
index 0d7f24b1968a9..e6834a491b630 100644
--- a/lib/tests/accesslib_test.php
+++ b/lib/tests/accesslib_test.php
@@ -340,7 +340,9 @@ public function test_has_coursecontact_role() {
 
         $user = $this->getDataGenerator()->create_user();
         $course = $this->getDataGenerator()->create_course();
-        role_assign($CFG->coursecontact, $user->id, context_course::instance($course->id));
+        $contactroles = preg_split('/,/', $CFG->coursecontact);
+        $roleid = reset($contactroles);
+        role_assign($roleid, $user->id, context_course::instance($course->id));
         $this->assertTrue(has_coursecontact_role($user->id));
     }
 
@@ -727,8 +729,13 @@ public function test_get_all_roles() {
         $this->resetAfterTest();
 
         $allroles = get_all_roles();
-        $this->assertInternalType('array', $allroles);
-        $this->assertCount(8, $allroles); // There are 8 roles is standard install.
+        $this->assertIsArray($allroles);
+        $initialrolescount = count($allroles);
+        $this->assertTrue($initialrolescount >= 8); // There are 8 roles is standard install.
+        $rolenames = array_column($allroles, 'shortname');
+        foreach (get_role_archetypes() as $archetype) {
+            $this->assertContains($archetype, $rolenames);
+        }
 
         $role = reset($allroles);
         $role = (array)$role;
@@ -750,8 +757,8 @@ public function test_get_all_roles() {
         $renames = $DB->get_records_menu('role_names', array('contextid'=>$coursecontext->id), '', 'roleid, name');
 
         $allroles = get_all_roles($coursecontext);
-        $this->assertInternalType('array', $allroles);
-        $this->assertCount(9, $allroles);
+        $this->assertIsArray($allroles);
+        $this->assertCount($initialrolescount + 1, $allroles);
         $role = reset($allroles);
         $role = (array)$role;
 
@@ -784,18 +791,18 @@ public function test_get_role_archetypes() {
     public function test_get_archetype_roles() {
         $this->resetAfterTest();
 
-        // New install should have 1 role for each archetype.
+        // New install should have at least 1 role for each archetype.
         $archetypes = get_role_archetypes();
         foreach ($archetypes as $archetype) {
             $roles = get_archetype_roles($archetype);
-            $this->assertCount(1, $roles);
+            $this->assertGreaterThanOrEqual(1, count($roles));
             $role = reset($roles);
             $this->assertSame($archetype, $role->archetype);
         }
 
         create_role('New student role', 'student2', 'New student description', 'student');
         $roles = get_archetype_roles('student');
-        $this->assertCount(2, $roles);
+        $this->assertGreaterThanOrEqual(2, count($roles));
     }
 
     /**
@@ -818,8 +825,11 @@ public function test_role_get_name() {
         $renames = $DB->get_records_menu('role_names', array('contextid'=>$coursecontext->id), '', 'roleid, name');
 
         foreach ($allroles as $role) {
+            if (in_array($role->shortname, get_role_archetypes())) {
+                // Standard roles do not have a set name.
+                $this->assertSame('', $role->name);
+            }
             // Get localised name from lang pack.
-            $this->assertSame('', $role->name);
             $name = role_get_name($role, null, ROLENAME_ORIGINAL);
             $this->assertNotEmpty($name);
             $this->assertNotEquals($role->shortname, $name);
@@ -1500,14 +1510,8 @@ public function test_get_default_enrol_roles() {
         $allroles = get_all_roles();
         $expected = array($id2=>$allroles[$id2]);
 
-        foreach (get_role_archetypes() as $archetype) {
-            $defaults = get_default_contextlevels($archetype);
-            if (in_array(CONTEXT_COURSE, $defaults)) {
-                $roles = get_archetype_roles($archetype);
-                foreach ($roles as $role) {
-                    $expected[$role->id] = $role;
-                }
-            }
+        foreach (get_roles_for_contextlevels(CONTEXT_COURSE) as $roleid) {
+            $expected[$roleid] = $roleid;
         }
 
         $roles = get_default_enrol_roles($coursecontext);
@@ -2686,7 +2690,7 @@ public function test_permission_evaluation() {
         $testcourses = array();
         $testpages = array();
         $testblocks = array();
-        $allroles = $DB->get_records_menu('role', array(), 'id', 'archetype, id');
+        $allroles = $DB->get_records_menu('role', array(), 'id', 'shortname, id');
 
         $systemcontext = context_system::instance();
         $frontpagecontext = context_course::instance(SITEID);
@@ -3608,8 +3612,8 @@ public function test_update_capabilities() {
         $this->resetAfterTest(true);
 
         $froncontext = context_course::instance($SITE->id);
-        $student = $DB->get_record('role', array('archetype'=>'student'));
-        $teacher = $DB->get_record('role', array('archetype'=>'teacher'));
+        $student = $DB->get_record('role', array('shortname'=>'student'));
+        $teacher = $DB->get_record('role', array('shortname'=>'teacher'));
 
         $existingcaps = $DB->get_records('capabilities', array(), 'id', 'name, captype, contextlevel, component, riskbitmask');
 
diff --git a/lib/tests/adhoc_task_test.php b/lib/tests/adhoc_task_test.php
index c5d796102f8b3..6a0b30c35799c 100644
--- a/lib/tests/adhoc_task_test.php
+++ b/lib/tests/adhoc_task_test.php
@@ -362,4 +362,50 @@ public function test_adhoc_task_user_set() {
 
         $this->assertEquals($user->id, $task->get_userid());
     }
+
+    /**
+     * Test adhoc task sorting.
+     */
+    public function test_get_next_adhoc_task_sorting() {
+        $this->resetAfterTest(true);
+
+        // Create adhoc tasks.
+        $task1 = new \core\task\adhoc_test_task();
+        $task1->set_next_run_time(1510000000);
+        $task1->set_custom_data_as_string('Task 1');
+        \core\task\manager::queue_adhoc_task($task1);
+
+        $task2 = new \core\task\adhoc_test_task();
+        $task2->set_next_run_time(1520000000);
+        $task2->set_custom_data_as_string('Task 2');
+        \core\task\manager::queue_adhoc_task($task2);
+
+        $task3 = new \core\task\adhoc_test_task();
+        $task3->set_next_run_time(1520000000);
+        $task3->set_custom_data_as_string('Task 3');
+        \core\task\manager::queue_adhoc_task($task3);
+
+        // Shuffle tasks.
+        $task1->set_next_run_time(1540000000);
+        \core\task\manager::reschedule_or_queue_adhoc_task($task1);
+
+        $task3->set_next_run_time(1530000000);
+        \core\task\manager::reschedule_or_queue_adhoc_task($task3);
+
+        $task2->set_next_run_time(1530000000);
+        \core\task\manager::reschedule_or_queue_adhoc_task($task2);
+
+        // Confirm, that tasks are sorted by nextruntime and then by id (ascending).
+        $task = \core\task\manager::get_next_adhoc_task(time());
+        $this->assertEquals('Task 2', $task->get_custom_data_as_string());
+        \core\task\manager::adhoc_task_complete($task);
+
+        $task = \core\task\manager::get_next_adhoc_task(time());
+        $this->assertEquals('Task 3', $task->get_custom_data_as_string());
+        \core\task\manager::adhoc_task_complete($task);
+
+        $task = \core\task\manager::get_next_adhoc_task(time());
+        $this->assertEquals('Task 1', $task->get_custom_data_as_string());
+        \core\task\manager::adhoc_task_complete($task);
+    }
 }
diff --git a/lib/tests/behat/app_behat_runtime.js b/lib/tests/behat/app_behat_runtime.js
index 08ccc8c795b7c..888a1571bac37 100644
--- a/lib/tests/behat/app_behat_runtime.js
+++ b/lib/tests/behat/app_behat_runtime.js
@@ -240,9 +240,12 @@
         var exactLabelMatches = [];
         var anyLabelMatches = [];
         findPossibleMatches('//*[@aria-label and contains(@aria-label, "' + escapedText + '")]' +
+                '| //a[@title and contains(@title, "' + escapedText + '")]' +
                 '| //img[@alt and contains(@alt, "' + escapedText + '")]', function(match) {
                     // Add to array depending on if it's an exact or partial match.
-                    var attributeData = match.getAttribute('aria-label') || match.getAttribute('alt');
+                    var attributeData = match.getAttribute('aria-label') ||
+                        match.getAttribute('title') ||
+                        match.getAttribute('alt');
                     if (attributeData.trim() === text) {
                         exactLabelMatches.push(match);
                     } else {
@@ -398,7 +401,9 @@
                 selector = 'ion-navbar > button.back-button-md';
                 break;
             case 'main menu' :
-                selector = 'page-core-mainmenu .tab-button > ion-icon[aria-label=more]';
+                // Change in app version 3.8.
+                selector = 'page-core-mainmenu .tab-button > ion-icon[aria-label=more], ' +
+                        'page-core-mainmenu .tab-button > ion-icon[aria-label=menu]';
                 break;
             case 'page menu' :
                 // This lang string was changed in app version 3.6.
diff --git a/lib/tests/behat/behat_app.php b/lib/tests/behat/behat_app.php
index fee3f56d90320..4996b27972b5d 100644
--- a/lib/tests/behat/behat_app.php
+++ b/lib/tests/behat/behat_app.php
@@ -85,6 +85,10 @@ public function i_enter_the_app() {
         $this->getSession()->restart();
         $this->resize_window('360x720', true);
 
+        if (empty($this->ionicurl)) {
+            $this->ionicurl = $this->start_or_reuse_ionic();
+        }
+
         // Go to page and prepare browser for app.
         $this->prepare_browser($this->ionicurl);
     }
@@ -241,6 +245,7 @@ protected function start_or_reuse_ionic() {
             // the process.
             self::$ionicrunning = (object)['url' => $url, 'process' => $process, 'pipes' => $pipes,
                     'pid' => $pid];
+            $url = self::$ionicrunning->url;
         }
         return $url;
     }
@@ -524,4 +529,15 @@ public function i_close_the_browser_tab_opened_by_the_app() {
         $this->getSession()->getDriver()->executeScript('window.close()');
         $this->getSession()->switchToWindow($names[0]);
     }
+
+    /**
+     * Switch navigator online mode.
+     *
+     * @Given /^I switch offline mode to "(?P<offline_string>(?:[^"]|\\")*)"$/
+     * @param string $offline New value for navigator online mode
+     * @throws DriverException If the navigator.online mode is not available
+     */
+    public function i_switch_offline_mode(string $offline) {
+        $this->getSession()->evaluateScript('appProvider.setForceOffline(' . $offline . ');');
+    }
 }
diff --git a/lib/tests/behat/behat_data_generators.php b/lib/tests/behat/behat_data_generators.php
index ce1584b4bdfc9..2b805ed1f8ead 100644
--- a/lib/tests/behat/behat_data_generators.php
+++ b/lib/tests/behat/behat_data_generators.php
@@ -33,16 +33,23 @@
 /**
  * Class to set up quickly a Given environment.
  *
- * Acceptance tests are block-boxed, so this steps definitions should only
- * be used to set up the test environment as we are not replicating user steps.
+ * The entry point is the Behat steps:
+ *     the following "entity types" exist:
+ *       | test | data |
  *
- * All data generators should be in lib/testing/generator/*, shared between phpunit
- * and behat and they should be called from here, if possible using the standard
- * 'create_$elementname($options)' and if it's not possible (data generators arguments will not be
- * always the same) or the element is not suitable to be a data generator, create a
- * 'process_$elementname($options)' method and use the data generator from there if possible.
+ * Entity type will either look like "users" or "activities" for core entities, or
+ * "mod_forum > subscription" or "core_message > message" for entities belonging
+ * to components.
+ *
+ * Generally, you only need to specify properties relevant to your test,
+ * and everything else gets set to sensible defaults.
+ *
+ * The actual generation of entities is done by {@link behat_generator_base}.
+ * There is one subclass for each component, e.g. {@link behat_core_generator}
+ * or {@link behat_mod_quiz_generator}. To see the types of entity
+ * that can be created for each component, look at the arrays returned
+ * by the get_creatable_entities() method in each class.
  *
- * @todo      If the available elements list grows too much this class must be split into smaller pieces
  * @package   core
  * @category  test
  * @copyright 2012 David Monllaó
@@ -51,935 +58,98 @@
 class behat_data_generators extends behat_base {
 
     /**
-     * @var testing_data_generator
-     */
-    protected $datagenerator;
-
-    /**
-     * Each element specifies:
-     * - The data generator sufix used.
-     * - The required fields.
-     * - The mapping between other elements references and database field names.
-     * @var array
+     * Convert legacy entity names to the new component-specific form.
+     *
+     * In the past, there was no support for plugins, and everything that
+     * could be created was handled by the core generator. Now, we can
+     * support plugins, and so some thing should probably be moved.
+     *
+     * For example, in the future we should probably add
+     * 'message contacts' => 'core_message > contact'] to
+     * this array, and move generation of message contact
+     * from core to core_message.
+     *
+     * @var array old entity type => new entity type.
      */
-    protected static $elements = array(
-        'users' => array(
-            'datagenerator' => 'user',
-            'required' => array('username')
-        ),
-        'categories' => array(
-            'datagenerator' => 'category',
-            'required' => array('idnumber'),
-            'switchids' => array('category' => 'parent')
-        ),
-        'courses' => array(
-            'datagenerator' => 'course',
-            'required' => array('shortname'),
-            'switchids' => array('category' => 'category')
-        ),
-        'groups' => array(
-            'datagenerator' => 'group',
-            'required' => array('idnumber', 'course'),
-            'switchids' => array('course' => 'courseid')
-        ),
-        'groupings' => array(
-            'datagenerator' => 'grouping',
-            'required' => array('idnumber', 'course'),
-            'switchids' => array('course' => 'courseid')
-        ),
-        'course enrolments' => array(
-            'datagenerator' => 'enrol_user',
-            'required' => array('user', 'course', 'role'),
-            'switchids' => array('user' => 'userid', 'course' => 'courseid', 'role' => 'roleid')
-        ),
-        'custom field categories' => array(
-            'datagenerator' => 'custom_field_category',
-            'required' => array('name', 'component', 'area', 'itemid'),
-            'switchids' => array()
-        ),
-        'custom fields' => array(
-            'datagenerator' => 'custom_field',
-            'required' => array('name', 'category', 'type', 'shortname'),
-            'switchids' => array()
-        ),
-        'permission overrides' => array(
-            'datagenerator' => 'permission_override',
-            'required' => array('capability', 'permission', 'role', 'contextlevel', 'reference'),
-            'switchids' => array('role' => 'roleid')
-        ),
-        'system role assigns' => array(
-            'datagenerator' => 'system_role_assign',
-            'required' => array('user', 'role'),
-            'switchids' => array('user' => 'userid', 'role' => 'roleid')
-        ),
-        'role assigns' => array(
-            'datagenerator' => 'role_assign',
-            'required' => array('user', 'role', 'contextlevel', 'reference'),
-            'switchids' => array('user' => 'userid', 'role' => 'roleid')
-        ),
-        'activities' => array(
-            'datagenerator' => 'activity',
-            'required' => array('activity', 'idnumber', 'course'),
-            'switchids' => array('course' => 'course', 'gradecategory' => 'gradecat')
-        ),
-        'blocks' => array(
-            'datagenerator' => 'block_instance',
-            'required' => array('blockname', 'contextlevel', 'reference'),
-        ),
-        'group members' => array(
-            'datagenerator' => 'group_member',
-            'required' => array('user', 'group'),
-            'switchids' => array('user' => 'userid', 'group' => 'groupid')
-        ),
-        'grouping groups' => array(
-            'datagenerator' => 'grouping_group',
-            'required' => array('grouping', 'group'),
-            'switchids' => array('grouping' => 'groupingid', 'group' => 'groupid')
-        ),
-        'cohorts' => array(
-            'datagenerator' => 'cohort',
-            'required' => array('idnumber')
-        ),
-        'cohort members' => array(
-            'datagenerator' => 'cohort_member',
-            'required' => array('user', 'cohort'),
-            'switchids' => array('user' => 'userid', 'cohort' => 'cohortid')
-        ),
-        'roles' => array(
-            'datagenerator' => 'role',
-            'required' => array('shortname')
-        ),
-        'grade categories' => array(
-            'datagenerator' => 'grade_category',
-            'required' => array('fullname', 'course'),
-            'switchids' => array('course' => 'courseid', 'gradecategory' => 'parent')
-        ),
-        'grade items' => array(
-            'datagenerator' => 'grade_item',
-            'required' => array('course'),
-            'switchids' => array('scale' => 'scaleid', 'outcome' => 'outcomeid', 'course' => 'courseid',
-                                 'gradecategory' => 'categoryid')
-        ),
-        'grade outcomes' => array(
-            'datagenerator' => 'grade_outcome',
-            'required' => array('shortname', 'scale'),
-            'switchids' => array('course' => 'courseid', 'gradecategory' => 'categoryid', 'scale' => 'scaleid')
-        ),
-        'scales' => array(
-            'datagenerator' => 'scale',
-            'required' => array('name', 'scale'),
-            'switchids' => array('course' => 'courseid')
-        ),
-        'question categories' => array(
-            'datagenerator' => 'question_category',
-            'required' => array('name', 'contextlevel', 'reference'),
-            'switchids' => array('questioncategory' => 'parent')
-        ),
-        'questions' => array(
-            'datagenerator' => 'question',
-            'required' => array('qtype', 'questioncategory', 'name'),
-            'switchids' => array('questioncategory' => 'category', 'user' => 'createdby')
-        ),
-        'tags' => array(
-            'datagenerator' => 'tag',
-            'required' => array('name')
-        ),
-        'events' => array(
-            'datagenerator' => 'event',
-            'required' => array('name', 'eventtype'),
-            'switchids' => array(
-                'user' => 'userid',
-                'course' => 'courseid',
-                'category' => 'categoryid',
-            )
-        ),
-        'message contacts' => array(
-            'datagenerator' => 'message_contacts',
-            'required' => array('user', 'contact'),
-            'switchids' => array('user' => 'userid', 'contact' => 'contactid')
-        ),
-        'private messages' => array(
-            'datagenerator' => 'private_messages',
-            'required' => array('user', 'contact', 'message'),
-            'switchids' => array('user' => 'userid', 'contact' => 'contactid')
-        ),
-        'favourite conversations' => array(
-            'datagenerator' => 'favourite_conversations',
-            'required' => array('user', 'contact'),
-            'switchids' => array('user' => 'userid', 'contact' => 'contactid')
-        ),
-        'language customisations' => array(
-            'datagenerator' => 'customlang',
-            'required' => array('component', 'stringid', 'value'),
-        ),
-    );
+    protected $movedentitytypes = [
+    ];
 
     /**
      * Creates the specified element.
      *
-     * The most reliable list of what types of thing can be created is the
-     * $elements array defined above.
+     * See the class comment for an overview.
      *
      * @Given /^the following "(?P<element_string>(?:[^"]|\\")*)" exist:$/
      *
-     * @throws Exception
-     * @throws PendingException
-     * @param string    $elementname The name of the entity to add
+     * @param string    $entitytype The name of the type entity to add
      * @param TableNode $data
      */
-    public function the_following_exist($elementname, TableNode $data) {
-
-        // Now that we need them require the data generators.
-        require_once(__DIR__ . '/../../testing/generator/lib.php');
-
-        if (empty(self::$elements[$elementname])) {
-            throw new PendingException($elementname . ' data generator is not implemented');
+    public function the_following_entities_exist($entitytype, TableNode $data) {
+        if (isset($this->movedentitytypes[$entitytype])) {
+            $entitytype = $this->movedentitytypes[$entitytype];
         }
-
-        $this->datagenerator = testing_util::get_data_generator();
-
-        $elementdatagenerator = self::$elements[$elementname]['datagenerator'];
-        $requiredfields = self::$elements[$elementname]['required'];
-        if (!empty(self::$elements[$elementname]['switchids'])) {
-            $switchids = self::$elements[$elementname]['switchids'];
-        }
-
-        foreach ($data->getHash() as $elementdata) {
-
-            // Check if all the required fields are there.
-            foreach ($requiredfields as $requiredfield) {
-                if (!isset($elementdata[$requiredfield])) {
-                    throw new Exception($elementname . ' requires the field ' . $requiredfield . ' to be specified');
-                }
-            }
-
-            // Switch from human-friendly references to ids.
-            if (isset($switchids)) {
-                foreach ($switchids as $element => $field) {
-                    $methodname = 'get_' . $element . '_id';
-
-                    // Not all the switch fields are required, default vars will be assigned by data generators.
-                    if (isset($elementdata[$element])) {
-                        // Temp $id var to avoid problems when $element == $field.
-                        $id = $this->{$methodname}($elementdata[$element]);
-                        unset($elementdata[$element]);
-                        $elementdata[$field] = $id;
-                    }
-                }
-            }
-
-            // Preprocess the entities that requires a special treatment.
-            if (method_exists($this, 'preprocess_' . $elementdatagenerator)) {
-                $elementdata = $this->{'preprocess_' . $elementdatagenerator}($elementdata);
-            }
-
-            // Creates element.
-            $methodname = 'create_' . $elementdatagenerator;
-            if (method_exists($this->datagenerator, $methodname)) {
-                // Using data generators directly.
-                $this->datagenerator->{$methodname}($elementdata);
-
-            } else if (method_exists($this, 'process_' . $elementdatagenerator)) {
-                // Using an alternative to the direct data generator call.
-                $this->{'process_' . $elementdatagenerator}($elementdata);
-            } else {
-                throw new PendingException($elementname . ' data generator is not implemented');
-            }
-        }
-
-    }
-
-    /**
-     * If password is not set it uses the username.
-     * @param array $data
-     * @return array
-     */
-    protected function preprocess_user($data) {
-        if (!isset($data['password'])) {
-            $data['password'] = $data['username'];
-        }
-        return $data;
+        list($component, $entity) = $this->parse_entity_type($entitytype);
+        $this->get_instance_for_component($component)->generate_items($entity, $data);
     }
 
     /**
-     * If contextlevel and reference are specified for cohort, transform them to the contextid.
+     * Parse a full entity type like 'users' or 'mod_forum > subscription'.
      *
-     * @param array $data
-     * @return array
-     */
-    protected function preprocess_cohort($data) {
-        if (isset($data['contextlevel'])) {
-            if (!isset($data['reference'])) {
-                throw new Exception('If field contextlevel is specified, field reference must also be present');
-            }
-            $context = $this->get_context($data['contextlevel'], $data['reference']);
-            unset($data['contextlevel']);
-            unset($data['reference']);
-            $data['contextid'] = $context->id;
-        }
-        return $data;
-    }
-
-    /**
-     * Preprocesses the creation of a grade item. Converts gradetype text to a number.
-     * @param array $data
-     * @return array
-     */
-    protected function preprocess_grade_item($data) {
-        global $CFG;
-        require_once("$CFG->libdir/grade/constants.php");
-
-        if (isset($data['gradetype'])) {
-            $data['gradetype'] = constant("GRADE_TYPE_" . strtoupper($data['gradetype']));
-        }
-
-        if (!empty($data['category']) && !empty($data['courseid'])) {
-            $cat = grade_category::fetch(array('fullname' => $data['category'], 'courseid' => $data['courseid']));
-            if (!$cat) {
-                throw new Exception('Could not resolve category with name "' . $data['category'] . '"');
-            }
-            unset($data['category']);
-            $data['categoryid'] = $cat->id;
-        }
-
-        return $data;
-    }
-
-    /**
-     * Adapter to modules generator
-     * @throws Exception Custom exception for test writers
-     * @param array $data
-     * @return void
-     */
-    protected function process_activity($data) {
-        global $DB, $CFG;
-
-        // The the_following_exists() method checks that the field exists.
-        $activityname = $data['activity'];
-        unset($data['activity']);
-
-        // Convert scale name into scale id (negative number indicates using scale).
-        if (isset($data['grade']) && strlen($data['grade']) && !is_number($data['grade'])) {
-            $data['grade'] = - $this->get_scale_id($data['grade']);
-            require_once("$CFG->libdir/grade/constants.php");
-
-            if (!isset($data['gradetype'])) {
-                $data['gradetype'] = GRADE_TYPE_SCALE;
-            }
-        }
-
-        // We split $data in the activity $record and the course module $options.
-        $cmoptions = array();
-        $cmcolumns = $DB->get_columns('course_modules');
-        foreach ($cmcolumns as $key => $value) {
-            if (isset($data[$key])) {
-                $cmoptions[$key] = $data[$key];
-            }
-        }
-
-        // Custom exception.
-        try {
-            $this->datagenerator->create_module($activityname, $data, $cmoptions);
-        } catch (coding_exception $e) {
-            throw new Exception('\'' . $activityname . '\' activity can not be added using this step,' .
-                ' use the step \'I add a "ACTIVITY_OR_RESOURCE_NAME_STRING" to section "SECTION_NUMBER"\' instead');
-        }
-    }
-
-    /**
-     * Add a block to a page.
-     *
-     * @param array $data should mostly match the fields of the block_instances table.
-     *     The block type is specified by blockname.
-     *     The parentcontextid is set from contextlevel and reference.
-     *     Missing values are filled in by testing_block_generator::prepare_record.
-     *     $data is passed to create_block as both $record and $options. Normally
-     *     the keys are different, so this is a way to let people set values in either place.
-     */
-    protected function process_block_instance($data) {
-
-        if (empty($data['blockname'])) {
-            throw new Exception('\'blocks\' requires the field \'block\' type to be specified');
-        }
-
-        if (empty($data['contextlevel'])) {
-            throw new Exception('\'blocks\' requires the field \'contextlevel\' to be specified');
-        }
-
-        if (!isset($data['reference'])) {
-            throw new Exception('\'blocks\' requires the field \'reference\' to be specified');
-        }
-
-        $context = $this->get_context($data['contextlevel'], $data['reference']);
-        $data['parentcontextid'] = $context->id;
-
-        // Pass $data as both $record and $options. I think that is unlikely to
-        // cause problems since the relevant key names are different.
-        // $options is not used in most blocks I have seen, but where it is, it is necessary.
-        $this->datagenerator->create_block($data['blockname'], $data, $data);
-    }
-
-    /**
-     * Creates language customisation.
+     * E.g. parsing 'course' gives ['core', 'course'] and
+     * parsing 'core_message > message' gives ['core_message', 'message'].
      *
-     * @throws Exception
-     * @throws dml_exception
-     * @param array $data
-     * @return void
+     * @param string $entitytype the entity type
+     * @return string[] with two elements, component and entity type.
      */
-    protected function process_customlang($data) {
-        global $CFG, $DB, $USER;
-
-        require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/customlang/locallib.php');
-        require_once($CFG->libdir . '/adminlib.php');
-
-        if (empty($data['component'])) {
-            throw new Exception('\'customlang\' requires the field \'component\' type to be specified');
-        }
-
-        if (empty($data['stringid'])) {
-            throw new Exception('\'customlang\' requires the field \'stringid\' to be specified');
-        }
-
-        if (!isset($data['value'])) {
-            throw new Exception('\'customlang\' requires the field \'value\' to be specified');
-        }
-
-        $now = time();
-
-        tool_customlang_utils::checkout($USER->lang);
-
-        $record = $DB->get_record_sql("SELECT s.*
-                                         FROM {tool_customlang} s
-                                         JOIN {tool_customlang_components} c ON s.componentid = c.id
-                                        WHERE c.name = ? AND s.lang = ? AND s.stringid = ?",
-                array($data['component'], $USER->lang, $data['stringid']));
-
-        if (empty($data['value']) && !is_null($record->local)) {
-            $record->local = null;
-            $record->modified = 1;
-            $record->outdated = 0;
-            $record->timecustomized = null;
-            $DB->update_record('tool_customlang', $record);
-            tool_customlang_utils::checkin($USER->lang);
-        }
-
-        if (!empty($data['value']) && $data['value'] != $record->local) {
-            $record->local = $data['value'];
-            $record->modified = 1;
-            $record->outdated = 0;
-            $record->timecustomized = $now;
-            $DB->update_record('tool_customlang', $record);
-            tool_customlang_utils::checkin($USER->lang);
-        }
-    }
-
-    /**
-     * Adapter to enrol_user() data generator.
-     * @throws Exception
-     * @param array $data
-     * @return void
-     */
-    protected function process_enrol_user($data) {
-        global $SITE;
-
-        if (empty($data['roleid'])) {
-            throw new Exception('\'course enrolments\' requires the field \'role\' to be specified');
-        }
-
-        if (!isset($data['userid'])) {
-            throw new Exception('\'course enrolments\' requires the field \'user\' to be specified');
-        }
-
-        if (!isset($data['courseid'])) {
-            throw new Exception('\'course enrolments\' requires the field \'course\' to be specified');
-        }
-
-        if (!isset($data['enrol'])) {
-            $data['enrol'] = 'manual';
-        }
-
-        if (!isset($data['timestart'])) {
-            $data['timestart'] = 0;
-        }
-
-        if (!isset($data['timeend'])) {
-            $data['timeend'] = 0;
-        }
-
-        if (!isset($data['status'])) {
-            $data['status'] = null;
-        }
-
-        // If the provided course shortname is the site shortname we consider it a system role assign.
-        if ($data['courseid'] == $SITE->id) {
-            // Frontpage course assign.
-            $context = context_course::instance($data['courseid']);
-            role_assign($data['roleid'], $data['userid'], $context->id);
-
+    protected function parse_entity_type(string $entitytype): array {
+        $dividercount = substr_count($entitytype, ' > ');
+        if ($dividercount === 0) {
+            return ['core', $entitytype];
+        } else if ($dividercount === 1) {
+            list($component, $type) = explode(' > ', $entitytype);
+            if ($component === 'core') {
+                throw new coding_exception('Do not specify the component "core > ..." for entity types.');
+            }
+            return [$component, $type];
         } else {
-            // Course assign.
-            $this->datagenerator->enrol_user($data['userid'], $data['courseid'], $data['roleid'], $data['enrol'],
-                    $data['timestart'], $data['timeend'], $data['status']);
+            throw new coding_exception('The entity type must be in the form ' .
+                    '"{entity-type}" for core entities, or "{component} > {entity-type}" ' .
+                    'for entities belonging to other components. ' .
+                    'For example "users" or "mod_forum > subscriptions".');
         }
-
-    }
-
-    /**
-     * Allows/denies a capability at the specified context
-     *
-     * @throws Exception
-     * @param array $data
-     * @return void
-     */
-    protected function process_permission_override($data) {
-
-        // Will throw an exception if it does not exist.
-        $context = $this->get_context($data['contextlevel'], $data['reference']);
-
-        switch ($data['permission']) {
-            case get_string('allow', 'role'):
-                $permission = CAP_ALLOW;
-                break;
-            case get_string('prevent', 'role'):
-                $permission = CAP_PREVENT;
-                break;
-            case get_string('prohibit', 'role'):
-                $permission = CAP_PROHIBIT;
-                break;
-            default:
-                throw new Exception('The \'' . $data['permission'] . '\' permission does not exist');
-                break;
-        }
-
-        if (is_null(get_capability_info($data['capability']))) {
-            throw new Exception('The \'' . $data['capability'] . '\' capability does not exist');
-        }
-
-        role_change_permission($data['roleid'], $context, $data['capability'], $permission);
-    }
-
-    /**
-     * Assigns a role to a user at system context
-     *
-     * Used by "system role assigns" can be deleted when
-     * system role assign will be deprecated in favour of
-     * "role assigns"
-     *
-     * @throws Exception
-     * @param array $data
-     * @return void
-     */
-    protected function process_system_role_assign($data) {
-
-        if (empty($data['roleid'])) {
-            throw new Exception('\'system role assigns\' requires the field \'role\' to be specified');
-        }
-
-        if (!isset($data['userid'])) {
-            throw new Exception('\'system role assigns\' requires the field \'user\' to be specified');
-        }
-
-        $context = context_system::instance();
-
-        $this->datagenerator->role_assign($data['roleid'], $data['userid'], $context->id);
     }
 
     /**
-     * Assigns a role to a user at the specified context
+     * Get an instance of the appropriate subclass of this class for a given component.
      *
-     * @throws Exception
-     * @param array $data
-     * @return void
+     * @param string $component The name of the component to generate entities for.
+     * @return behat_generator_base the subclass of this class for the requested component.
      */
-    protected function process_role_assign($data) {
-
-        if (empty($data['roleid'])) {
-            throw new Exception('\'role assigns\' requires the field \'role\' to be specified');
-        }
-
-        if (!isset($data['userid'])) {
-            throw new Exception('\'role assigns\' requires the field \'user\' to be specified');
-        }
-
-        if (empty($data['contextlevel'])) {
-            throw new Exception('\'role assigns\' requires the field \'contextlevel\' to be specified');
-        }
-
-        if (!isset($data['reference'])) {
-            throw new Exception('\'role assigns\' requires the field \'reference\' to be specified');
-        }
-
-        // Getting the context id.
-        $context = $this->get_context($data['contextlevel'], $data['reference']);
-
-        $this->datagenerator->role_assign($data['roleid'], $data['userid'], $context->id);
-    }
-
-    /**
-     * Creates a role.
-     *
-     * @param array $data
-     * @return void
-     */
-    protected function process_role($data) {
-
-        // We require the user to fill the role shortname.
-        if (empty($data['shortname'])) {
-            throw new Exception('\'role\' requires the field \'shortname\' to be specified');
-        }
-
-        $this->datagenerator->create_role($data);
-    }
-
-    /**
-     * Adds members to cohorts
-     *
-     * @param array $data
-     * @return void
-     */
-    protected function process_cohort_member($data) {
-        cohort_add_member($data['cohortid'], $data['userid']);
-    }
-
-    /**
-     * Create a question category.
-     *
-     * @param array $data the row of data from the behat script.
-     */
-    protected function process_question_category($data) {
-        $context = $this->get_context($data['contextlevel'], $data['reference']);
-        $data['contextid'] = $context->id;
-        $this->datagenerator->get_plugin_generator('core_question')->create_question_category($data);
-    }
-
-    /**
-     * Create a question.
-     *
-     * Creating questions relies on the question/type/.../tests/helper.php mechanism.
-     * We start with test_question_maker::get_question_form_data($data['qtype'], $data['template'])
-     * and then overlay the values from any other fields of $data that are set.
-     *
-     * @param array $data the row of data from the behat script.
-     */
-    protected function process_question($data) {
-        if (array_key_exists('questiontext', $data)) {
-            $data['questiontext'] = array(
-                    'text'   => $data['questiontext'],
-                    'format' => FORMAT_HTML,
-                );
-        }
-
-        if (array_key_exists('generalfeedback', $data)) {
-            $data['generalfeedback'] = array(
-                    'text'   => $data['generalfeedback'],
-                    'format' => FORMAT_HTML,
-                );
-        }
-
-        $which = null;
-        if (!empty($data['template'])) {
-            $which = $data['template'];
-        }
-
-        $this->datagenerator->get_plugin_generator('core_question')->create_question($data['qtype'], $which, $data);
-    }
-
-    /**
-     * Gets the grade category id from the grade category fullname
-     * @throws Exception
-     * @param string $username
-     * @return int
-     */
-    protected function get_gradecategory_id($fullname) {
-        global $DB;
-
-        if (!$id = $DB->get_field('grade_categories', 'id', array('fullname' => $fullname))) {
-            throw new Exception('The specified grade category with fullname "' . $fullname . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Gets the user id from it's username.
-     * @throws Exception
-     * @param string $username
-     * @return int
-     */
-    protected function get_user_id($username) {
-        global $DB;
-
-        if (!$id = $DB->get_field('user', 'id', array('username' => $username))) {
-            throw new Exception('The specified user with username "' . $username . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Gets the role id from it's shortname.
-     * @throws Exception
-     * @param string $roleshortname
-     * @return int
-     */
-    protected function get_role_id($roleshortname) {
-        global $DB;
-
-        if (!$id = $DB->get_field('role', 'id', array('shortname' => $roleshortname))) {
-            throw new Exception('The specified role with shortname "' . $roleshortname . '" does not exist');
-        }
-
-        return $id;
-    }
-
-    /**
-     * Gets the category id from it's idnumber.
-     * @throws Exception
-     * @param string $idnumber
-     * @return int
-     */
-    protected function get_category_id($idnumber) {
-        global $DB;
-
-        // If no category was specified use the data generator one.
-        if ($idnumber == false) {
-            return null;
-        }
-
-        if (!$id = $DB->get_field('course_categories', 'id', array('idnumber' => $idnumber))) {
-            throw new Exception('The specified category with idnumber "' . $idnumber . '" does not exist');
-        }
-
-        return $id;
-    }
-
-    /**
-     * Gets the course id from it's shortname.
-     * @throws Exception
-     * @param string $shortname
-     * @return int
-     */
-    protected function get_course_id($shortname) {
-        global $DB;
-
-        if (!$id = $DB->get_field('course', 'id', array('shortname' => $shortname))) {
-            throw new Exception('The specified course with shortname "' . $shortname . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Gets the group id from it's idnumber.
-     * @throws Exception
-     * @param string $idnumber
-     * @return int
-     */
-    protected function get_group_id($idnumber) {
-        global $DB;
-
-        if (!$id = $DB->get_field('groups', 'id', array('idnumber' => $idnumber))) {
-            throw new Exception('The specified group with idnumber "' . $idnumber . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Gets the grouping id from it's idnumber.
-     * @throws Exception
-     * @param string $idnumber
-     * @return int
-     */
-    protected function get_grouping_id($idnumber) {
-        global $DB;
-
-        if (!$id = $DB->get_field('groupings', 'id', array('idnumber' => $idnumber))) {
-            throw new Exception('The specified grouping with idnumber "' . $idnumber . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Gets the cohort id from it's idnumber.
-     * @throws Exception
-     * @param string $idnumber
-     * @return int
-     */
-    protected function get_cohort_id($idnumber) {
-        global $DB;
-
-        if (!$id = $DB->get_field('cohort', 'id', array('idnumber' => $idnumber))) {
-            throw new Exception('The specified cohort with idnumber "' . $idnumber . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Gets the outcome item id from its shortname.
-     * @throws Exception
-     * @param string $shortname
-     * @return int
-     */
-    protected function get_outcome_id($shortname) {
-        global $DB;
-
-        if (!$id = $DB->get_field('grade_outcomes', 'id', array('shortname' => $shortname))) {
-            throw new Exception('The specified outcome with shortname "' . $shortname . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Get the id of a named scale.
-     * @param string $name the name of the scale.
-     * @return int the scale id.
-     */
-    protected function get_scale_id($name) {
-        global $DB;
-
-        if (!$id = $DB->get_field('scale', 'id', array('name' => $name))) {
-            throw new Exception('The specified scale with name "' . $name . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Get the id of a named question category (must be globally unique).
-     * Note that 'Top' is a special value, used when setting the parent of another
-     * category, meaning top-level.
-     *
-     * @param string $name the question category name.
-     * @return int the question category id.
-     */
-    protected function get_questioncategory_id($name) {
-        global $DB;
-
-        if ($name == 'Top') {
-            return 0;
-        }
-
-        if (!$id = $DB->get_field('question_categories', 'id', array('name' => $name))) {
-            throw new Exception('The specified question category with name "' . $name . '" does not exist');
-        }
-        return $id;
-    }
-
-    /**
-     * Gets the internal context id from the context reference.
-     *
-     * The context reference changes depending on the context
-     * level, it can be the system, a user, a category, a course or
-     * a module.
-     *
-     * @throws Exception
-     * @param string $levelname The context level string introduced by the test writer
-     * @param string $contextref The context reference introduced by the test writer
-     * @return context
-     */
-    protected function get_context($levelname, $contextref) {
-        global $DB;
-
-        // Getting context levels and names (we will be using the English ones as it is the test site language).
-        $contextlevels = context_helper::get_all_levels();
-        $contextnames = array();
-        foreach ($contextlevels as $level => $classname) {
-            $contextnames[context_helper::get_level_name($level)] = $level;
-        }
-
-        if (empty($contextnames[$levelname])) {
-            throw new Exception('The specified "' . $levelname . '" context level does not exist');
-        }
-        $contextlevel = $contextnames[$levelname];
-
-        // Return it, we don't need to look for other internal ids.
-        if ($contextlevel == CONTEXT_SYSTEM) {
-            return context_system::instance();
-        }
-
-        switch ($contextlevel) {
-
-            case CONTEXT_USER:
-                $instanceid = $DB->get_field('user', 'id', array('username' => $contextref));
-                break;
-
-            case CONTEXT_COURSECAT:
-                $instanceid = $DB->get_field('course_categories', 'id', array('idnumber' => $contextref));
-                break;
-
-            case CONTEXT_COURSE:
-                $instanceid = $DB->get_field('course', 'id', array('shortname' => $contextref));
-                break;
-
-            case CONTEXT_MODULE:
-                $instanceid = $DB->get_field('course_modules', 'id', array('idnumber' => $contextref));
-                break;
-
-            default:
-                break;
-        }
-
-        $contextclass = $contextlevels[$contextlevel];
-        if (!$context = $contextclass::instance($instanceid, IGNORE_MISSING)) {
-            throw new Exception('The specified "' . $contextref . '" context reference does not exist');
-        }
-
-        return $context;
-    }
-
-    /**
-     * Adds user to contacts
-     *
-     * @param array $data
-     * @return void
-     */
-    protected function process_message_contacts($data) {
-        \core_message\api::add_contact($data['userid'], $data['contactid']);
-    }
-
-    /**
-     * Gets the contact id from it's username.
-     * @throws Exception
-     * @param string $username
-     * @return int
-     */
-    protected function get_contact_id($username) {
-        global $DB;
-
-        if (!$id = $DB->get_field('user', 'id', array('username' => $username))) {
-            throw new Exception('The specified user with username "' . $username . '" does not exist');
-        }
-        return $id;
-    }
+    protected function get_instance_for_component(string $component): behat_generator_base {
+        global $CFG;
 
-    /**
-     * Send a new message from user to contact in a private conversation
-     *
-     * @param array $data
-     * @return void
-     */
-    protected function process_private_messages(array $data) {
-        if (!$conversationid = \core_message\api::get_conversation_between_users([$data['userid'], $data['contactid']])) {
-            $conversation = \core_message\api::create_conversation(
-                \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-                [$data['userid'], $data['contactid']]
-            );
-            $conversationid = $conversation->id;
+        // Ensure the generator class is loaded.
+        require_once($CFG->libdir . '/behat/classes/behat_generator_base.php');
+        if ($component === 'core') {
+            $lib = $CFG->libdir . '/behat/classes/behat_core_generator.php';
+        } else {
+            $dir = core_component::get_component_directory($component);
+            $lib = $dir . '/tests/generator/behat_' . $component . '_generator.php';
+            if (!$dir || !is_readable($lib)) {
+                throw new coding_exception("Component {$component} does not support " .
+                        "behat generators yet. Missing {$lib}.");
+            }
         }
-        \core_message\api::send_message_to_conversation($data['userid'], $conversationid, $data['message'], FORMAT_PLAIN);
-    }
+        require_once($lib);
 
-    /**
-     * Mark a private conversation as favourite for user
-     *
-     * @param array $data
-     * @return void
-     */
-    protected function process_favourite_conversations(array $data) {
-        if (!$conversationid = \core_message\api::get_conversation_between_users([$data['userid'], $data['contactid']])) {
-            $conversation = \core_message\api::create_conversation(
-                \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-                [$data['userid'], $data['contactid']]
-            );
-            $conversationid = $conversation->id;
+        // Create an instance.
+        $componentclass = "behat_{$component}_generator";
+        if (!class_exists($componentclass)) {
+            throw new PendingException($component .
+                    ' does not yet support the Behat data generator mechanism. Class ' .
+                    $componentclass . ' not found in file ' . $lib . '.');
         }
-        \core_message\api::set_favourite_conversation($conversationid, $data['userid']);
+        $instance = new $componentclass($component);
+        return $instance;
     }
 }
diff --git a/lib/tests/behat/behat_forms.php b/lib/tests/behat/behat_forms.php
index cd532a346a6dd..3434073d7a4a7 100644
--- a/lib/tests/behat/behat_forms.php
+++ b/lib/tests/behat/behat_forms.php
@@ -36,6 +36,9 @@
 /**
  * Forms-related steps definitions.
  *
+ * Note, Behat tests to verify that the steps defined here work as advertised
+ * are kept in admin/tool/behat/tests/behat.
+ *
  * @package    core
  * @category   test
  * @copyright  2012 David Monllaó
@@ -90,6 +93,29 @@ public function i_set_the_following_fields_to_these_values(TableNode $data) {
         }
     }
 
+    /**
+     * Fills a form with field/value data.
+     *
+     * @Given /^I set the following fields in the "(?P<element_container_string>(?:[^"]|\\")*)" "(?P<text_selector_string>[^"]*)" to these values:$/
+     * @throws ElementNotFoundException Thrown by behat_base::find
+     * @param string $containerelement Element we look in
+     * @param string $containerselectortype The type of selector where we look in
+     * @param TableNode $data
+     */
+    public function i_set_the_following_fields_in_container_to_these_values(
+            $containerelement, $containerselectortype, TableNode $data) {
+
+        // Expand all fields in case we have.
+        $this->expand_all_fields();
+
+        $datahash = $data->getRowsHash();
+
+        // The action depends on the field type.
+        foreach ($datahash as $locator => $value) {
+            $this->set_field_value_in_container($locator, $value, $containerselectortype, $containerelement);
+        }
+    }
+
     /**
      * Expands all moodleform's fields, including collapsed fieldsets and advanced fields if they are present.
      * @Given /^I expand all fieldsets$/
@@ -195,6 +221,20 @@ public function i_set_the_field_to($field, $value) {
         $this->set_field_value($field, $value);
     }
 
+    /**
+     * Sets the specified value to the field.
+     *
+     * @Given /^I set the field "(?P<field_string>(?:[^"]|\\")*)" in the "(?P<element_container_string>(?:[^"]|\\")*)" "(?P<text_selector_string>[^"]*)" to "(?P<field_value_string>(?:[^"]|\\")*)"$/
+     * @throws ElementNotFoundException Thrown by behat_base::find
+     * @param string $field
+     * @param string $containerelement Element we look in
+     * @param string $containerselectortype The type of selector where we look in
+     * @param string $value
+     */
+    public function i_set_the_field_in_container_to($field, $containerelement, $containerselectortype, $value) {
+        $this->set_field_value_in_container($field, $value, $containerselectortype, $containerelement);
+    }
+
     /**
      * Press the key in the field to trigger the javascript keypress event
      *
@@ -284,7 +324,6 @@ public function the_field_matches_value($field, $value) {
      * @throws ElementNotFoundException Thrown by behat_base::find
      * @param string $field
      * @param string $value
-     * @return void
      */
     public function the_field_does_not_match_value($field, $value) {
 
@@ -300,6 +339,58 @@ public function the_field_does_not_match_value($field, $value) {
         }
     }
 
+    /**
+     * Checks, the field matches the value.
+     *
+     * @Then /^the field "(?P<field_string>(?:[^"]|\\")*)" in the "(?P<element_container_string>(?:[^"]|\\")*)" "(?P<text_selector_string>[^"]*)" matches value "(?P<field_value_string>(?:[^"]|\\")*)"$/
+     * @throws ElementNotFoundException Thrown by behat_base::find
+     * @param string $field
+     * @param string $containerelement Element we look in
+     * @param string $containerselectortype The type of selector where we look in
+     * @param string $value
+     */
+    public function the_field_in_container_matches_value($field, $containerelement, $containerselectortype, $value) {
+
+        // Get the field.
+        $node = $this->get_node_in_container('field', $field, $containerselectortype, $containerelement);
+        $formfield = behat_field_manager::get_form_field($node, $this->getSession());
+
+        // Checks if the provided value matches the current field value.
+        if (!$formfield->matches($value)) {
+            $fieldvalue = $formfield->get_value();
+            throw new ExpectationException(
+                    'The \'' . $field . '\' value is \'' . $fieldvalue . '\', \'' . $value . '\' expected' ,
+                    $this->getSession()
+            );
+        }
+    }
+
+    /**
+     * Checks, the field does not match the value.
+     *
+     * @Then /^the field "(?P<field_string>(?:[^"]|\\")*)" in the "(?P<element_container_string>(?:[^"]|\\")*)" "(?P<text_selector_string>[^"]*)" does not match value "(?P<field_value_string>(?:[^"]|\\")*)"$/
+     * @throws ExpectationException
+     * @throws ElementNotFoundException Thrown by behat_base::find
+     * @param string $field
+     * @param string $containerelement Element we look in
+     * @param string $containerselectortype The type of selector where we look in
+     * @param string $value
+     */
+    public function the_field_in_container_does_not_match_value($field, $containerelement, $containerselectortype, $value) {
+
+        // Get the field.
+        $node = $this->get_node_in_container('field', $field, $containerselectortype, $containerelement);
+        $formfield = behat_field_manager::get_form_field($node, $this->getSession());
+
+        // Checks if the provided value matches the current field value.
+        if ($formfield->matches($value)) {
+            throw new ExpectationException(
+                    'The \'' . $field . '\' value matches \'' . $value . '\' and it should not match it' ,
+                    $this->getSession()
+            );
+        }
+    }
+
     /**
      * Checks, the field matches the value.
      *
@@ -391,6 +482,52 @@ public function the_following_fields_do_not_match_these_values(TableNode $data)
         }
     }
 
+    /**
+     * Checks, the provided field/value matches.
+     *
+     * @Then /^the following fields in the "(?P<element_container_string>(?:[^"]|\\")*)" "(?P<text_selector_string>[^"]*)" match these values:$/
+     * @throws ExpectationException
+     * @param string $containerelement Element we look in
+     * @param string $containerselectortype The type of selector where we look in
+     * @param TableNode $data Pairs of | field | value |
+     */
+    public function the_following_fields_in_container_match_these_values(
+            $containerelement, $containerselectortype, TableNode $data) {
+
+        // Expand all fields in case we have.
+        $this->expand_all_fields();
+
+        $datahash = $data->getRowsHash();
+
+        // The action depends on the field type.
+        foreach ($datahash as $locator => $value) {
+            $this->the_field_in_container_matches_value($locator, $containerelement, $containerselectortype, $value);
+        }
+    }
+
+    /**
+     * Checks that the provided field/value pairs don't match.
+     *
+     * @Then /^the following fields in the "(?P<element_container_string>(?:[^"]|\\")*)" "(?P<text_selector_string>[^"]*)" do not match these values:$/
+     * @throws ExpectationException
+     * @param string $containerelement Element we look in
+     * @param string $containerselectortype The type of selector where we look in
+     * @param TableNode $data Pairs of | field | value |
+     */
+    public function the_following_fields_in_container_do_not_match_these_values(
+            $containerelement, $containerselectortype, TableNode $data) {
+
+        // Expand all fields in case we have.
+        $this->expand_all_fields();
+
+        $datahash = $data->getRowsHash();
+
+        // The action depends on the field type.
+        foreach ($datahash as $locator => $value) {
+            $this->the_field_in_container_does_not_match_value($locator, $containerelement, $containerselectortype, $value);
+        }
+    }
+
     /**
      * Checks, that given select box contains the specified option.
      *
@@ -497,6 +634,26 @@ protected function set_field_value($fieldlocator, $value) {
         $field->set_value($value);
     }
 
+    /**
+     * Generic field setter.
+     *
+     * Internal API method, a generic *I set "VALUE" to "FIELD" field*
+     * could be created based on it.
+     *
+     * @param string $fieldlocator The pointer to the field, it will depend on the field type.
+     * @param string $value the value to set
+     * @param string $containerselectortype The type of selector where we look in
+     * @param string $containerelement Element we look in
+     */
+    protected function set_field_value_in_container($fieldlocator, $value, $containerselectortype, $containerelement) {
+
+        $node = $this->get_node_in_container('field', $fieldlocator, $containerselectortype, $containerelement);
+        // We delegate to behat_form_field class, it will
+        // guess the type properly as it is a select tag.
+        $field = behat_field_manager::get_form_field($node, $this->getSession());
+        $field->set_value($value);
+    }
+
     /**
      * Select a value from single select and redirect.
      *
@@ -546,4 +703,18 @@ public function i_open_the_autocomplete_suggestions_list() {
         $csstarget = ".form-autocomplete-downarrow";
         $this->execute('behat_general::i_click_on', [$csstarget, 'css_element']);
     }
+
+    /**
+     * Expand the given autocomplete list
+     *
+     * @Given /^I expand the "(?P<field_string>(?:[^"]|\\")*)" autocomplete$/
+     *
+     * @param string $field Field name
+     */
+    public function i_expand_the_autocomplete($field) {
+        $csstarget = '.form-autocomplete-downarrow';
+        $node = $this->get_node_in_container('css_element', $csstarget, 'form_row', $field);
+        $this->ensure_node_is_visible($node);
+        $node->click();
+    }
 }
diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php
index b09255cc2f66a..888c62b86e73e 100644
--- a/lib/tests/behat/behat_general.php
+++ b/lib/tests/behat/behat_general.php
@@ -412,24 +412,22 @@ public function i_click_on_in_the($element, $selectortype, $nodeelement, $nodese
      * @param string $containerelement
      * @param string $containerselectortype
      */
-    public function i_drag_and_i_drop_it_in($element, $selectortype, $containerelement, $containerselectortype) {
-
-        list($sourceselector, $sourcelocator) = $this->transform_selector($selectortype, $element);
-        $sourcexpath = $this->getSession()->getSelectorsHandler()->selectorToXpath($sourceselector, $sourcelocator);
+    public function i_drag_and_i_drop_it_in($source, $sourcetype, $target, $targettype) {
+        if (!$this->running_javascript()) {
+            throw new DriverException('Drag and drop steps require javascript');
+        }
 
-        list($containerselector, $containerlocator) = $this->transform_selector($containerselectortype, $containerelement);
-        $destinationxpath = $this->getSession()->getSelectorsHandler()->selectorToXpath($containerselector, $containerlocator);
+        $source = $this->find($sourcetype, $source);
+        $target = $this->find($targettype, $target);
 
-        $node = $this->get_selected_node("xpath_element", $sourcexpath);
-        if (!$node->isVisible()) {
-            throw new ExpectationException('"' . $sourcexpath . '" "xpath_element" is not visible', $this->getSession());
+        if (!$source->isVisible()) {
+            throw new ExpectationException("'{$source}' '{$sourcetype}' is not visible", $this->getSession());
         }
-        $node = $this->get_selected_node("xpath_element", $destinationxpath);
-        if (!$node->isVisible()) {
-            throw new ExpectationException('"' . $destinationxpath . '" "xpath_element" is not visible', $this->getSession());
+        if (!$target->isVisible()) {
+            throw new ExpectationException("'{$target}' '{$targettype}' is not visible", $this->getSession());
         }
 
-        $this->getSession()->getDriver()->dragTo($sourcexpath, $destinationxpath);
+        $this->getSession()->getDriver()->dragTo($source->getXpath(), $target->getXpath());
     }
 
     /**
@@ -763,53 +761,126 @@ function($context, $args) {
     /**
      * Checks, that the first specified element appears before the second one.
      *
-     * @Given /^"(?P<preceding_element_string>(?:[^"]|\\")*)" "(?P<selector1_string>(?:[^"]|\\")*)" should appear before "(?P<following_element_string>(?:[^"]|\\")*)" "(?P<selector2_string>(?:[^"]|\\")*)"$/
+     * @Then :preelement :preselectortype should appear before :postelement :postselectortype
+     * @Then :preelement :preselectortype should appear before :postelement :postselectortype in the :containerelement :containerselectortype
      * @throws ExpectationException
      * @param string $preelement The locator of the preceding element
-     * @param string $preselectortype The locator of the preceding element
+     * @param string $preselectortype The selector type of the preceding element
      * @param string $postelement The locator of the latest element
      * @param string $postselectortype The selector type of the latest element
+     * @param string $containerelement
+     * @param string $containerselectortype
      */
-    public function should_appear_before($preelement, $preselectortype, $postelement, $postselectortype) {
-
-        // We allow postselectortype as a non-text based selector.
-        list($preselector, $prelocator) = $this->transform_selector($preselectortype, $preelement);
-        list($postselector, $postlocator) = $this->transform_selector($postselectortype, $postelement);
-
-        $prexpath = $this->find($preselector, $prelocator)->getXpath();
-        $postxpath = $this->find($postselector, $postlocator)->getXpath();
-
-        // Using following xpath axe to find it.
-        $msg = '"'.$preelement.'" "'.$preselectortype.'" does not appear before "'.$postelement.'" "'.$postselectortype.'"';
-        $xpath = $prexpath.'/following::*[contains(., '.$postxpath.')]';
-        if (!$this->getSession()->getDriver()->find($xpath)) {
-            throw new ExpectationException($msg, $this->getSession());
-        }
+    public function should_appear_before(
+        string $preelement,
+        string $preselectortype,
+        string $postelement,
+        string $postselectortype,
+        ?string $containerelement = null,
+        ?string $containerselectortype = null
+    ) {
+        $msg = "'{$preelement}' '{$preselectortype}' does not appear before '{$postelement}' '{$postselectortype}'";
+        $this->check_element_order(
+            $containerelement,
+            $containerselectortype,
+            $preelement,
+            $preselectortype,
+            $postelement,
+            $postselectortype,
+            $msg
+        );
     }
 
     /**
      * Checks, that the first specified element appears after the second one.
      *
-     * @Given /^"(?P<following_element_string>(?:[^"]|\\")*)" "(?P<selector1_string>(?:[^"]|\\")*)" should appear after "(?P<preceding_element_string>(?:[^"]|\\")*)" "(?P<selector2_string>(?:[^"]|\\")*)"$/
+     * @Then :postelement :postselectortype should appear after :preelement :preselectortype
+     * @Then :postelement :postselectortype should appear after :preelement :preselectortype in the :containerelement :containerselectortype
      * @throws ExpectationException
      * @param string $postelement The locator of the latest element
      * @param string $postselectortype The selector type of the latest element
      * @param string $preelement The locator of the preceding element
-     * @param string $preselectortype The locator of the preceding element
+     * @param string $preselectortype The selector type of the preceding element
+     * @param string $containerelement
+     * @param string $containerselectortype
      */
-    public function should_appear_after($postelement, $postselectortype, $preelement, $preselectortype) {
+    public function should_appear_after(
+        string $postelement,
+        string $postselectortype,
+        string $preelement,
+        string $preselectortype,
+        ?string $containerelement = null,
+        ?string $containerselectortype = null
+    ) {
+        $msg = "'{$postelement}' '{$postselectortype}' does not appear after '{$preelement}' '{$preselectortype}'";
+        $this->check_element_order(
+            $containerelement,
+            $containerselectortype,
+            $preelement,
+            $preselectortype,
+            $postelement,
+            $postselectortype,
+            $msg
+        );
+    }
+
+    /**
+     * Shared code to check whether an element is before or after another one.
+     *
+     * @param string $containerelement
+     * @param string $containerselectortype
+     * @param string $preelement The locator of the preceding element
+     * @param string $preselectortype The locator of the preceding element
+     * @param string $postelement The locator of the following element
+     * @param string $postselectortype The selector type of the following element
+     * @param string $msg Message to output if this fails
+     */
+    protected function check_element_order(
+        ?string $containerelement,
+        ?string $containerselectortype,
+        string $preelement,
+        string $preselectortype,
+        string $postelement,
+        string $postselectortype,
+        string $msg
+    ) {
+        $containernode = false;
+        if ($containerselectortype && $containerelement) {
+            // Get the container node.
+            $containernode = $this->get_selected_node($containerselectortype, $containerelement);
+            $msg .= " in the '{$containerelement}' '{$containerselectortype}'";
+        }
 
-        // We allow postselectortype as a non-text based selector.
-        list($postselector, $postlocator) = $this->transform_selector($postselectortype, $postelement);
         list($preselector, $prelocator) = $this->transform_selector($preselectortype, $preelement);
+        list($postselector, $postlocator) = $this->transform_selector($postselectortype, $postelement);
+
+        $newlines = [
+            "\r\n",
+            "\r",
+            "\n",
+        ];
+        $prexpath = str_replace($newlines, ' ', $this->find($preselector, $prelocator, false, $containernode)->getXpath());
+        $postxpath = str_replace($newlines, ' ', $this->find($postselector, $postlocator, false, $containernode)->getXpath());
+
+        if ($this->running_javascript()) {
+            // The xpath to do this was running really slowly on certain Chrome versions so we are using
+            // this DOM method instead.
+            $js = <<<EOF
+(function() {
+    var a = document.evaluate("{$prexpath}", document, null, XPathResult.ANY_TYPE, null).iterateNext();
+    var b = document.evaluate("{$postxpath}", document, null, XPathResult.ANY_TYPE, null).iterateNext();
+    return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING;
+})()
+EOF;
+            $ok = $this->getSession()->getDriver()->evaluateScript($js);
+        } else {
 
-        $postxpath = $this->find($postselector, $postlocator)->getXpath();
-        $prexpath = $this->find($preselector, $prelocator)->getXpath();
+            // Using following xpath axe to find it.
+            $xpath = "{$prexpath}/following::*[contains(., {$postxpath})]";
+            $ok = $this->getSession()->getDriver()->find($xpath);
+        }
 
-        // Using preceding xpath axe to find it.
-        $msg = '"'.$postelement.'" "'.$postselectortype.'" does not appear after "'.$preelement.'" "'.$preselectortype.'"';
-        $xpath = $postxpath.'/preceding::*[contains(., '.$prexpath.')]';
-        if (!$this->getSession()->getDriver()->find($xpath)) {
+        if (!$ok) {
             throw new ExpectationException($msg, $this->getSession());
         }
     }
@@ -895,12 +966,8 @@ public function the_element_should_not_be_readonly($element, $selectortype) {
      * @param string $selectortype The selector type
      */
     public function should_exist($element, $selectortype) {
-
-        // Getting Mink selector and locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-
         // Will throw an ElementNotFoundException if it does not exist.
-        $this->find($selector, $locator);
+        $this->find($selectortype, $element);
     }
 
     /**
@@ -914,35 +981,23 @@ public function should_exist($element, $selectortype) {
      * @param string $selectortype The selector type
      */
     public function should_not_exist($element, $selectortype) {
-
-        // Getting Mink selector and locator.
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-
+        // Will throw an ElementNotFoundException if it does not exist, but, actually it should not exist, so we try &
+        // catch it.
         try {
-
-            // Using directly the spin method as we want a reduced timeout but there is no
-            // need for a 0.1 seconds interval because in the optimistic case we will timeout.
-            $params = array('selector' => $selector, 'locator' => $locator);
             // The exception does not really matter as we will catch it and will never "explode".
             $exception = new ElementNotFoundException($this->getSession(), $selectortype, null, $element);
 
+            // Using the spin method as we want a reduced timeout but there is no need for a 0.1 seconds interval
+            // because in the optimistic case we will timeout.
             // If all goes good it will throw an ElementNotFoundExceptionn that we will catch.
-            $this->spin(
-                function($context, $args) {
-                    return $context->getSession()->getPage()->findAll($args['selector'], $args['locator']);
-                },
-                $params,
-                behat_base::get_reduced_timeout(),
-                $exception,
-                false
-            );
+            return $this->find($selectortype, $element, $exception, false, behat_base::get_reduced_timeout());
         } catch (ElementNotFoundException $e) {
-            // It passes.
+            // We expect the element to not be found.
             return;
         }
 
-        throw new ExpectationException('The "' . $element . '" "' . $selectortype .
-                '" exists in the current page', $this->getSession());
+        // The element was found and should not have been. Throw an exception.
+        throw new ExpectationException("The '{$element}' '{$selectortype}' exists in the current page", $this->getSession());
     }
 
     /**
@@ -1086,16 +1141,14 @@ public function i_run_all_adhoc_tasks() {
      */
     public function should_exist_in_the($element, $selectortype, $containerelement, $containerselectortype) {
         // Get the container node.
-        $containernode = $this->get_selected_node($containerselectortype, $containerelement);
-
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
+        $containernode = $this->find($containerselectortype, $containerelement);
 
         // Specific exception giving info about where can't we find the element.
-        $locatorexceptionmsg = $element . '" in the "' . $containerelement. '" "' . $containerselectortype. '"';
+        $locatorexceptionmsg = "{$element} in the {$containerelement} {$containerselectortype}";
         $exception = new ElementNotFoundException($this->getSession(), $selectortype, null, $locatorexceptionmsg);
 
         // Looks for the requested node inside the container node.
-        $this->find($selector, $locator, $exception, $containernode);
+        $this->find($selectortype, $element, $exception, $containernode);
     }
 
     /**
@@ -1111,26 +1164,24 @@ public function should_exist_in_the($element, $selectortype, $containerelement,
      * @param string $containerselectortype The container locator
      */
     public function should_not_exist_in_the($element, $selectortype, $containerelement, $containerselectortype) {
+        // Get the container node.
+        $containernode = $this->find($containerselectortype, $containerelement);
 
-        // Get the container node; here we throw an exception
-        // if the container node does not exist.
-        $containernode = $this->get_selected_node($containerselectortype, $containerelement);
-
-        list($selector, $locator) = $this->transform_selector($selectortype, $element);
-
-        // Will throw an ElementNotFoundException if it does not exist, but, actually
-        // it should not exist, so we try & catch it.
+        // Will throw an ElementNotFoundException if it does not exist, but, actually it should not exist, so we try &
+        // catch it.
         try {
-            // Would be better to use a 1 second sleep because the element should not be there,
-            // but we would need to duplicate the whole find_all() logic to do it, the benefit of
-            // changing to 1 second sleep is not significant.
-            $this->find($selector, $locator, false, $containernode, behat_base::get_reduced_timeout());
+            // Looks for the requested node inside the container node.
+            $this->find($selectortype, $element, false, $containernode, behat_base::get_reduced_timeout());
         } catch (ElementNotFoundException $e) {
-            // It passes.
+            // We expect the element to not be found.
             return;
         }
-        throw new ExpectationException('The "' . $element . '" "' . $selectortype . '" exists in the "' .
-                $containerelement . '" "' . $containerselectortype . '"', $this->getSession());
+
+        // The element was found and should not have been. Throw an exception.
+        throw new ExpectationException(
+            "The '{$element}' '{$selectortype}' exists in the '{$containerelement}' '{$containerselectortype}'",
+            $this->getSession()
+        );
     }
 
     /**
@@ -1142,6 +1193,7 @@ public function should_not_exist_in_the($element, $selectortype, $containereleme
      *
      * @throws ExpectationException
      * @Then /^I change (window|viewport) size to "(small|medium|large|\d+x\d+)"$/
+     * @Then /^I change the (window|viewport) size to "(small|medium|large|\d+x\d+)"$/
      * @param string $windowsize size of the window (small|medium|large|wxh).
      */
     public function i_change_window_size_to($windowviewport, $windowsize) {
@@ -1579,27 +1631,9 @@ protected function get_page_load_xpath() {
      *
      * @Then /^(?:|I )pause(?:| scenario execution)$/
      */
-    public function i_pause_scenario_executon() {
-        global $CFG;
-
-        $posixexists = function_exists('posix_isatty');
-
-        // Make sure this step is only used with interactive terminal (if detected).
-        if ($posixexists && !@posix_isatty(STDOUT)) {
-            $session = $this->getSession();
-            throw new ExpectationException('Break point should only be used with interative terminal.', $session);
-        }
-
-        // Windows don't support ANSI code by default, but with ANSICON.
-        $isansicon = getenv('ANSICON');
-        if (($CFG->ostype === 'WINDOWS') && empty($isansicon)) {
-            fwrite(STDOUT, "Paused. Press Enter/Return to continue.");
-            fread(STDIN, 1024);
-        } else {
-            fwrite(STDOUT, "\033[s\n\033[0;93mPaused. Press \033[1;31mEnter/Return\033[0;93m to continue.\033[0m");
-            fread(STDIN, 1024);
-            fwrite(STDOUT, "\033[2A\033[u\033[2B");
-        }
+    public function i_pause_scenario_execution() {
+        $message = "<colour:lightYellow>Paused. Press <colour:lightRed>Enter/Return<colour:lightYellow> to continue.";
+        behat_util::pause($this->getSession(), $message);
     }
 
     /**
@@ -1720,8 +1754,8 @@ public function the_focused_element_is($not, $nodeelement, $nodeselectortype) {
         if (!$this->running_javascript()) {
             throw new DriverException('Checking focus on an element requires JavaScript');
         }
-        list($a, $b) = $this->transform_selector($nodeselectortype, $nodeelement);
-        $element = $this->find($a, $b);
+
+        $element = $this->find($nodeselectortype, $nodeelement);
         $xpath = addslashes_js($element->getXpath());
         $script = 'return (function() { return document.activeElement === document.evaluate("' . $xpath . '",
                 document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue; })(); ';
diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php
index 8cda5a7d7f873..0695b14b55e8e 100644
--- a/lib/tests/behat/behat_hooks.php
+++ b/lib/tests/behat/behat_hooks.php
@@ -322,6 +322,7 @@ public function before_scenario(BeforeScenarioScope $scope) {
 
         // Register behat selectors for theme, if suite is changed. We do it for every suite change.
         if ($suitename !== self::$runningsuite) {
+            self::$runningsuite = $suitename;
             behat_context_helper::set_environment($scope->getEnvironment());
 
             // We need the Mink session to do it and we do it only before the first scenario.
@@ -342,6 +343,12 @@ public function before_scenario(BeforeScenarioScope $scope) {
 
             $this->getSession()->getSelectorsHandler()->registerSelector('named_partial', new $namedpartialclass());
             $this->getSession()->getSelectorsHandler()->registerSelector('named_exact', new $namedexactclass());
+
+            // Register component named selectors.
+            foreach (\core_component::get_component_names() as $component) {
+                $this->register_component_selectors_for_component($component);
+            }
+
         }
 
         // Reset mink session between the scenarios.
@@ -373,22 +380,23 @@ public function before_scenario(BeforeScenarioScope $scope) {
         // Set the theme if not default.
         if ($suitename !== "default") {
             set_config('theme', $suitename);
-            self::$runningsuite = $suitename;
         }
 
         // Reset the scenariorunning variable to ensure that Step 0 occurs.
         $this->scenariorunning = false;
 
-        // Run all test with medium (1024x768) screen size, to avoid responsive problems.
-        $this->resize_window('medium');
-
         // Set up the tags for current scenario.
         self::fetch_tags_for_scenario($scope);
 
         // If scenario requires the Moodle app to be running, set this up.
         if ($this->has_tag('app')) {
             $this->execute('behat_app::start_scenario');
+
+            return;
         }
+
+        // Run all test with medium (1024x768) screen size, to avoid responsive problems.
+        $this->resize_window('medium');
     }
 
     /**
@@ -396,7 +404,7 @@ public function before_scenario(BeforeScenarioScope $scope) {
      * Yes, this is in a strange location and should be in the BeforeScenario hook, but failures in the test setUp lead
      * to the test being incorrectly marked as skipped with no way to force the test to be failed.
      *
-     * @param   BeforeStepScope $scope
+     * @param BeforeStepScope $scope
      * @BeforeStep
      */
     public function before_step(BeforeStepScope $scope) {
@@ -425,7 +433,6 @@ public function before_step(BeforeStepScope $scope) {
                         new ExpectationException($message, $session)
                     );
 
-                self::$initprocessesfinished = true;
             }
             $this->scenariorunning = true;
         }
@@ -500,11 +507,7 @@ public function after_step_javascript(AfterStepScope $scope) {
             throw new coding_exception("Step '" . $scope->getStep()->getText() . "'' is undefined.");
         }
 
-        // Save the page content if the step failed.
-        if (!empty($CFG->behat_faildump_path) &&
-            $scope->getTestResult()->getResultCode() === Behat\Testwork\Tester\Result\TestResult::FAILED) {
-            $this->take_contentdump($scope);
-        }
+        $isfailed = $scope->getTestResult()->getResultCode() === Behat\Testwork\Tester\Result\TestResult::FAILED;
 
         // Abort any open transactions to prevent subsequent tests hanging.
         // This does the same as abort_all_db_transactions(), but doesn't call error_log() as we don't
@@ -516,17 +519,30 @@ public function after_step_javascript(AfterStepScope $scope) {
             }
         }
 
+        if ($isfailed && !empty($CFG->behat_faildump_path)) {
+            // Save the page content (html).
+            $this->take_contentdump($scope);
+
+            if ($this->running_javascript()) {
+                // Save a screenshot.
+                $this->take_screenshot($scope);
+            }
+        }
+
+        if ($isfailed && !empty($CFG->behat_pause_on_fail)) {
+            $exception = $scope->getTestResult()->getException();
+            $message = "<colour:lightRed>Scenario failed. ";
+            $message .= "<colour:lightYellow>Paused for inspection. Press <colour:lightRed>Enter/Return<colour:lightYellow> to continue.<newline>";
+            $message .= "<colour:lightRed>Exception follows:<newline>";
+            $message .= trim($exception->getMessage());
+            behat_util::pause($this->getSession(), $message);
+        }
+
         // Only run if JS.
         if (!$this->running_javascript()) {
             return;
         }
 
-        // Save a screenshot if the step failed.
-        if (!empty($CFG->behat_faildump_path) &&
-            $scope->getTestResult()->getResultCode() === Behat\Testwork\Tester\Result\TestResult::FAILED) {
-            $this->take_screenshot($scope);
-        }
-
         try {
             $this->wait_for_pending_js();
             self::$currentstepexception = null;
@@ -700,6 +716,50 @@ public function i_look_for_exceptions() {
     protected static function is_first_scenario() {
         return !(self::$initprocessesfinished);
     }
+
+    /**
+     * Register a set of component selectors.
+     *
+     * @param string $component
+     */
+    public function register_component_selectors_for_component(string $component): void {
+        $context = behat_context_helper::get_component_context($component);
+
+        if ($context === null) {
+            return;
+        }
+
+        $namedpartial = $this->getSession()->getSelectorsHandler()->getSelector('named_partial');
+        $namedexact = $this->getSession()->getSelectorsHandler()->getSelector('named_exact');
+
+        // Replacements must come before selectors as they are used in the selectors.
+        foreach ($context->get_named_replacements() as $replacement) {
+            $namedpartial->register_replacement($component, $replacement);
+            $namedexact->register_replacement($component, $replacement);
+        }
+
+        foreach ($context->get_partial_named_selectors() as $selector) {
+            $namedpartial->register_component_selector($component, $selector);
+        }
+
+        foreach ($context->get_exact_named_selectors() as $selector) {
+            $namedexact->register_component_selector($component, $selector);
+        }
+
+    }
+
+    /**
+     * Mark the first step as having been completed.
+     *
+     * This must be the last BeforeStep hook in the setup.
+     *
+     * @param BeforeStepScope $scope
+     * @BeforeStep
+     */
+    public function first_step_setup_complete(BeforeStepScope $scope) {
+        self::$initprocessesfinished = true;
+    }
+
 }
 
 /**
diff --git a/lib/tests/behat/behat_navigation.php b/lib/tests/behat/behat_navigation.php
index 78c9262cdee77..58abfafc836c8 100644
--- a/lib/tests/behat/behat_navigation.php
+++ b/lib/tests/behat/behat_navigation.php
@@ -533,6 +533,196 @@ public function i_open_my_profile_in_edit_mode() {
         $USER = $globuser;
     }
 
+    /**
+     * Open a given page, belonging to a plugin or core component.
+     *
+     * The page-type are interpreted by each plugin to work out the
+     * corresponding URL. See the resolve_url method in each class like
+     * behat_mod_forum. That method should document which page types are
+     * recognised, and how the name identifies them.
+     *
+     * For pages belonging to core, the 'core > ' bit is omitted.
+     *
+     * @When I am on the :page page
+     * @param string $page the component and page name.
+     *      E.g. 'Admin notifications' or 'core_user > Preferences'.
+     * @throws Exception if the specified page cannot be determined.
+     */
+    public function i_am_on_page(string $page) {
+        $this->getSession()->visit($this->locate_path(
+                $this->resolve_page_helper($page)->out_as_local_url()));
+    }
+
+    /**
+     * Open a given page logged in as a given user.
+     *
+     * This is like the combination
+     *   When I log in as "..."
+     *   And I am on the "..." page
+     * but with the advantage that you go straight to the desired page, without
+     * having to wait for the Dashboard to load.
+     *
+     * @When I am on the :page page logged in as :username
+     * @param string $page the type of page. E.g. 'Admin notifications' or 'core_user > Preferences'.
+     * @param string $username the name of the user to log in as. E.g. 'admin'.
+     * @throws Exception if the specified page cannot be determined.
+     */
+    public function i_am_on_page_logged_in_as(string $page, string $username) {
+        self::execute('behat_auth::i_log_in_as', [$username, $this->resolve_page_helper($page)]);
+    }
+
+    /**
+     * Helper used by i_am_on_page() and i_am_on_page_logged_in_as().
+     *
+     * @param string $page the type of page. E.g. 'Admin notifications' or 'core_user > Preferences'.
+     * @return moodle_url the corresponding URL.
+     */
+    protected function resolve_page_helper(string $page): moodle_url {
+        list($component, $name) = $this->parse_page_name($page);
+        if ($component === 'core') {
+            return $this->resolve_core_page_url($name);
+        } else {
+            $context = behat_context_helper::get('behat_' . $component);
+            return $context->resolve_page_url($name);
+        }
+    }
+
+    /**
+     * Parse a full page name like 'Admin notifications' or 'core_user > Preferences'.
+     *
+     * E.g. parsing 'mod_quiz > View' gives ['mod_quiz', 'View'].
+     *
+     * @param string $page the full page name
+     * @return array with two elements, component and page name.
+     */
+    protected function parse_page_name(string $page): array {
+        $dividercount = substr_count($page, ' > ');
+        if ($dividercount === 0) {
+            return ['core', $page];
+        } else if ($dividercount === 1) {
+            list($component, $name) = explode(' > ', $page);
+            if ($component === 'core') {
+                throw new coding_exception('Do not specify the component "core > ..." for core pages.');
+            }
+            return [$component, $name];
+        } else {
+            throw new coding_exception('The page name most be in the form ' .
+                    '"{page-name}" for core pages, or "{component} > {page-name}" ' .
+                    'for pages belonging to other components. ' .
+                    'For example "Admin notifications" or "mod_quiz > View".');
+        }
+    }
+
+    /**
+     * Open a given instance of a page, belonging to a plugin or core component.
+     *
+     * The instance identifier and page-type are interpreted by each plugin to
+     * work out the corresponding URL. See the resolve_page_instance_url method
+     * in each class like behat_mod_forum. That method should document which page
+     * types are recognised, and how the name identifies them.
+     *
+     * For pages belonging to core, the 'core > ' bit is omitted.
+     *
+     * @When I am on the :identifier :type page
+     * @param string $identifier identifies the particular page. E.g. 'Test quiz'.
+     * @param string $type the component and page type. E.g. 'mod_quiz > View'.
+     * @throws Exception if the specified page cannot be determined.
+     */
+    public function i_am_on_page_instance(string $identifier, string $type) {
+        $this->getSession()->visit($this->locate_path(
+                $this->resolve_page_instance_helper($identifier, $type)->out_as_local_url()));
+    }
+
+    /**
+     * Open a given page logged in as a given user.
+     *
+     * This is like the combination
+     *   When I log in as "..."
+     *   And I am on the "..." "..." page
+     * but with the advantage that you go straight to the desired page, without
+     * having to wait for the Dashboard to load.
+     *
+     * @When I am on the :identifier :type page logged in as :username
+     * @param string $identifier identifies the particular page. E.g. 'Test quiz'.
+     * @param string $type the component and page type. E.g. 'mod_quiz > View'.
+     * @param string $username the name of the user to log in as. E.g. 'student'.
+     * @throws Exception if the specified page cannot be determined.
+     */
+    public function i_am_on_page_instance_logged_in_as(string $identifier,
+            string $type, string $username) {
+        self::execute('behat_auth::i_log_in_as',
+                [$username, $this->resolve_page_instance_helper($identifier, $type)]);
+    }
+
+    /**
+     * Helper used by i_am_on_page() and i_am_on_page_logged_in_as().
+     *
+     * @param string $identifier identifies the particular page. E.g. 'Test quiz'.
+     * @param string $pagetype the component and page type. E.g. 'mod_quiz > View'.
+     * @return moodle_url the corresponding URL.
+     */
+    protected function resolve_page_instance_helper(string $identifier, string $pagetype): moodle_url {
+        list($component, $type) = $this->parse_page_name($pagetype);
+        if ($component === 'core') {
+            return $this->resolve_core_page_instance_url($type, $identifier);
+        } else {
+            $context = behat_context_helper::get('behat_' . $component);
+            return $context->resolve_page_instance_url($type, $identifier);
+        }
+    }
+
+    /**
+     * Convert core page names to URLs for steps like 'When I am on the "[page name]" page'.
+     *
+     * Recognised page names are:
+     * | Homepage            | Homepage (normally dashboard).                                 |
+     * | Admin notifications | Admin notification screen.                                     |
+     *
+     * @param string $name identifies which identifies this page, e.g. 'Homepage', 'Admin notifications'.
+     * @return moodle_url the corresponding URL.
+     * @throws Exception with a meaningful error message if the specified page cannot be found.
+     */
+    protected function resolve_core_page_url(string $name): moodle_url {
+        switch ($name) {
+            case 'Homepage':
+                return new moodle_url('/');
+
+            case 'Admin notifications':
+                return new moodle_url('/admin/');
+
+            default:
+                throw new Exception('Unrecognised core page type "' . $name . '."');
+        }
+    }
+
+    /**
+     * Convert page names to URLs for steps like 'When I am on the "[identifier]" "[page type]" page'.
+     *
+     * Recognised page names are:
+     * | Page type     | Identifier meaning | description                          |
+     * | Category page | category idnumber  | List of courses in that category.    |
+     *
+     * @param string $type identifies which type of page this is, e.g. 'Category page'.
+     * @param string $identifier identifies the particular page, e.g. 'test-cat'.
+     * @return moodle_url the corresponding URL.
+     * @throws Exception with a meaningful error message if the specified page cannot be found.
+     */
+    protected function resolve_core_page_instance_url(string $type, string $identifier): moodle_url {
+        global $DB;
+
+        switch ($type) {
+            case 'Category page':
+                $categoryid = $DB->get_field('course_categories', 'id', ['idnumber' => $identifier]);
+                if (!$categoryid) {
+                    throw new Exception('The specified category with idnumber "' . $identifier . '" does not exist');
+                }
+                return new moodle_url('/course/category.php', ['id' => $categoryid]);
+
+            default:
+                throw new Exception('Unrecognised core page type "' . $type . '."');
+        }
+    }
+
     /**
      * Opens the course homepage.
      *
diff --git a/lib/tests/behat/behat_permissions.php b/lib/tests/behat/behat_permissions.php
index 4cba909e320d3..842e320be7c2d 100644
--- a/lib/tests/behat/behat_permissions.php
+++ b/lib/tests/behat/behat_permissions.php
@@ -234,11 +234,11 @@ public function i_fill_in_the_allowed_role_assignments_form_for_a_role_with($sou
 
             if ($allowed == 'Assignable') {
                 if (!$node->isChecked()) {
-                    $node->click();
+                    $node->check();
                 }
             } else if ($allowed == 'Not assignable') {
                 if ($node->isChecked()) {
-                    $node->click();
+                    $node->uncheck();
                 }
             } else {
                 throw new ExpectationException(
diff --git a/lib/tests/behat/permissionmanager.feature b/lib/tests/behat/permissionmanager.feature
new file mode 100644
index 0000000000000..bd96363e0b9ee
--- /dev/null
+++ b/lib/tests/behat/permissionmanager.feature
@@ -0,0 +1,51 @@
+@core @javascript
+Feature: Override permissions on a context
+  In order to extend and restrict moodle features
+  As an admin or a teacher
+  I need to allow/deny the existing capabilities at different levels
+
+  Background:
+    Given the following "users" exist:
+      | username  | firstname | lastname | email          |
+      | teacher1  | Teacher   | 1        | t1@example.com |
+    And the following "courses" exist:
+      | fullname  | shortname |
+      | Course 1  | C1        |
+    And the following "course enrolments" exist:
+      | user      | course | role           |
+      | teacher1  | C1     | editingteacher |
+
+  Scenario: Default system capabilities modification
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage
+    And I navigate to "Users > Permissions" in current page administration
+    When I click on "Allow" "icon" in the "mod/forum:addnews" "table_row"
+    And I press "Student"
+    Then "Add announcementsmod/forum:addnews" row "Roles with permission" column of "permissions" table should contain "Student"
+    When I reload the page
+    And I click on "Delete Student role" "link" in the "mod/forum:addnews" "table_row"
+    And I click on "Remove" "button" in the "Confirm role change" "dialogue"
+    Then "Add announcementsmod/forum:addnews" row "Roles with permission" column of "permissions" table should not contain "Student"
+    When I reload the page
+    And I click on "Prohibit" "icon" in the "mod/forum:addnews" "table_row"
+    And I press "Student"
+    Then "Add announcementsmod/forum:addnews" row "Prohibited" column of "permissions" table should contain "Student"
+
+  Scenario: Module capabilities overrides
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "Forum" to section "1" and I fill the form with:
+      | Forum name  | Forum 1 |
+    And I follow "Forum 1"
+    And I navigate to "Permissions" in current page administration
+    When I click on "Allow" "icon" in the "mod/forum:addnews" "table_row"
+    And I press "Student"
+    Then "Add announcementsmod/forum:addnews" row "Roles with permission" column of "permissions" table should contain "Student"
+    When I reload the page
+    And I click on "Delete Student role" "link" in the "mod/forum:addnews" "table_row"
+    And I click on "Remove" "button" in the "Confirm role change" "dialogue"
+    Then "Add announcementsmod/forum:addnews" row "Roles with permission" column of "permissions" table should not contain "Student"
+    When I reload the page
+    And I click on "Prohibit" "icon" in the "mod/forum:addnews" "table_row"
+    And I press "Student"
+    Then "Add announcementsmod/forum:addnews" row "Prohibited" column of "permissions" table should contain "Student"
diff --git a/lib/tests/calendar_cron_task_test.php b/lib/tests/calendar_cron_task_test.php
index f17ab150eced1..6b0998768070f 100644
--- a/lib/tests/calendar_cron_task_test.php
+++ b/lib/tests/calendar_cron_task_test.php
@@ -58,7 +58,7 @@ public function test_cron_working_url() {
         $subscription->lastupdated = 0;
         calendar_add_subscription($subscription);
 
-        $this->expectOutputRegex('/Events imported: .* Events updated:/');
+        $this->expectOutputRegex('/Events imported: .* Events skipped: .* Events updated:/');
         $task = new \core\task\calendar_cron_task();
         $task->execute();
     }
diff --git a/lib/tests/core_renderer_template_exploit_test.php b/lib/tests/core_renderer_template_exploit_test.php
new file mode 100644
index 0000000000000..873ec025de8f0
--- /dev/null
+++ b/lib/tests/core_renderer_template_exploit_test.php
@@ -0,0 +1,462 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for core renderer render template exploit.
+ *
+ * @copyright 2019 Ryan Wyllie <ryan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Unit tests for core renderer render template exploit.
+ */
+class core_renderer_template_exploit_testcase extends advanced_testcase {
+    /**
+     * Test cases to confirm that blacklisted helpers are stripped from the source
+     * text by the helper before being passed to other another helper. This prevents
+     * nested calls to helpers.
+     */
+    public function get_template_testcases() {
+        // Different helper implementations to test various combinations of nested
+        // calls to render the templates.
+        $norender = function($text) {
+            return $text;
+        };
+        $singlerender = function($text, $helper) {
+            return $helper->render($text);
+        };
+        $recursiverender = function($text, $helper) {
+            $result = $helper->render($text);
+
+            while (strpos($result, '{{') != false) {
+                $result = $helper->render($result);
+            }
+
+            return $result;
+        };
+
+        return [
+            'nested JS helper' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{#js}} some nasty JS {{/js}}{{/testpix}}',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $singlerender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ],
+            'other nested helper' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{#test1}} some text {{/test1}}{{/testpix}}',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $singlerender,
+                    'test1' => $norender,
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,  some text',
+                'include' => false
+            ],
+            'double nested helper' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{#test1}} some text {{#js}} some nasty JS {{/js}} {{/test1}}{{/testpix}}',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $singlerender,
+                    'test1' => $norender,
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,  some text',
+                'include' => false
+            ],
+            'js helper not nested' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, some text {{/testpix}}{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $singlerender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, some text',
+                'include' => true
+            ],
+            'js in context not in helper' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{/testpix}}{{hack}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'hack' => '{{#js}} some nasty JS {{/js}}'
+                ],
+                'helpers' => [
+                    'testpix' => $singlerender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, {{#js}} some nasty JS {{/js}}',
+                'include' => false
+            ],
+            'js in context' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{hack}}{{/testpix}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'hack' => '{{#js}} some nasty JS {{/js}}'
+                ],
+                'helpers' => [
+                    'testpix' => $singlerender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ],
+            'js in context double depth with single render' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{first}}{{/testpix}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'first' => '{{second}}',
+                    'second' => '{{#js}} some nasty JS {{/js}}'
+                ],
+                'helpers' => [
+                    'testpix' => $singlerender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, {{#js}} some nasty JS {{/js}}',
+                'include' => false
+            ],
+            'js in context double depth with recursive render' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{first}}{{/testpix}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'first' => '{{second}}',
+                    'second' => '{{#js}} some nasty JS {{/js}}'
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ],
+            'partial' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, blah{{/testpix}}, {{> test2}}',
+                    'test2' => 'some content',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, blah, some content',
+                'include' => false
+            ],
+            'partial nested' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{> test2}}{{/testpix}}',
+                    'test2' => 'some content',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, some content',
+                'include' => false
+            ],
+            'partial with js' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, blah{{/testpix}}, {{> test2}}',
+                    'test2' => '{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, blah,',
+                'include' => true
+            ],
+            'partial nested with js' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{> test2}}{{/testpix}}',
+                    'test2' => '{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ],
+            'partial with js from context' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, blah{{/testpix}}, {{{foo}}}',
+                    'test2' => '{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'foo' => '{{> test2}}'
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, blah, {{> test2}}',
+                'include' => false
+            ],
+            'partial nested with js from context recursive render' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{foo}}{{/testpix}}',
+                    'test2' => '{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'foo' => '{{> test2}}'
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ],
+            'partial nested with js from context single render' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{foo}}{{/testpix}}',
+                    'test2' => '{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'foo' => '{{> test2}}'
+                ],
+                'helpers' => [
+                    'testpix' => $singlerender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ],
+            'partial double nested with js from context single render' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{foo}}{{/testpix}}',
+                    'test2' => '{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'foo' => '{{{bar}}}',
+                    'bar' => '{{> test2}}'
+                ],
+                'helpers' => [
+                    'testpix' => $singlerender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, {{> test2}}',
+                'include' => false
+            ],
+            'partial double nested with js from context recursive render' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{foo}}{{/testpix}}',
+                    'test2' => '{{#js}} some nasty JS {{/js}}',
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'foo' => '{{bar}}',
+                    'bar' => '{{> test2}}'
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ],
+            'array context depth 1' => [
+                'templates' => [
+                    'test' => '{{#items}}{{#testpix}} core, move, {{.}}{{/testpix}}{{/items}}'
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'items' => [
+                        'legit',
+                        '{{#js}}some nasty JS{{/js}}'
+                    ]
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, legit core, move,',
+                'include' => false
+            ],
+            'array context depth 2' => [
+                'templates' => [
+                    'test' => '{{#items}}{{#subitems}}{{#testpix}} core, move, {{.}}{{/testpix}}{{/subitems}}{{/items}}'
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'items' => [
+                        [
+                            'subitems' => [
+                                'legit',
+                                '{{#js}}some nasty JS{{/js}}'
+                            ]
+                        ],
+                    ]
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, legit core, move,',
+                'include' => false
+            ],
+            'object context depth 1' => [
+                'templates' => [
+                    'test' => '{{#items}}{{#testpix}} core, move, {{.}}{{/testpix}}{{/items}}'
+                ],
+                'torender' => 'test',
+                'context' => (object) [
+                    'items' => [
+                        'legit',
+                        '{{#js}}some nasty JS{{/js}}'
+                    ]
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, legit core, move,',
+                'include' => false
+            ],
+            'object context depth 2' => [
+                'templates' => [
+                    'test' => '{{#items}}{{#subitems}}{{#testpix}} core, move, {{.}}{{/testpix}}{{/subitems}}{{/items}}'
+                ],
+                'torender' => 'test',
+                'context' => (object) [
+                    'items' => [
+                        (object) [
+                            'subitems' => [
+                                'legit',
+                                '{{#js}}some nasty JS{{/js}}'
+                            ]
+                        ],
+                    ]
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move, legit core, move,',
+                'include' => false
+            ],
+            'change delimeters' => [
+                'templates' => [
+                    'test' => '{{#testpix}} core, move, {{{foo}}}{{/testpix}}'
+                ],
+                'torender' => 'test',
+                'context' => [
+                    'foo' => '{{=<% %>=}} <%#js%>some nasty JS,<%/js%>'
+                ],
+                'helpers' => [
+                    'testpix' => $recursiverender
+                ],
+                'js' => 'some nasty JS',
+                'expected' => 'core, move,',
+                'include' => false
+            ]
+        ];
+    }
+
+    /**
+     * Test that the mustache_helper_collection class correctly strips
+     * @dataProvider get_template_testcases()
+     * @param string $templates The template to add
+     * @param string $torender The name of the template to render
+     * @param array $context The template context
+     * @param array $helpers Mustache helpers to add
+     * @param string $js The JS string from the template
+     * @param string $expected The expected output of the string after stripping JS
+     * @param bool $include If the JS should be added to the page or not
+     */
+    public function test_core_mustache_engine_strips_js_helper(
+        $templates,
+        $torender,
+        $context,
+        $helpers,
+        $js,
+        $expected,
+        $include
+    ) {
+        $page = new \moodle_page();
+        $renderer = $page->get_renderer('core');
+
+        // Get the mustache engine from the renderer.
+        $reflection = new \ReflectionMethod($renderer, 'get_mustache');
+        $reflection->setAccessible(true);
+        $engine = $reflection->invoke($renderer);
+
+        // Swap the loader out with an array loader so that we can set some
+        // inline templates for testing.
+        $loader = new \Mustache_Loader_ArrayLoader([]);
+        $engine->setLoader($loader);
+
+        // Add our test helpers.
+        $helpercollection = $engine->getHelpers();
+        foreach ($helpers as $name => $function) {
+            $helpercollection->add($name, $function);
+        }
+
+        // Add our test template to be rendered.
+        foreach ($templates as $name => $template) {
+            $loader->setTemplate($name, $template);
+        }
+
+        // Confirm that the rendered template matches what we expect.
+        $this->assertEquals($expected, trim($engine->render($torender, $context)));
+
+        if ($include) {
+            // Confirm that the JS was added to the page.
+            $this->assertContains($js, $page->requires->get_end_code());
+        } else {
+            // Confirm that the JS wasn't added to the page.
+            $this->assertNotContains($js, $page->requires->get_end_code());
+        }
+    }
+}
diff --git a/lib/tests/date_test.php b/lib/tests/date_test.php
index 2cd0d9f7329dc..702124e9bc276 100644
--- a/lib/tests/date_test.php
+++ b/lib/tests/date_test.php
@@ -166,6 +166,14 @@ public function test_php_gmt_offsets() {
         }
     }
 
+    public function test_timezone_lang_strings() {
+        $phpzones = DateTimeZone::listIdentifiers();
+        $manager = get_string_manager();
+        foreach ($phpzones as $tz) {
+            $this->assertTrue($manager->string_exists(strtolower($tz), 'core_timezones'));
+        }
+    }
+
     public function test_get_localised_timezone() {
         $this->resetAfterTest();
 
diff --git a/lib/tests/event_context_locked_test.php b/lib/tests/event_context_locked_test.php
new file mode 100644
index 0000000000000..2a7a43532c869
--- /dev/null
+++ b/lib/tests/event_context_locked_test.php
@@ -0,0 +1,109 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for the context locking events.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+use core\event\context_locked;
+use core\event\context_unlocked;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Unit tests for the context_locked  and context_unlocked events.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <neill.magill@nottingham.ac.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_event_context_locked_testcase extends \advanced_testcase {
+    /**
+     * Locks an unlocked context and checks that a core\event\context_locked event is created.
+     *
+     * @param \context $context
+     */
+    protected function lock_context(\context $context) {
+        self::assertFalse($context->is_locked());
+
+        $locksink = $this->redirectEvents();
+        $context->set_locked(true);
+        // This second call should not create an event as the lock status has not changed.
+        $context->set_locked(true);
+        $lockevents = $locksink->get_events();
+        $locksink->close();
+
+        self::assertCount(1, $lockevents);
+        self::assertContainsOnlyInstancesOf('core\event\context_locked', $lockevents);
+        self::assertEquals($context->id, $lockevents[0]->objectid);
+        $this->assertSame('context', $lockevents[0]->objecttable);
+        $this->assertEquals($context, $lockevents[0]->get_context());
+    }
+
+    /**
+     * Tests that events are created when contexts are locked and unlocked.
+     */
+    public function test_creation() {
+        $this->resetAfterTest();
+
+        $category = self::getDataGenerator()->create_category();
+        $catcontext = \context_coursecat::instance($category->id);
+        $course = self::getDataGenerator()->create_course(['category' => $category->id]);
+        $coursecontext = \context_course::instance($course->id);
+        $activitygenerator = self::getDataGenerator()->get_plugin_generator('mod_forum');
+        $activity = $activitygenerator->create_instance(['course' => $course->id]);
+        $activitycontext = \context_module::instance($activity->cmid);
+
+        $this->lock_context($catcontext);
+        $this->unlock_context($catcontext);
+
+        $this->lock_context($coursecontext);
+        $this->unlock_context($coursecontext);
+
+        $this->lock_context($activitycontext);
+        $this->unlock_context($activitycontext);
+    }
+
+    /**
+     * Unlocks a locked context and checks that a core\event\context_unlocked event is created.
+     *
+     * @param \context $context
+     */
+    protected function unlock_context(\context $context) {
+        self::assertTrue($context->is_locked());
+
+        $unlocksink = $this->redirectEvents();
+        $context->set_locked(false);
+        // This second call should not create an event as the lock status has not changed.
+        $context->set_locked(false);
+        $unlockevents = $unlocksink->get_events();
+        $unlocksink->close();
+
+        self::assertCount(1, $unlockevents);
+        self::assertContainsOnlyInstancesOf('core\event\context_unlocked', $unlockevents);
+        self::assertEquals($context->id, $unlockevents[0]->objectid);
+        $this->assertSame('context', $unlockevents[0]->objecttable);
+        $this->assertEquals($context, $unlockevents[0]->get_context());
+    }
+}
diff --git a/lib/tests/filelib_test.php b/lib/tests/filelib_test.php
index a1b428a8d3cf8..f6e0c1b5dd30a 100644
--- a/lib/tests/filelib_test.php
+++ b/lib/tests/filelib_test.php
@@ -869,6 +869,11 @@ public function test_ignore_file_merging_in_draft_area() {
         // Save without merge.
         file_save_draft_area_files(IGNORE_FILE_MERGE, $usercontext->id, 'user', 'private', 0);
         $this->assertCount(2, $fs->get_area_files($usercontext->id, 'user', 'private'));
+        // Save again, this time including some inline text.
+        $inlinetext = 'Some text <img src="@@PLUGINFILE@@/file.png">';
+        $text = file_save_draft_area_files(IGNORE_FILE_MERGE, $usercontext->id, 'user', 'private', 0, null, $inlinetext);
+        $this->assertCount(2, $fs->get_area_files($usercontext->id, 'user', 'private'));
+        $this->assertEquals($inlinetext, $text);
     }
 
     /**
diff --git a/lib/tests/filterlib_test.php b/lib/tests/filterlib_test.php
index c3aab08cb91dd..8f8e5fa759a73 100644
--- a/lib/tests/filterlib_test.php
+++ b/lib/tests/filterlib_test.php
@@ -33,23 +33,6 @@
  * Test filters.
  */
 class core_filterlib_testcase extends advanced_testcase {
-    private $syscontext;
-    private $childcontext;
-    private $childcontext2;
-    private $catcontext;
-    private $coursecontext;
-    private $course;
-    private $activity1context;
-    private $activity2context;
-
-    protected function setUp() {
-        global $DB;
-        parent::setUp();
-
-        $this->resetAfterTest();
-        $DB->delete_records('filter_active', array());
-        $DB->delete_records('filter_config', array());
-    }
 
     private function assert_only_one_filter_globally($filter, $state) {
         global $DB;
@@ -79,6 +62,8 @@ private function assert_global_sort_order($filters) {
     }
 
     public function test_set_filter_globally_on() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         // Exercise SUT.
         filter_set_global_state('name', TEXTFILTER_ON);
@@ -87,6 +72,8 @@ public function test_set_filter_globally_on() {
     }
 
     public function test_set_filter_globally_off() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         // Exercise SUT.
         filter_set_global_state('name', TEXTFILTER_OFF);
@@ -95,6 +82,8 @@ public function test_set_filter_globally_off() {
     }
 
     public function test_set_filter_globally_disabled() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         // Exercise SUT.
         filter_set_global_state('name', TEXTFILTER_DISABLED);
@@ -106,10 +95,13 @@ public function test_set_filter_globally_disabled() {
      * @expectedException coding_exception
      */
     public function test_global_config_exception_on_invalid_state() {
+        $this->resetAfterTest();
         filter_set_global_state('name', 0);
     }
 
     public function test_auto_sort_order() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         // Exercise SUT.
         filter_set_global_state('one', TEXTFILTER_DISABLED);
@@ -119,6 +111,8 @@ public function test_auto_sort_order() {
     }
 
     public function test_auto_sort_order_enabled() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         // Exercise SUT.
         filter_set_global_state('one', TEXTFILTER_ON);
@@ -128,6 +122,8 @@ public function test_auto_sort_order_enabled() {
     }
 
     public function test_update_existing_dont_duplicate() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         // Exercise SUT.
         filter_set_global_state('name', TEXTFILTER_ON);
@@ -137,6 +133,8 @@ public function test_update_existing_dont_duplicate() {
     }
 
     public function test_update_reorder_down() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         filter_set_global_state('one', TEXTFILTER_ON);
         filter_set_global_state('two', TEXTFILTER_ON);
@@ -148,6 +146,8 @@ public function test_update_reorder_down() {
     }
 
     public function test_update_reorder_up() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         filter_set_global_state('one', TEXTFILTER_ON);
         filter_set_global_state('two', TEXTFILTER_ON);
@@ -160,6 +160,8 @@ public function test_update_reorder_up() {
     }
 
     public function test_auto_sort_order_change_to_enabled() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         filter_set_global_state('one', TEXTFILTER_ON);
         filter_set_global_state('two', TEXTFILTER_DISABLED);
@@ -171,6 +173,8 @@ public function test_auto_sort_order_change_to_enabled() {
     }
 
     public function test_auto_sort_order_change_to_disabled() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         filter_set_global_state('one', TEXTFILTER_ON);
         filter_set_global_state('two', TEXTFILTER_ON);
@@ -182,6 +186,8 @@ public function test_auto_sort_order_change_to_disabled() {
     }
 
     public function test_filter_get_global_states() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         filter_set_global_state('one', TEXTFILTER_ON);
         filter_set_global_state('two', TEXTFILTER_OFF);
@@ -216,6 +222,8 @@ private function assert_no_local_setting() {
     }
 
     public function test_local_on() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Exercise SUT.
         filter_set_local_state('name', 123, TEXTFILTER_ON);
         // Validate.
@@ -223,6 +231,8 @@ public function test_local_on() {
     }
 
     public function test_local_off() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Exercise SUT.
         filter_set_local_state('name', 123, TEXTFILTER_OFF);
         // Validate.
@@ -230,6 +240,8 @@ public function test_local_off() {
     }
 
     public function test_local_inherit() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Exercise SUT.
         filter_set_local_state('name', 123, TEXTFILTER_INHERIT);
         // Validate.
@@ -240,6 +252,7 @@ public function test_local_inherit() {
      * @expectedException coding_exception
      */
     public function test_local_invalid_state_throws_exception() {
+        $this->resetAfterTest();
         // Exercise SUT.
         filter_set_local_state('name', 123, -9999);
     }
@@ -248,11 +261,14 @@ public function test_local_invalid_state_throws_exception() {
      * @expectedException coding_exception
      */
     public function test_throws_exception_when_setting_global() {
+        $this->resetAfterTest();
         // Exercise SUT.
         filter_set_local_state('name', context_system::instance()->id, TEXTFILTER_INHERIT);
     }
 
     public function test_local_inherit_deletes_existing() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         filter_set_local_state('name', 123, TEXTFILTER_INHERIT);
         // Exercise SUT.
@@ -276,6 +292,8 @@ private function assert_only_one_config($filter, $context, $name, $value) {
     }
 
     public function test_set_new_config() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Exercise SUT.
         filter_set_local_config('name', 123, 'settingname', 'An arbitrary value');
         // Validate.
@@ -283,6 +301,8 @@ public function test_set_new_config() {
     }
 
     public function test_update_existing_config() {
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
         // Setup fixture.
         filter_set_local_config('name', 123, 'settingname', 'An arbitrary value');
         // Exercise SUT.
@@ -292,6 +312,7 @@ public function test_update_existing_config() {
     }
 
     public function test_filter_get_local_config() {
+        $this->resetAfterTest();
         // Setup fixture.
         filter_set_local_config('name', 123, 'setting1', 'An arbitrary value');
         filter_set_local_config('name', 123, 'setting2', 'Another arbitrary value');
@@ -306,22 +327,37 @@ public function test_filter_get_local_config() {
     protected function setup_available_in_context_tests() {
         $course = $this->getDataGenerator()->create_course(array('category'=>1));
 
-        $this->childcontext = context_coursecat::instance(1);
-        $this->childcontext2 = context_course::instance($course->id);
-        $this->syscontext = context_system::instance();
+        $childcontext = context_coursecat::instance(1);
+        $childcontext2 = context_course::instance($course->id);
+        $syscontext = context_system::instance();
+
+        return [
+            'syscontext' => $syscontext,
+            'childcontext' => $childcontext,
+            'childcontext2' => $childcontext2
+        ];
+    }
+
+    protected function remove_all_filters_from_config() {
+        global $DB;
+        $DB->delete_records('filter_active', array());
+        $DB->delete_records('filter_config', array());
     }
 
     private function assert_filter_list($expectedfilters, $filters) {
-        $this->setup_available_in_context_tests();
         $this->assertEquals($expectedfilters, array_keys($filters), '', 0, 10, true);
     }
 
     public function test_globally_on_is_returned() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'syscontext' => $syscontext
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->syscontext);
+        $filters = filter_get_active_in_context($syscontext);
         // Validate.
         $this->assert_filter_list(array('name'), $filters);
         // Check no config returned correctly.
@@ -329,97 +365,128 @@ public function test_globally_on_is_returned() {
     }
 
     public function test_globally_off_not_returned() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'childcontext2' => $childcontext2
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_OFF);
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->childcontext2);
+        $filters = filter_get_active_in_context($childcontext2);
         // Validate.
         $this->assert_filter_list(array(), $filters);
     }
 
     public function test_globally_off_overridden() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'childcontext' => $childcontext,
+            'childcontext2' => $childcontext2
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_OFF);
-        filter_set_local_state('name', $this->childcontext->id, TEXTFILTER_ON);
+        filter_set_local_state('name', $childcontext->id, TEXTFILTER_ON);
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->childcontext2);
+        $filters = filter_get_active_in_context($childcontext2);
         // Validate.
         $this->assert_filter_list(array('name'), $filters);
     }
 
     public function test_globally_on_overridden() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'childcontext' => $childcontext,
+            'childcontext2' => $childcontext2
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
-        filter_set_local_state('name', $this->childcontext->id, TEXTFILTER_OFF);
+        filter_set_local_state('name', $childcontext->id, TEXTFILTER_OFF);
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->childcontext2);
+        $filters = filter_get_active_in_context($childcontext2);
         // Validate.
         $this->assert_filter_list(array(), $filters);
     }
 
     public function test_globally_disabled_not_overridden() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'syscontext' => $syscontext,
+            'childcontext' => $childcontext
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_DISABLED);
-        filter_set_local_state('name', $this->childcontext->id, TEXTFILTER_ON);
+        filter_set_local_state('name', $childcontext->id, TEXTFILTER_ON);
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->syscontext);
+        $filters = filter_get_active_in_context($syscontext);
         // Validate.
         $this->assert_filter_list(array(), $filters);
     }
 
     public function test_single_config_returned() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        [
+            'childcontext' => $childcontext
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
-        filter_set_local_config('name', $this->childcontext->id, 'settingname', 'A value');
+        filter_set_local_config('name', $childcontext->id, 'settingname', 'A value');
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->childcontext);
+        $filters = filter_get_active_in_context($childcontext);
         // Validate.
         $this->assertEquals(array('settingname' => 'A value'), $filters['name']);
     }
 
     public function test_multi_config_returned() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        [
+            'childcontext' => $childcontext
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
-        filter_set_local_config('name', $this->childcontext->id, 'settingname', 'A value');
-        filter_set_local_config('name', $this->childcontext->id, 'anothersettingname', 'Another value');
+        filter_set_local_config('name', $childcontext->id, 'settingname', 'A value');
+        filter_set_local_config('name', $childcontext->id, 'anothersettingname', 'Another value');
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->childcontext);
+        $filters = filter_get_active_in_context($childcontext);
         // Validate.
         $this->assertEquals(array('settingname' => 'A value', 'anothersettingname' => 'Another value'), $filters['name']);
     }
 
     public function test_config_from_other_context_not_returned() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        [
+            'childcontext' => $childcontext,
+            'childcontext2' => $childcontext2
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
-        filter_set_local_config('name', $this->childcontext->id, 'settingname', 'A value');
-        filter_set_local_config('name', $this->childcontext2->id, 'anothersettingname', 'Another value');
+        filter_set_local_config('name', $childcontext->id, 'settingname', 'A value');
+        filter_set_local_config('name', $childcontext2->id, 'anothersettingname', 'Another value');
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->childcontext2);
+        $filters = filter_get_active_in_context($childcontext2);
         // Validate.
         $this->assertEquals(array('anothersettingname' => 'Another value'), $filters['name']);
     }
 
     public function test_config_from_other_filter_not_returned() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        [
+            'childcontext' => $childcontext
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
-        filter_set_local_config('name', $this->childcontext->id, 'settingname', 'A value');
-        filter_set_local_config('other', $this->childcontext->id, 'anothersettingname', 'Another value');
+        filter_set_local_config('name', $childcontext->id, 'settingname', 'A value');
+        filter_set_local_config('other', $childcontext->id, 'anothersettingname', 'Another value');
         // Exercise SUT.
-        $filters = filter_get_active_in_context($this->childcontext);
+        $filters = filter_get_active_in_context($childcontext);
         // Validate.
         $this->assertEquals(array('settingname' => 'A value'), $filters['name']);
     }
 
     protected function assert_one_available_filter($filter, $localstate, $inheritedstate, $filters) {
-        $this->setup_available_in_context_tests();
         $this->assertEquals(1, count($filters), 'More than one record returned %s.');
         $rec = $filters[$filter];
         unset($rec->id);
@@ -431,34 +498,47 @@ protected function assert_one_available_filter($filter, $localstate, $inheriteds
     }
 
     public function test_available_in_context_localoverride() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'childcontext' => $childcontext
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
-        filter_set_local_state('name', $this->childcontext->id, TEXTFILTER_OFF);
+        filter_set_local_state('name', $childcontext->id, TEXTFILTER_OFF);
         // Exercise SUT.
-        $filters = filter_get_available_in_context($this->childcontext);
+        $filters = filter_get_available_in_context($childcontext);
         // Validate.
         $this->assert_one_available_filter('name', TEXTFILTER_OFF, TEXTFILTER_ON, $filters);
     }
 
     public function test_available_in_context_nolocaloverride() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'childcontext' => $childcontext,
+            'childcontext2' => $childcontext2
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
-        filter_set_local_state('name', $this->childcontext->id, TEXTFILTER_OFF);
+        filter_set_local_state('name', $childcontext->id, TEXTFILTER_OFF);
         // Exercise SUT.
-        $filters = filter_get_available_in_context($this->childcontext2);
+        $filters = filter_get_available_in_context($childcontext2);
         // Validate.
         $this->assert_one_available_filter('name', TEXTFILTER_INHERIT, TEXTFILTER_OFF, $filters);
     }
 
     public function test_available_in_context_disabled_not_returned() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'childcontext' => $childcontext
+        ] = $this->setup_available_in_context_tests();
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_DISABLED);
-        filter_set_local_state('name', $this->childcontext->id, TEXTFILTER_ON);
+        filter_set_local_state('name', $childcontext->id, TEXTFILTER_ON);
         // Exercise SUT.
-        $filters = filter_get_available_in_context($this->childcontext);
+        $filters = filter_get_available_in_context($childcontext);
         // Validate.
         $this->assertEquals(array(), $filters);
     }
@@ -467,23 +547,34 @@ public function test_available_in_context_disabled_not_returned() {
      * @expectedException coding_exception
      */
     public function test_available_in_context_exception_with_syscontext() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        [
+            'syscontext' => $syscontext
+        ] = $this->setup_available_in_context_tests();
         // Exercise SUT.
-        filter_get_available_in_context($this->syscontext);
+        filter_get_available_in_context($syscontext);
     }
 
     protected function setup_preload_activities_test() {
-        $this->syscontext = context_system::instance();
-        $this->catcontext = context_coursecat::instance(1);
-        $this->course = $this->getDataGenerator()->create_course(array('category'=>1));
-        $this->coursecontext = context_course::instance($this->course->id);
-        $page1 =  $this->getDataGenerator()->create_module('page', array('course'=>$this->course->id));
-        $this->activity1context = context_module::instance($page1->cmid);
-        $page2 =  $this->getDataGenerator()->create_module('page', array('course'=>$this->course->id));
-        $this->activity2context = context_module::instance($page2->cmid);
-    }
-
-    private function assert_matches($modinfo) {
+        $syscontext = context_system::instance();
+        $catcontext = context_coursecat::instance(1);
+        $course = $this->getDataGenerator()->create_course(array('category' => 1));
+        $coursecontext = context_course::instance($course->id);
+        $page1 = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
+        $activity1context = context_module::instance($page1->cmid);
+        $page2 = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
+        $activity2context = context_module::instance($page2->cmid);
+        return [
+            'syscontext' => $syscontext,
+            'catcontext' => $catcontext,
+            'course' => $course,
+            'coursecontext' => $coursecontext,
+            'activity1context' => $activity1context,
+            'activity2context' => $activity2context
+         ];
+    }
+
+    private function assert_matches($modinfo, $activity1context, $activity2context) {
         global $FILTERLIB_PRIVATE, $DB;
 
         // Use preload cache...
@@ -492,16 +583,16 @@ private function assert_matches($modinfo) {
 
         // Get data and check no queries are made.
         $before = $DB->perf_get_reads();
-        $plfilters1 = filter_get_active_in_context($this->activity1context);
-        $plfilters2 = filter_get_active_in_context($this->activity2context);
+        $plfilters1 = filter_get_active_in_context($activity1context);
+        $plfilters2 = filter_get_active_in_context($activity2context);
         $after = $DB->perf_get_reads();
         $this->assertEquals($before, $after);
 
         // Repeat without cache and check it makes queries now.
         $FILTERLIB_PRIVATE = new stdClass;
         $before = $DB->perf_get_reads();
-        $filters1 = filter_get_active_in_context($this->activity1context);
-        $filters2 = filter_get_active_in_context($this->activity2context);
+        $filters1 = filter_get_active_in_context($activity1context);
+        $filters2 = filter_get_active_in_context($activity2context);
         $after = $DB->perf_get_reads();
         $this->assertTrue($after > $before);
 
@@ -511,60 +602,69 @@ private function assert_matches($modinfo) {
     }
 
     public function test_preload() {
-        $this->setup_preload_activities_test();
+        $this->resetAfterTest();
+        [
+            'catcontext' => $catcontext,
+            'course' => $course,
+            'coursecontext' => $coursecontext,
+            'activity1context' => $activity1context,
+            'activity2context' => $activity2context
+         ] = $this->setup_preload_activities_test();
         // Get course and modinfo.
-        $modinfo = new course_modinfo($this->course, 2);
+        $modinfo = new course_modinfo($course, 2);
 
         // Note: All the tests in this function check that the result from the
         // preloaded cache is the same as the result from calling the standard
         // function without preloading.
 
         // Initially, check with no filters enabled.
-        $this->assert_matches($modinfo);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Enable filter globally, check.
         filter_set_global_state('name', TEXTFILTER_ON);
-        $this->assert_matches($modinfo);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Disable for activity 2.
-        filter_set_local_state('name', $this->activity2context->id, TEXTFILTER_OFF);
-        $this->assert_matches($modinfo);
+        filter_set_local_state('name', $activity2context->id, TEXTFILTER_OFF);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Disable at category.
-        filter_set_local_state('name', $this->catcontext->id, TEXTFILTER_OFF);
-        $this->assert_matches($modinfo);
+        filter_set_local_state('name', $catcontext->id, TEXTFILTER_OFF);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Enable for activity 1.
-        filter_set_local_state('name', $this->activity1context->id, TEXTFILTER_ON);
-        $this->assert_matches($modinfo);
+        filter_set_local_state('name', $activity1context->id, TEXTFILTER_ON);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Disable globally.
         filter_set_global_state('name', TEXTFILTER_DISABLED);
-        $this->assert_matches($modinfo);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Add another 2 filters.
         filter_set_global_state('frog', TEXTFILTER_ON);
         filter_set_global_state('zombie', TEXTFILTER_ON);
-        $this->assert_matches($modinfo);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Disable random one of these in each context.
-        filter_set_local_state('zombie', $this->activity1context->id, TEXTFILTER_OFF);
-        filter_set_local_state('frog', $this->activity2context->id, TEXTFILTER_OFF);
-        $this->assert_matches($modinfo);
+        filter_set_local_state('zombie', $activity1context->id, TEXTFILTER_OFF);
+        filter_set_local_state('frog', $activity2context->id, TEXTFILTER_OFF);
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
 
         // Now do some filter options.
-        filter_set_local_config('name', $this->activity1context->id, 'a', 'x');
-        filter_set_local_config('zombie', $this->activity1context->id, 'a', 'y');
-        filter_set_local_config('frog', $this->activity1context->id, 'a', 'z');
+        filter_set_local_config('name', $activity1context->id, 'a', 'x');
+        filter_set_local_config('zombie', $activity1context->id, 'a', 'y');
+        filter_set_local_config('frog', $activity1context->id, 'a', 'z');
         // These last two don't do anything as they are not at final level but I
         // thought it would be good to have that verified in test.
-        filter_set_local_config('frog', $this->coursecontext->id, 'q', 'x');
-        filter_set_local_config('frog', $this->catcontext->id, 'q', 'z');
-        $this->assert_matches($modinfo);
+        filter_set_local_config('frog', $coursecontext->id, 'q', 'x');
+        filter_set_local_config('frog', $catcontext->id, 'q', 'z');
+        $this->assert_matches($modinfo, $activity1context, $activity2context);
     }
 
     public function test_filter_delete_all_for_filter() {
         global $DB;
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
 
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
@@ -588,6 +688,8 @@ public function test_filter_delete_all_for_filter() {
 
     public function test_filter_delete_all_for_context() {
         global $DB;
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
 
         // Setup fixture.
         filter_set_global_state('name', TEXTFILTER_ON);
@@ -606,6 +708,7 @@ public function test_filter_delete_all_for_context() {
 
     public function test_set() {
         global $CFG;
+        $this->resetAfterTest();
 
         $this->assertFileExists("$CFG->dirroot/filter/emailprotect"); // Any standard filter.
         $this->assertFileExists("$CFG->dirroot/filter/tidy");         // Any standard filter.
@@ -631,6 +734,7 @@ public function test_set() {
 
     public function test_unset_to_empty() {
         global $CFG;
+        $this->resetAfterTest();
 
         $this->assertFileExists("$CFG->dirroot/filter/tidy"); // Any standard filter.
 
@@ -646,6 +750,7 @@ public function test_unset_to_empty() {
 
     public function test_unset_multi() {
         global $CFG;
+        $this->resetAfterTest();
 
         $this->assertFileExists("$CFG->dirroot/filter/emailprotect"); // Any standard filter.
         $this->assertFileExists("$CFG->dirroot/filter/tidy");         // Any standard filter.
@@ -662,6 +767,7 @@ public function test_unset_multi() {
     }
 
     public function test_filter_manager_instance() {
+        $this->resetAfterTest();
 
         set_config('perfdebug', 7);
         filter_manager::reset_caches();
@@ -677,18 +783,26 @@ public function test_filter_manager_instance() {
     }
 
     public function test_filter_get_globally_enabled_default() {
+        $this->resetAfterTest();
         $enabledfilters = filter_get_globally_enabled();
         $this->assertArrayNotHasKey('glossary', $enabledfilters);
     }
 
     public function test_filter_get_globally_enabled_after_change() {
+        $this->resetAfterTest();
         filter_set_global_state('glossary', TEXTFILTER_ON);
         $enabledfilters = filter_get_globally_enabled();
         $this->assertArrayHasKey('glossary', $enabledfilters);
     }
 
     public function test_filter_get_globally_enabled_filters_with_config() {
-        $this->setup_available_in_context_tests();
+        $this->resetAfterTest();
+        $this->remove_all_filters_from_config(); // Remove all filters.
+        [
+            'syscontext' => $syscontext,
+            'childcontext' => $childcontext
+        ] = $this->setup_available_in_context_tests();
+        $this->remove_all_filters_from_config(); // Remove all filters.
 
         // Set few filters.
         filter_set_global_state('one', TEXTFILTER_ON);
@@ -696,18 +810,18 @@ public function test_filter_get_globally_enabled_filters_with_config() {
         filter_set_global_state('two', TEXTFILTER_DISABLED);
 
         // Set global config.
-        filter_set_local_config('one', $this->syscontext->id, 'test1a', 'In root');
-        filter_set_local_config('one', $this->syscontext->id, 'test1b', 'In root');
-        filter_set_local_config('two', $this->syscontext->id, 'test2a', 'In root');
-        filter_set_local_config('two', $this->syscontext->id, 'test2b', 'In root');
+        filter_set_local_config('one', $syscontext->id, 'test1a', 'In root');
+        filter_set_local_config('one', $syscontext->id, 'test1b', 'In root');
+        filter_set_local_config('two', $syscontext->id, 'test2a', 'In root');
+        filter_set_local_config('two', $syscontext->id, 'test2b', 'In root');
 
         // Set child config.
-        filter_set_local_config('one', $this->childcontext->id, 'test1a', 'In child');
-        filter_set_local_config('one', $this->childcontext->id, 'test1b', 'In child');
-        filter_set_local_config('two', $this->childcontext->id, 'test2a', 'In child');
-        filter_set_local_config('two', $this->childcontext->id, 'test2b', 'In child');
-        filter_set_local_config('three', $this->childcontext->id, 'test3a', 'In child');
-        filter_set_local_config('three', $this->childcontext->id, 'test3b', 'In child');
+        filter_set_local_config('one', $childcontext->id, 'test1a', 'In child');
+        filter_set_local_config('one', $childcontext->id, 'test1b', 'In child');
+        filter_set_local_config('two', $childcontext->id, 'test2a', 'In child');
+        filter_set_local_config('two', $childcontext->id, 'test2b', 'In child');
+        filter_set_local_config('three', $childcontext->id, 'test3a', 'In child');
+        filter_set_local_config('three', $childcontext->id, 'test3b', 'In child');
 
         // Check.
         $actual = filter_get_globally_enabled_filters_with_config();
diff --git a/lib/tests/fixtures/repeated_events.ics b/lib/tests/fixtures/repeated_events.ics
new file mode 100644
index 0000000000000..7157007a5a2f7
--- /dev/null
+++ b/lib/tests/fixtures/repeated_events.ics
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+PRODID:QIS-LSF HIS eG
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+METHOD:PUBLISH
+BEGIN:VEVENT
+DTSTART;TZID=Europe/Berlin:20191015T160000
+DTEND;TZID=Europe/Berlin:20191015T180000
+RRULE:FREQ=WEEKLY;UNTIL=20200211T235900Z;INTERVAL=1;BYDAY=TU
+LOCATION:O27 - 122
+DTSTAMP:20191002T151421Z
+UID:115808212972
+DESCRIPTION:
+SUMMARY:CS6307.000 - Introduction to Computer Science (for Non-Computer Scientists)
+CATEGORIES:Vorlesung/ Übung
+END:VEVENT
+END:VCALENDAR
diff --git a/lib/tests/grouplib_test.php b/lib/tests/grouplib_test.php
index af350ccdcdb16..d63c084ac62fe 100644
--- a/lib/tests/grouplib_test.php
+++ b/lib/tests/grouplib_test.php
@@ -1123,7 +1123,7 @@ public function test_groups_sort_menu_options_user_both_many_groups() {
      * Tests for groups_user_groups_visible.
      */
     public function test_groups_user_groups_visible() {
-        global $CFG, $DB;
+        global $DB;
 
         $generator = $this->getDataGenerator();
         $this->resetAfterTest();
@@ -1172,7 +1172,8 @@ public function test_groups_user_groups_visible() {
         $result = groups_user_groups_visible($course, $user2->id);
         $this->assertTrue($result);
 
-        $result = groups_user_groups_visible($course, $user2->id);
+        $cm->groupmode = NOGROUPS;
+        $result = groups_user_groups_visible($course, $user2->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1190,7 +1191,8 @@ public function test_groups_user_groups_visible() {
         $result = groups_user_groups_visible($course, $user2->id);
         $this->assertTrue($result);
 
-        $result = groups_user_groups_visible($course, $user2->id);
+        $cm->groupmode = NOGROUPS;
+        $result = groups_user_groups_visible($course, $user2->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1228,7 +1230,7 @@ public function test_groups_user_groups_visible() {
         $this->assertTrue($result);
 
         $cm->groupmode = NOGROUPS;
-        $result = groups_user_groups_visible($course, $user2->id);
+        $result = groups_user_groups_visible($course, $user2->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1296,7 +1298,8 @@ public function test_groups_user_groups_visible() {
         $result = groups_user_groups_visible($course, $user4->id);
         $this->assertTrue($result);
 
-        $result = groups_user_groups_visible($course, $user4->id);
+        $cm->groupmode = NOGROUPS;
+        $result = groups_user_groups_visible($course, $user4->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1314,7 +1317,8 @@ public function test_groups_user_groups_visible() {
         $result = groups_user_groups_visible($course, $user4->id);
         $this->assertTrue($result);
 
-        $result = groups_user_groups_visible($course, $user4->id);
+        $cm->groupmode = NOGROUPS;
+        $result = groups_user_groups_visible($course, $user4->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1322,7 +1326,7 @@ public function test_groups_user_groups_visible() {
         $this->assertTrue($result); // Cm with separate groups.
 
         $cm->groupmode = SEPARATEGROUPS;
-        $result = groups_user_groups_visible($course, $user4->id);
+        $result = groups_user_groups_visible($course, $user4->id, $cm);
         $this->assertTrue($result); // Cm with visible groups.
 
         // Visible groups, forced.
@@ -1352,7 +1356,7 @@ public function test_groups_user_groups_visible() {
         $this->assertTrue($result);
 
         $cm->groupmode = NOGROUPS;
-        $result = groups_user_groups_visible($course, $user4->id);
+        $result = groups_user_groups_visible($course, $user4->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1424,7 +1428,8 @@ public function test_groups_user_groups_visible() {
         $result = groups_user_groups_visible($course, $user1->id);
         $this->assertTrue($result); // Requesting all groups.
 
-        $result = groups_user_groups_visible($course, $user1->id);
+        $cm->groupmode = NOGROUPS;
+        $result = groups_user_groups_visible($course, $user1->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1446,7 +1451,8 @@ public function test_groups_user_groups_visible() {
         $result = groups_user_groups_visible($course, $user1->id);
         $this->assertTrue($result); // Requesting all groups.
 
-        $result = groups_user_groups_visible($course, $user1->id);
+        $cm->groupmode = NOGROUPS;
+        $result = groups_user_groups_visible($course, $user1->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
@@ -1456,7 +1462,7 @@ public function test_groups_user_groups_visible() {
         $this->assertTrue($result); // Cm with separate groups.
 
         $cm->groupmode = SEPARATEGROUPS;
-        $result = groups_user_groups_visible($course, $user1->id);
+        $result = groups_user_groups_visible($course, $user1->id, $cm);
         $this->assertTrue($result); // Cm with visible groups.
 
         // Visible groups, forced.
@@ -1492,7 +1498,7 @@ public function test_groups_user_groups_visible() {
         $this->assertTrue($result); // Requesting all groups.
 
         $cm->groupmode = NOGROUPS;
-        $result = groups_user_groups_visible($course, $user1->id);
+        $result = groups_user_groups_visible($course, $user1->id, $cm);
         $this->assertTrue($result); // Cm with no groups.
 
         $cm->groupmode = SEPARATEGROUPS;
diff --git a/lib/tests/htmlpurifier_test.php b/lib/tests/htmlpurifier_test.php
index e14b3191fdf87..f1ae916c93af6 100644
--- a/lib/tests/htmlpurifier_test.php
+++ b/lib/tests/htmlpurifier_test.php
@@ -64,6 +64,11 @@ public function test_nolink() {
         $text = '<nolink>xxx<em>xx</em><div>xxx</div></nolink>';
         $result = purify_html($text, array());
         $this->assertSame($text, $result);
+
+        // Ensure nolink doesn't force open tags to be closed, so can be virtually everywhere.
+        $text = '<p><nolink><div>no filters</div></nolink></p>';
+        $result = purify_html($text, array());
+        $this->assertSame($text, $result);
     }
 
     /**
diff --git a/lib/tests/lock_config_test.php b/lib/tests/lock_config_test.php
index 63aef074d70c4..611eca57cdd00 100644
--- a/lib/tests/lock_config_test.php
+++ b/lib/tests/lock_config_test.php
@@ -46,31 +46,57 @@ public function test_lock_config() {
         if (isset($CFG->lock_factory)) {
             $original = $CFG->lock_factory;
         }
+        $originalfilelocking = null;
+        if (isset($CFG->preventfilelocking)) {
+            $originalfilelocking = $CFG->preventfilelocking;
+        }
 
         // Test no configuration.
         unset($CFG->lock_factory);
-
+        $CFG->preventfilelocking = 0;
         $factory = \core\lock\lock_config::get_lock_factory('cache');
-
         $this->assertNotEmpty($factory, 'Get a default factory with no configuration');
 
-        $CFG->lock_factory = '\core\lock\file_lock_factory';
+        // Test explicit broken lock.
+        $CFG->lock_factory = '\core\lock\not_a_lock_factory';
+        try {
+            $factory = \core\lock\lock_config::get_lock_factory('cache');
+            $this->fail('Exception expected');
+        } catch (moodle_exception $ex) {
+            $this->assertInstanceOf('coding_exception', $ex);
+        }
 
+        // Test explicit file locks.
+        $CFG->lock_factory = '\core\lock\file_lock_factory';
         $factory = \core\lock\lock_config::get_lock_factory('cache');
         $this->assertTrue($factory instanceof \core\lock\file_lock_factory,
-                          'Get a default factory with a set configuration');
+                'Get an explicit file lock factory');
 
-        $CFG->lock_factory = '\core\lock\db_record_lock_factory';
+        // Test explicit file locks but with file locks prevented.
+        $CFG->preventfilelocking = 1;
+        try {
+            $factory = \core\lock\lock_config::get_lock_factory('cache');
+            $this->fail('Exception expected');
+        } catch (moodle_exception $ex) {
+            $this->assertInstanceOf('coding_exception', $ex);
+        }
 
+        // Test explicit db locks.
+        $CFG->lock_factory = '\core\lock\db_record_lock_factory';
         $factory = \core\lock\lock_config::get_lock_factory('cache');
         $this->assertTrue($factory instanceof \core\lock\db_record_lock_factory,
-                          'Get a default factory with a changed configuration');
+                'Get an explicit db record lock factory');
 
         if ($original) {
             $CFG->lock_factory = $original;
         } else {
             unset($CFG->lock_factory);
         }
+        if ($originalfilelocking) {
+            $CFG->preventfilelocking = $originalfilelocking;
+        } else {
+            unset($CFG->preventfilelocking);
+        }
     }
 }
 
diff --git a/lib/tests/lock_test.php b/lib/tests/lock_test.php
index 695d3a174e8c8..1d2ae40653d93 100644
--- a/lib/tests/lock_test.php
+++ b/lib/tests/lock_test.php
@@ -44,11 +44,26 @@ protected function setUp() {
     }
 
     /**
-     * Run a suite of tests on a lock factory.
-     * @param \core\lock\lock_factory $lockfactory - A lock factory to test
+     * Run a suite of tests on a lock factory class.
+     *
+     * @param class $lockfactoryclass - A lock factory class to test
      */
-    protected function run_on_lock_factory(\core\lock\lock_factory $lockfactory) {
+    protected function run_on_lock_factory($lockfactoryclass) {
 
+        $modassignfactory = new $lockfactoryclass('mod_assign');
+        $tooltaskfactory = new $lockfactoryclass('tool_task');
+
+        // Test for lock clashes between lock stores.
+        $assignlock = $modassignfactory->get_lock('abc', 0);
+        $this->assertNotEmpty($assignlock, 'Get a lock "abc" from store "mod_assign"');
+
+        $tasklock = $tooltaskfactory->get_lock('abc', 0);
+        $this->assertNotEmpty($tasklock, 'Get a lock "abc" from store "tool_task"');
+
+        $assignlock->release();
+        $tasklock->release();
+
+        $lockfactory = new $lockfactoryclass('default');
         if ($lockfactory->is_available()) {
             // This should work.
             $lock1 = $lockfactory->get_lock('abc', 2);
@@ -111,20 +126,16 @@ protected function run_on_lock_factory(\core\lock\lock_factory $lockfactory) {
     }
 
     /**
-     * Tests the testable lock factories.
+     * Tests the testable lock factories classes.
      * @return void
      */
     public function test_locks() {
         // Run the suite on the current configured default (may be non-core).
-        $defaultfactory = \core\lock\lock_config::get_lock_factory('default');
-        $this->run_on_lock_factory($defaultfactory);
+        $this->run_on_lock_factory(\core\lock\lock_config::get_lock_factory_class());
 
         // Manually create the core no-configuration factories.
-        $dblockfactory = new \core\lock\db_record_lock_factory('test');
-        $this->run_on_lock_factory($dblockfactory);
-
-        $filelockfactory = new \core\lock\file_lock_factory('test');
-        $this->run_on_lock_factory($filelockfactory);
+        $this->run_on_lock_factory(\core\lock\db_record_lock_factory::class);
+        $this->run_on_lock_factory(\core\lock\file_lock_factory::class);
 
     }
 
diff --git a/lib/tests/messageinbound_test.php b/lib/tests/messageinbound_test.php
index 0d4b50f6d5f23..6e8cb5b822541 100644
--- a/lib/tests/messageinbound_test.php
+++ b/lib/tests/messageinbound_test.php
@@ -111,7 +111,7 @@ protected function read_test_file(\SplFileInfo $file, $fixturesdir) {
         // Break on the --[TOKEN]-- tags in the file.
         $content = file_get_contents($file->getRealPath());
         $content = preg_replace("#\r\n#", "\n", $content);
-        $tokens = preg_split('#(?:^|\n*)----([A-Z]+)----\n#', file_get_contents($file->getRealPath()),
+        $tokens = preg_split('#(?:^|\n*)----([A-Z]+)----\n#', $content,
                 null, PREG_SPLIT_DELIM_CAPTURE);
         $sections = array(
             // Key              => Required.
diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index f27a6f59d9e1d..664e31b1bc14b 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -36,18 +36,24 @@ class core_moodlelib_testcase extends advanced_testcase {
      * It is not possible to directly change the result of get_string in
      * a unit test. Instead, we create a language pack for language 'xx' in
      * dataroot and make langconfig.php with the string we need to change.
-     * The example separator used here is 'X'; on PHP 5.3 and before this
+     * The default example separator used here is 'X'; on PHP 5.3 and before this
      * must be a single byte character due to PHP bug/limitation in
      * number_format, so you can't use UTF-8 characters.
+     *
+     * @param string $decsep Separator character. Defaults to `'X'`.
      */
-    protected function define_local_decimal_separator() {
+    protected function define_local_decimal_separator(string $decsep = 'X') {
         global $SESSION, $CFG;
 
         $SESSION->lang = 'xx';
-        $langconfig = "<?php\n\$string['decsep'] = 'X';";
+        $langconfig = "<?php\n\$string['decsep'] = '$decsep';";
         $langfolder = $CFG->dataroot . '/lang/xx';
         check_dir_exists($langfolder);
         file_put_contents($langfolder . '/langconfig.php', $langconfig);
+
+        // Ensure the new value is picked up and not taken from the cache.
+        $stringmanager = get_string_manager();
+        $stringmanager->reset_caches(true);
     }
 
     public function test_cleanremoteaddr() {
@@ -2243,6 +2249,14 @@ public function test_format_float() {
         // Custom number of decimal places.
         $this->assertEquals('5.43000', format_float(5.43, 5));
 
+        // Auto detect the number of decimal places.
+        $this->assertEquals('5.43', format_float(5.43, -1));
+        $this->assertEquals('5.43', format_float(5.43000, -1));
+        $this->assertEquals('5', format_float(5, -1));
+        $this->assertEquals('5', format_float(5.0, -1));
+        $this->assertEquals('0.543', format_float('5.43e-1', -1));
+        $this->assertEquals('0.543', format_float('5.43000e-1', -1));
+
         // Option to strip ending zeros after rounding.
         $this->assertEquals('5.43', format_float(5.43, 5, true, true));
         $this->assertEquals('5', format_float(5.0001, 3, true, true));
@@ -2257,6 +2271,14 @@ public function test_format_float() {
         // Localisation off.
         $this->assertEquals('5.43000', format_float(5.43, 5, false));
         $this->assertEquals('5.43', format_float(5.43, 5, false, true));
+
+        // Tests with tilde as localised decimal separator.
+        $this->define_local_decimal_separator('~');
+
+        // Must also work for '~' as decimal separator.
+        $this->assertEquals('5', format_float(5.0001, 3, true, true));
+        $this->assertEquals('5~43000', format_float(5.43, 5));
+        $this->assertEquals('5~43', format_float(5.43, 5, true, true));
     }
 
     /**
diff --git a/lib/tests/output_mustache_helper_collection_test.php b/lib/tests/output_mustache_helper_collection_test.php
new file mode 100644
index 0000000000000..aaac1e989f134
--- /dev/null
+++ b/lib/tests/output_mustache_helper_collection_test.php
@@ -0,0 +1,177 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for lib/classes/output/mustache_helper_collection
+ *
+ * @copyright 2019 Ryan Wyllie <ryan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+use core\output\mustache_helper_collection;
+
+/**
+ * Unit tests for the mustache_helper_collection class.
+ */
+class core_output_mustache_helper_collection_testcase extends advanced_testcase {
+    /**
+     * Test cases to confirm that blacklisted helpers are stripped from the source
+     * text by the helper before being passed to other another helper. This prevents
+     * nested calls to helpers.
+     */
+    public function get_strip_blacklisted_helpers_testcases() {
+        return [
+            'no blacklist' => [
+                'blacklist' => [],
+                'input' => 'core, move, {{#js}} some nasty JS {{/js}}',
+                'expected' => 'core, move, {{#js}} some nasty JS {{/js}}'
+            ],
+            'blacklist no match' => [
+                'blacklist' => ['foo'],
+                'input' => 'core, move, {{#js}} some nasty JS {{/js}}',
+                'expected' => 'core, move, {{#js}} some nasty JS {{/js}}'
+            ],
+            'blacklist partial match 1' => [
+                'blacklist' => ['js'],
+                'input' => 'core, move, {{#json}} some nasty JS {{/json}}',
+                'expected' => 'core, move, {{#json}} some nasty JS {{/json}}'
+            ],
+            'blacklist partial match 2' => [
+                'blacklist' => ['js'],
+                'input' => 'core, move, {{#onjs}} some nasty JS {{/onjs}}',
+                'expected' => 'core, move, {{#onjs}} some nasty JS {{/onjs}}'
+            ],
+            'single blacklist 1' => [
+                'blacklist' => ['js'],
+                'input' => 'core, move, {{#js}} some nasty JS {{/js}}',
+                'expected' => 'core, move, {{}}'
+            ],
+            'single blacklist 2' => [
+                'blacklist' => ['js'],
+                'input' => 'core, move, {{ # js }} some nasty JS {{ /  js }}',
+                'expected' => 'core, move, {{}}'
+            ],
+            'single blacklist 3' => [
+                'blacklist' => ['js'],
+                'input' => 'core, {{#js}} some nasty JS {{/js}}, test',
+                'expected' => 'core, {{}}, test'
+            ],
+            'single blacklist 3' => [
+                'blacklist' => ['js'],
+                'input' => 'core, {{#ok}} this is ok {{/ok}}, {{#js}} some nasty JS {{/js}}',
+                'expected' => 'core, {{#ok}} this is ok {{/ok}}, {{}}'
+            ],
+            'single blacklist multiple matches 1' => [
+                'blacklist' => ['js'],
+                'input' => 'core, {{#js}} some nasty JS {{/js}}, {{#js}} some nasty JS {{/js}}',
+                'expected' => 'core, {{}}'
+            ],
+            'single blacklist multiple matches 2' => [
+                'blacklist' => ['js'],
+                'input' => 'core, {{ # js }} some nasty JS {{ /  js }}, {{ # js }} some nasty JS {{ /  js }}',
+                'expected' => 'core, {{}}'
+            ],
+            'single blacklist multiple matches nested 1' => [
+                'blacklist' => ['js'],
+                'input' => 'core, move, {{#js}} some nasty JS {{#js}} some nasty JS {{/js}} {{/js}}',
+                'expected' => 'core, move, {{}}'
+            ],
+            'single blacklist multiple matches nested 2' => [
+                'blacklist' => ['js'],
+                'input' => 'core, move, {{ # js }} some nasty JS {{ # js }} some nasty JS {{ /  js }}{{ /  js }}',
+                'expected' => 'core, move, {{}}'
+            ],
+            'multiple blacklist 1' => [
+                'blacklist' => ['js', 'foo'],
+                'input' => 'core, move, {{#js}} some nasty JS {{/js}}',
+                'expected' => 'core, move, {{}}'
+            ],
+            'multiple blacklist 2' => [
+                'blacklist' => ['js', 'foo'],
+                'input' => 'core, {{#foo}} blah {{/foo}}, {{#js}} js {{/js}}',
+                'expected' => 'core, {{}}, {{}}'
+            ],
+            'multiple blacklist 3' => [
+                'blacklist' => ['js', 'foo'],
+                'input' => '{{#foo}} blah {{/foo}}, {{#foo}} blah {{/foo}}, {{#js}} js {{/js}}',
+                'expected' => '{{}}, {{}}'
+            ],
+            'multiple blacklist 4' => [
+                'blacklist' => ['js', 'foo'],
+                'input' => '{{#foo}} blah {{/foo}}, {{#js}} js {{/js}}, {{#foo}} blah {{/foo}}',
+                'expected' => '{{}}'
+            ],
+            'multiple blacklist 4' => [
+                'blacklist' => ['js', 'foo'],
+                'input' => 'core, move, {{#js}} JS {{#foo}} blah {{/foo}} {{/js}}',
+                'expected' => 'core, move, {{}}'
+            ],
+        ];
+    }
+
+    /**
+     * Test that the mustache_helper_collection class correctly strips
+     * @dataProvider get_strip_blacklisted_helpers_testcases()
+     * @param string[] $blacklist The list of helpers to strip
+     * @param string $input The input string for the helper
+     * @param string $expected The expected output of the string after blacklist strip
+     */
+    public function test_strip_blacklisted_helpers($blacklist, $input, $expected) {
+        $collection = new mustache_helper_collection(null, $blacklist);
+        $this->assertEquals($expected, $collection->strip_blacklisted_helpers($blacklist, $input));
+    }
+
+    /**
+     * Test that the blacklisted helpers are disabled during the execution of other
+     * helpers.
+     *
+     * Any non-blacklisted helper should still be available to call during the
+     * execution of a helper.
+     */
+    public function test_blacklisted_helpers_disabled_during_execution() {
+        $engine = new \Mustache_Engine();
+        $context = new \Mustache_Context();
+        $lambdahelper = new \Mustache_LambdaHelper($engine, $context);
+        $blacklist = ['bad'];
+        $collection = new mustache_helper_collection(null, $blacklist);
+        $badcalled = false;
+        $goodcalled = false;
+
+        $badhelper = function() use (&$badcalled) {
+            $badcalled = true;
+            return '';
+        };
+        $goodhelper = function() use (&$goodcalled) {
+            $goodcalled = true;
+            return '';
+        };
+        // A test helper that just returns the text without modifying it.
+        $testhelper = function($text, $lambda) use ($collection) {
+            $collection->get('good')($text, $lambda);
+            $collection->get('bad')($text, $lambda);
+            return $text;
+        };
+        $collection->add('bad', $badhelper);
+        $collection->add('good', $goodhelper);
+        $collection->add('test', $testhelper);
+
+        $this->assertEquals('success output', $collection->get('test')('success output', $lambdahelper));
+        $this->assertTrue($goodcalled);
+        $this->assertFalse($badcalled);
+    }
+}
diff --git a/lib/tests/outputrequirementslib_test.php b/lib/tests/outputrequirementslib_test.php
index 58680786d24c1..d1ac689501195 100644
--- a/lib/tests/outputrequirementslib_test.php
+++ b/lib/tests/outputrequirementslib_test.php
@@ -125,8 +125,13 @@ public function test_js_call_amd() {
 
         $html = $page->requires->get_end_code();
 
-        $this->assertContains('require(["theme_foobar/lightbox"]);', $html);
-        $this->assertContains('require(["theme_foobar/demo_one"], function(amd) { amd.init(); });', $html);
-        $this->assertContains('require(["theme_foobar/demo_two"], function(amd) { amd.init("foo", "baz", [42,"xyz"]); });', $html);
+        $modname = 'theme_foobar/lightbox';
+        $this->assertContains("M.util.js_pending('{$modname}'); require(['{$modname}'], function(amd) {M.util.js_complete('{$modname}');});", $html);
+
+        $modname = 'theme_foobar/demo_one';
+        $this->assertContains("M.util.js_pending('{$modname}'); require(['{$modname}'], function(amd) {amd.init(); M.util.js_complete('{$modname}');});", $html);
+
+        $modname = 'theme_foobar/demo_two';
+        $this->assertContains("M.util.js_pending('{$modname}'); require(['{$modname}'], function(amd) {amd.init(\"foo\", \"baz\", [42,\"xyz\"]); M.util.js_complete('{$modname}');});", $html);
     }
 }
diff --git a/lib/tests/questionlib_test.php b/lib/tests/questionlib_test.php
index ae1cd80c23cd1..6f295e889a933 100644
--- a/lib/tests/questionlib_test.php
+++ b/lib/tests/questionlib_test.php
@@ -481,6 +481,37 @@ public function test_question_save_from_deletion() {
         $this->assertEquals(1, $DB->count_records('question_categories', ['contextid' => $qcat->contextid, 'parent' => 0]));
     }
 
+    /**
+     * This function tests the question_save_from_deletion function when it is supposed to make a new category and
+     * move question categories to that new category when quiz name is very long but less than 256 characters.
+     */
+    public function test_question_save_from_deletion_quiz_with_long_name() {
+        global $DB;
+        $this->resetAfterTest(true);
+        $this->setAdminUser();
+
+        list($category, $course, $quiz, $qcat, $questions) = $this->setup_quiz_and_questions();
+
+        // Moodle doesn't allow you to enter a name longer than 255 characters.
+        $quiz->name = shorten_text(str_repeat('123456789 ', 26), 255);
+
+        $DB->update_record('quiz', $quiz);
+
+        $context = context::instance_by_id($qcat->contextid);
+
+        $newcat = question_save_from_deletion(array_column($questions, 'id'),
+                $context->get_parent_context()->id, $context->get_context_name());
+
+        // Verifying that the inserted record's name is expected or not.
+        $this->assertEquals($DB->get_record('question_categories', ['id' => $newcat->id])->name, $newcat->name);
+
+        // Verify that the newcat itself is not a top level category.
+        $this->assertNotEquals(0, $newcat->parent);
+
+        // Verify there is just a single top-level category.
+        $this->assertEquals(1, $DB->count_records('question_categories', ['contextid' => $qcat->contextid, 'parent' => 0]));
+    }
+
     public function test_question_remove_stale_questions_from_category() {
         global $DB;
         $this->resetAfterTest(true);
diff --git a/lib/tests/session_redis_test.php b/lib/tests/session_redis_test.php
index 8b32e759fed16..ff9ddd3383cec 100644
--- a/lib/tests/session_redis_test.php
+++ b/lib/tests/session_redis_test.php
@@ -38,6 +38,7 @@
  * @author    Russell Smith <mr-russ@smith2001.net>
  * @copyright 2016 Russell Smith
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @runClassInSeparateProcess
  */
 class core_session_redis_testcase extends advanced_testcase {
 
@@ -269,6 +270,24 @@ public function test_kill_sessions_removes_the_session_from_redis() {
         $this->assertEmpty($this->redis->keys($this->keyprefix.'*'), 'There should be no session data left.');
     }
 
+    public function test_exception_when_connection_attempts_exceeded() {
+        global $CFG;
+
+        $CFG->session_redis_port = 111111;
+        $actual = '';
+
+        $sess = new \core\session\redis();
+        try {
+            $sess->init();
+        } catch (RedisException $e) {
+            $actual = $e->getMessage();
+        }
+
+        $expected = 'Failed to connect (try 5 out of 5) to redis at ' . TEST_SESSION_REDIS_HOST . ':111111';
+        $this->assertDebuggingCalledCount(5);
+        $this->assertContains($expected, $actual);
+    }
+
     /**
      * Assert that we don't have any session locks in Redis.
      */
diff --git a/lib/tests/setuplib_test.php b/lib/tests/setuplib_test.php
index e38124e6ad7bd..e51a7335f0378 100644
--- a/lib/tests/setuplib_test.php
+++ b/lib/tests/setuplib_test.php
@@ -476,4 +476,30 @@ public function data_for_test_get_real_size() {
     public function test_get_real_size($input, $expectedbytes) {
         $this->assertEquals($expectedbytes, get_real_size($input));
     }
+
+    /**
+     * Validate the given V4 UUID.
+     *
+     * @param string $value The candidate V4 UUID
+     * @return bool True if valid; otherwise, false.
+     */
+    protected static function is_valid_uuid_v4($value) {
+        // Version 4 UUIDs have the form xxxxxxxx-xxxx-4xxx-Yxxx-xxxxxxxxxxxx
+        // where x is any hexadecimal digit and Y is one of 8, 9, aA, or bB.
+        // First, the size is 36 (32 + 4 dashes).
+        if (strlen($value) != 36) {
+            return false;
+        }
+        // Finally, check the format.
+        $uuidv4pattern = '/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i';
+        return (preg_match($uuidv4pattern, $value) === 1);
+    }
+
+    /**
+     * Test the generate_uuid() function.
+     */
+    public function test_generate_uuid() {
+        $uuid = generate_uuid();
+        $this->assertTrue(self::is_valid_uuid_v4($uuid), "Invalid v4 UUID: '$uuid'");
+    }
 }
diff --git a/lib/tests/tablelib_test.php b/lib/tests/tablelib_test.php
index 9346e05c774f7..c3864b513f39a 100644
--- a/lib/tests/tablelib_test.php
+++ b/lib/tests/tablelib_test.php
@@ -37,7 +37,7 @@
  * @copyright  2013 Damyon Wiese <damyon@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_tablelib_testcase extends basic_testcase {
+class core_tablelib_testcase extends advanced_testcase {
     protected function generate_columns($cols) {
         $columns = array();
         foreach (range(0, $cols - 1) as $j) {
@@ -352,6 +352,67 @@ public function test_50_cols() {
         );
     }
 
+    /**
+     * Data provider for test_fullname_column
+     *
+     * @return array
+     */
+    public function fullname_column_provider() {
+        return [
+            ['language'],
+            ['alternatename lastname'],
+            ['firstname lastnamephonetic'],
+        ];
+    }
+
+    /**
+     * Test fullname column observes configured alternate fullname format configuration
+     *
+     * @param string $format
+     * @return void
+     *
+     * @dataProvider fullname_column_provider
+     */
+    public function test_fullname_column(string $format) {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        set_config('alternativefullnameformat', $format);
+
+        $user = $this->getDataGenerator()->create_user();
+
+        $table = $this->create_and_setup_table(['fullname'], [], true, false, [], []);
+        $this->assertContains(fullname($user, true), $table->format_row($user)['fullname']);
+    }
+
+    /**
+     * Test fullname column ignores fullname format configuration for a user with viewfullnames capability prohibited
+     *
+     * @param string $format
+     * @return void
+     *
+     * @dataProvider fullname_column_provider
+     */
+    public function test_fullname_column_prohibit_viewfullnames(string $format) {
+        global $DB, $CFG;
+
+        $this->resetAfterTest();
+
+        set_config('alternativefullnameformat', $format);
+
+        $currentuser = $this->getDataGenerator()->create_user();
+        $this->setUser($currentuser);
+
+        // Prohibit the viewfullnames from the default user role.
+        $userrole = $DB->get_record('role', ['id' => $CFG->defaultuserroleid]);
+        role_change_permission($userrole->id, context_system::instance(), 'moodle/site:viewfullnames', CAP_PROHIBIT);
+
+        $user = $this->getDataGenerator()->create_user();
+
+        $table = $this->create_and_setup_table(['fullname'], [], true, false, [], []);
+        $this->assertContains(fullname($user, false), $table->format_row($user)['fullname']);
+    }
+
     public function test_get_row_html() {
         $data = $this->generate_data(1, 5);
         $columns = $this->generate_columns(5);
@@ -526,7 +587,6 @@ protected function prepare_table_for_reset_test($tableid) {
     }
 
     public function test_can_be_reset() {
-
         // Table in its default state (as if seen for the first time), nothing to reset.
         $table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
         $table->setup();
@@ -538,21 +598,25 @@ public function test_can_be_reset() {
         $table->setup();
         $this->assertFalse($table->can_be_reset());
 
-        // Table explicitly sorted by the default column (reverses the order), can be reset.
+        // Table explicitly sorted by the default column & direction, nothing to reset.
         $table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
         $table->sortable(true, 'column1', SORT_DESC);
         $_GET['tsort'] = 'column1';
+        $_GET['tdir'] = SORT_DESC;
         $table->setup();
         unset($_GET['tsort']);
-        $this->assertTrue($table->can_be_reset());
+        unset($_GET['tdir']);
+        $this->assertFalse($table->can_be_reset());
 
-        // Table explicitly sorted twice by the default column (puts back to default order), nothing to reset.
+        // Table explicitly sorted twice by the default column & direction, nothing to reset.
         $table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
         $table->sortable(true, 'column1', SORT_DESC);
         $_GET['tsort'] = 'column1';
+        $_GET['tdir'] = SORT_DESC;
         $table->setup();
         $table->setup(); // Set up again to simulate the second page request.
         unset($_GET['tsort']);
+        unset($_GET['tdir']);
         $this->assertFalse($table->can_be_reset());
 
         // Table sorted by other than default column, can be reset.
@@ -563,6 +627,16 @@ public function test_can_be_reset() {
         unset($_GET['tsort']);
         $this->assertTrue($table->can_be_reset());
 
+        // Table sorted by other than default direction, can be reset.
+        $table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
+        $table->sortable(true, 'column1', SORT_DESC);
+        $_GET['tsort'] = 'column1';
+        $_GET['tdir'] = SORT_ASC;
+        $table->setup();
+        unset($_GET['tsort']);
+        unset($_GET['tdir']);
+        $this->assertTrue($table->can_be_reset());
+
         // Table sorted by the default column after another sorting previously selected.
         // This leads to different ORDER BY than just having a single sort defined, can be reset.
         $table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
diff --git a/lib/tests/targets_test.php b/lib/tests/targets_test.php
index 616ecc99db917..495076a82de51 100644
--- a/lib/tests/targets_test.php
+++ b/lib/tests/targets_test.php
@@ -132,6 +132,27 @@ public function analysable_provider() {
                 ],
                 'isvalid' => get_string('completionnotenabledforcourse', 'completion')
             ],
+            'coursehiddentraining' => [
+                'params' => [
+                    'enablecompletion' => 1,
+                    'startdate' => mktime(0, 0, 0, $month - 1, 24, $year - 1),
+                    'enddate' => mktime(0, 0, 0, $month - 1, 23, $year),
+                    'students' => true,
+                    'visible' => '0',
+                ],
+                'isvalid' => true,
+            ],
+            'coursehiddenprediction' => [
+                'params' => [
+                    'enablecompletion' => 1,
+                    'startdate' => mktime(0, 0, 0, $month - 1, 24, $year),
+                    'enddate' => mktime(0, 0, 0, $month - 1, 23, $year + 1),
+                    'students' => true,
+                    'visible' => '0',
+                ],
+                'isvalid' => get_string('hiddenfromstudents'),
+                'fortraining' => false
+            ],
         ];
     }
 
@@ -148,21 +169,40 @@ public function sample_provider() {
                 'courseend' => $now + (WEEKSECS * 8),
                 'timestart' => $now,
                 'timeend' => $now - DAYSECS,
-                'isvalid' => false
+                'isvalidfortraining' => false,
+                'isvalidforprediction' => false
             ],
             'enrolmenttoolong' => [
                 'coursestart' => $now,
                 'courseend' => $now + (WEEKSECS * 8),
                 'timestart' => $now - (YEARSECS + (WEEKSECS * 8)),
                 'timeend' => $now + (WEEKSECS * 8),
-                'isvalid' => false
+                'isvalidfortraining' => false,
+                'isvalidforprediction' => false
             ],
             'enrolmentstartaftercourse' => [
                 'coursestart' => $now,
                 'courseend' => $now + (WEEKSECS * 8),
                 'timestart' => $now + (WEEKSECS * 9),
                 'timeend' => $now + (WEEKSECS * 10),
-                'isvalid' => false
+                'isvalidfortraining' => false,
+                'isvalidforprediction' => false
+            ],
+            'enrolmentstartsafternow' => [
+                'coursestart' => $now,
+                'courseend' => $now + (WEEKSECS * 8),
+                'timestart' => $now + (WEEKSECS * 2),
+                'timeend' => $now + (WEEKSECS * 7),
+                'isvalidfortraining' => false,
+                'isvalidforprediction' => false
+            ],
+            'enrolmentfinishedbeforenow' => [
+                'coursestart' => $now - (WEEKSECS * 4),
+                'courseend' => $now - (WEEKSECS * 1),
+                'timestart' => $now - (WEEKSECS * 3),
+                'timeend' => $now - (WEEKSECS * 2),
+                'isvalidfortraining' => true,
+                'isvalidforprediction' => false
             ],
         ];
     }
@@ -228,9 +268,11 @@ public function test_core_target_course_completion_analysable($courseparams, $is
      * @param int $courseend Course end date
      * @param int $timestart Enrol start date
      * @param int $timeend Enrol end date
-     * @param boolean $isvalid True when sample is valid, false when it is not
+     * @param boolean $isvalidfortraining True when sample is valid for training, false when it is not
+     * @param boolean $isvalidforprediction True when sample is valid for prediction, false when it is not
      */
-    public function test_core_target_course_completion_samples($coursestart, $courseend, $timestart, $timeend, $isvalid) {
+    public function test_core_target_course_completion_samples($coursestart, $courseend, $timestart, $timeend,
+            $isvalidfortraining, $isvalidforprediction) {
 
         $this->resetAfterTest(true);
 
@@ -254,7 +296,8 @@ public function test_core_target_course_completion_samples($coursestart, $course
         $target->add_sample_data($samplesdata);
         $sampleid = reset($sampleids);
 
-        $this->assertEquals($isvalid, $target->is_valid_sample($sampleid, $analysable));
+        $this->assertEquals($isvalidfortraining, $target->is_valid_sample($sampleid, $analysable, true));
+        $this->assertEquals($isvalidforprediction, $target->is_valid_sample($sampleid, $analysable, false));
     }
 
     /**
diff --git a/lib/tests/time_splittings_test.php b/lib/tests/time_splittings_test.php
index 6394a3ed51c17..613d8c25f4ec4 100644
--- a/lib/tests/time_splittings_test.php
+++ b/lib/tests/time_splittings_test.php
@@ -286,7 +286,7 @@ public function test_periodic() {
         $mostrecentrange = reset($mostrecentrange);
 
         // We wait for the next range to be added.
-        usleep(1000000);
+        sleep(1);
 
         // We set the analysable again so the time ranges are recalculated.
         $seconds->set_analysable($analysable);
@@ -309,7 +309,7 @@ public function test_periodic() {
         $mostrecentrange = reset($mostrecentrange);
 
         // We wait for the next range to be added.
-        usleep(1000000);
+        sleep(1);
 
         $seconds->set_analysable($analysable);
         $nnewranges = $seconds->get_all_ranges();
diff --git a/lib/tests/upgradelib_test.php b/lib/tests/upgradelib_test.php
index 61c29af3b0e5a..61b3c1ffb0284 100644
--- a/lib/tests/upgradelib_test.php
+++ b/lib/tests/upgradelib_test.php
@@ -1005,4 +1005,52 @@ public function test_upgrade_delete_orphaned_file_records() {
         $file = reset($files);
         $this->assertEquals($file, $newstoredfile[1]);
     }
+
+    /**
+     * Test the functionality of the {@link upgrade_convert_hub_config_site_param_names()} function.
+     */
+    public function test_upgrade_convert_hub_config_site_param_names() {
+
+        $config = (object) [
+            // This is how site settings related to registration at https://moodle.net are stored.
+            'site_name_httpsmoodlenet' => 'Foo Site',
+            'site_language_httpsmoodlenet' => 'en',
+            'site_emailalert_httpsmoodlenet' => 1,
+            // These are unexpected relics of a value as registered at the old http://hub.moodle.org site.
+            'site_name_httphubmoodleorg' => 'Bar Site',
+            'site_description_httphubmoodleorg' => 'Old description',
+            // This is the target value we are converting to - here it already somehow exists.
+            'site_emailalert' => 0,
+            // This is a setting not related to particular hub.
+            'custom' => 'Do not touch this',
+            // A setting defined for multiple alternative hubs.
+            'site_foo_httpfirsthuborg' => 'First',
+            'site_foo_httpanotherhubcom' => 'Another',
+            'site_foo_httpyetanotherhubcom' => 'Yet another',
+            // A setting defined for multiple alternative hubs and one referential one.
+            'site_bar_httpfirsthuborg' => 'First',
+            'site_bar_httpanotherhubcom' => 'Another',
+            'site_bar_httpsmoodlenet' => 'One hub to rule them all!',
+            'site_bar_httpyetanotherhubcom' => 'Yet another',
+        ];
+
+        $converted = upgrade_convert_hub_config_site_param_names($config, 'https://moodle.net');
+
+        // Values defined for the moodle.net take precedence over the ones defined for other hubs.
+        $this->assertSame($converted->site_name, 'Foo Site');
+        $this->assertSame($converted->site_bar, 'One hub to rule them all!');
+        $this->assertNull($converted->site_name_httpsmoodlenet);
+        $this->assertNull($converted->site_bar_httpfirsthuborg);
+        $this->assertNull($converted->site_bar_httpanotherhubcom);
+        $this->assertNull($converted->site_bar_httpyetanotherhubcom);
+        // Values defined for alternative hubs only do not have any guaranteed value. Just for convenience, we use the first one.
+        $this->assertSame($converted->site_foo, 'First');
+        $this->assertNull($converted->site_foo_httpfirsthuborg);
+        $this->assertNull($converted->site_foo_httpanotherhubcom);
+        $this->assertNull($converted->site_foo_httpyetanotherhubcom);
+        // Values that are already defined with the new name format are kept.
+        $this->assertSame($converted->site_emailalert, 0);
+        // Eventual custom values not following the expected hub-specific naming format, are kept.
+        $this->assertSame($converted->custom, 'Do not touch this');
+    }
 }
diff --git a/lib/tests/weblib_test.php b/lib/tests/weblib_test.php
index 8e63d32cd20f4..6a2ef104d652c 100644
--- a/lib/tests/weblib_test.php
+++ b/lib/tests/weblib_test.php
@@ -525,6 +525,18 @@ public function data_validate_email() {
                 'email' => "moodle@example.com>\r\nRCPT TO:<victim@example.com",
                 'result' => false
             ],
+            [
+                'email' => 'greater>than@example.com',
+                'result' => false
+            ],
+            [
+                'email' => 'less<than@example.com',
+                'result' => false
+            ],
+            [
+                'email' => '"this<is>validbutwerejectit"@example.com',
+                'result' => false
+            ],
 
             // Extra email addresses from Wikipedia page on Email Addresses.
             // Valid.
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index 85d046baea289..e2e1d1e72a68f 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -130,7 +130,7 @@
     <location>tcpdf</location>
     <name>TCPDF</name>
     <license>LGPL</license>
-    <version>6.2.13</version>
+    <version>6.2.26</version>
     <licenseversion>3</licenseversion>
   </library>
   <library>
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 30dbd057adb99..20f3aeba9cae3 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,11 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 3.7.4 ===
+* behat_data_generators::the_following_exist() has been removed, please use
+  behat_data_generators::the_following_entities_exist() instead. See MDL-67691 for more info.
+* format_float() now accepts a special value (-1) as the $decimalpoints parameter which means auto-detecting number of decimal points.
+
 === 3.7 ===
 * Nodes in the navigation api can have labels for each group. See set/get_collectionlabel().
 * The method core_user::is_real_user() now returns false for userid = 0 parameter
@@ -23,6 +28,7 @@ attribute on forms to avoid collisions in forms loaded in AJAX requests.
   and get_reduced_timeout(). These allow for timeouts to be increased by a setting in config.php.
 * The $draftitemid parameter of file_save_draft_area_files() function now supports the constant IGNORE_FILE_MERGE:
   When the parameter is set to that constant, the function won't process file merging, keeping the original state of the file area.
+  Notice also than when $text is set, pluginfile rewrite won't be processed so the text will not be modified.
 * Introduced new callback for plugin developers '<component>_pre_processor_message_send($procname, $proceventdata)':
   This will allow any plugin to manipulate messages or notifications before they are sent by a processor (email, mobile...)
 * New capability 'moodle/category:viewcourselist' in category context that controls whether user is able to browse list of courses
diff --git a/lib/weblib.php b/lib/weblib.php
index 73fbcf94a2ac8..20f2910d203f7 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1110,7 +1110,7 @@ function validate_email($address) {
     global $CFG;
     require_once($CFG->libdir.'/phpmailer/moodle_phpmailer.php');
 
-    return moodle_phpmailer::validateAddress($address);
+    return moodle_phpmailer::validateAddress($address) && !preg_match('/[<>]/', $address);
 }
 
 /**
@@ -1856,7 +1856,7 @@ function purify_html($text, $options = array()) {
         }
 
         if ($def = $config->maybeGetRawHTMLDefinition()) {
-            $def->addElement('nolink', 'Block', 'Flow', array());                       // Skip our filters inside.
+            $def->addElement('nolink', 'Inline', 'Flow', array());                      // Skip our filters inside.
             $def->addElement('tex', 'Inline', 'Inline', array());                       // Tex syntax, equivalent to $$xx$$.
             $def->addElement('algebra', 'Inline', 'Inline', array());                   // Algebra syntax, equivalent to @@xx@@.
             $def->addElement('lang', 'Block', 'Flow', array(), array('lang'=>'CDATA')); // Original multilang style - only our hacked lang attribute.
diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js
index 8c6459396a65d..4ccb899a838b4 100644
--- a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js
+++ b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js
@@ -246,10 +246,10 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             }
         }
 
-        // Take off 15px top and bottom for borders, plus 40px each for the title and button area before setting the
-        // new max-height
+        // Take off 15px top and bottom for borders, plus 69px for the title and 57px for the
+        // button area before setting the new max-height.
         totalheight = newheight;
-        newheight = newheight - (15 + 15 + 40 + 40);
+        newheight = newheight - (69 + 57 + 15 + 15);
         dialogue.setStyle('maxHeight', newheight + 'px');
 
         var dialogueheight = bb.getStyle('height');
@@ -262,6 +262,8 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
         if (dialogueheight < this.get('baseheight')) {
             dialogueheight = this.get('baseheight');
             dialogue.setStyle('height', dialogueheight + 'px');
+        } else {
+            dialogue.setStyle('height', 'auto');
         }
 
         this.panel.centerDialogue();
diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js
index b07b22353c09c..9acc9d6d129ac 100644
--- a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js
+++ b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js
@@ -1 +1 @@
-YUI.add("moodle-core-chooserdialogue",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{panel:null,submitbutton:null,container:null,listenevents:[],bodycontent:null,headercontent:null,instanceconfig:null,hiddenRadioValue:null,setup_chooser_dialogue:function(e,t,n){this.bodycontent=e,this.headercontent=t,this.instanceconfig=n},prepare_chooser:function(){if(this.panel)return;e.one(e.config.doc.body).addClass("jschooser");var t,n={bodyContent:this.bodycontent.get("innerHTML"),headerContent:this.headercontent.get("innerHTML"),width:"540px",draggable:!0,visible:!1,zindex:100,modal:!0,shim:!0,closeButtonTitle:this.get("closeButtonTitle"),focusOnPreviousTargetAfterHide:!0,render:!1,extraClasses:this._getClassNames()};for(t in this.instanceconfig)n[t]=this.instanceconfig[t];this.panel=new M.core.dialogue(n),this.bodycontent.remove(),this.headercontent.remove(),this.panel.hide(),this.panel.render(),this.container=this.panel.get("boundingBox").one(".choosercontainer"),this.options=this.container.all(".option input[type=radio]"),this.hiddenRadioValue=e.Node.create('<input type="hidden" value="" />'),this.container.one("form").appendChild(this.hiddenRadioValue),this.panel.get("boundingBox").addClass("chooserdialogue")},display_chooser:function(t){var n,r,i;this.prepare_chooser(),t.preventDefault(),n=this.panel.get("boundingBox"),r=this.container.one(".alloptions"),i=e.one("document").on("orientationchange",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=e.one("window").on("resize",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=this.container.on("click",this.check_options,this),this.listenevents.push(i),i=this.container.on("key_up",this.check_options,this),this.listenevents.push(i),i=this.container.on("dblclick",function(e){e.target.ancestor("div.option")&&(this.check_options(),this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents(),this.container.one("form").submit())},this),this.listenevents.push(i),this.container.one("form").on("submit",function(){this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents()},this),i=this.container.one(".addcancel").on("click",this.cancel_popup,this),this.listenevents.push(i),i=n.one("button.closebutton").on("click",this.cancel_popup,this),this.listenevents.push(i),i=e.one("document").on("keydown",this.handle_key_press,this),this.listenevents.push(i),this.submitbutton=this.container.one(".submitbutton"),this.submitbutton.set("disabled","true"),this.options.removeAttribute("disabled"),this.panel.show(t),this.center_dialogue(r),this.container.one(".option input[type=radio]").focus(),this.check_options()},cancel_listenevents:function(){var e;while(this.listenevents.length)e=this.listenevents.shift(),e.detach()},center_dialogue:function(e){var t=this.panel.get("boundingBox"),n=t.get("winHeight"),r,i;if(this.panel.shouldResizeFullscreen())return;r=this.get("maxheight"),n<=r&&(n<=this.get("minheight")?r=this.get("minheight"):r=n),r>this.get("minheight")?this.panel.lockScroll&&!this.panel.lockScroll.isActive()&&this.panel.lockScroll.enableScrollLock(!0):this.panel.lockScroll&&this.panel.lockScroll.isActive()&&this.panel.lockScroll.disableScrollLock(),i=r,r-=110,e.setStyle("maxHeight",r+"px");var s=t.getStyle("height");s.match(/.*px$/)?s=s.replace(/px$/,""):s=i,s<this.get("baseheight")&&(s=this.get("baseheight"),e.setStyle("height",s+"px")),this.panel.centerDialogue()},handle_key_press:function(e){e.keyCode===27&&this.cancel_popup(e)},cancel_popup:function(e){e.preventDefault(),this.hide()},hide:function(){this.cancel_listenevents(),this.container.detachAll(),this.panel.hide()},check_options:function(){this.options.each(function(e){var t=e.get("parentNode").get("parentNode");e.get("checked")?(t.addClass("selected"),this.option_selected(e),this.submitbutton.removeAttribute("disabled"),e.focus()):t.removeClass("selected")},this)},option_selected:function(e){this.hiddenRadioValue.setAttrs({value:e.get("value"),name:e.get("name")})},_getClassNames:function(e){var t="chooserdialogue-"+this.name,n=[];n.push(t.toLowerCase());if(e){var r;for(r in e)n.push((t+"-"+r).toLowerCase())}return n}},{NAME:"moodle-core-chooserdialogue",ATTRS:{minheight:{value:300},baseheight:{value:400},maxheight:{value:660},closeButtonTitle:{validator:e.Lang.isString,value:"Close"}}}),M.core=M.core||{},M.core.chooserdialogue=n},"@VERSION@",{requires:["base","panel","moodle-core-notification"]});
+YUI.add("moodle-core-chooserdialogue",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{panel:null,submitbutton:null,container:null,listenevents:[],bodycontent:null,headercontent:null,instanceconfig:null,hiddenRadioValue:null,setup_chooser_dialogue:function(e,t,n){this.bodycontent=e,this.headercontent=t,this.instanceconfig=n},prepare_chooser:function(){if(this.panel)return;e.one(e.config.doc.body).addClass("jschooser");var t,n={bodyContent:this.bodycontent.get("innerHTML"),headerContent:this.headercontent.get("innerHTML"),width:"540px",draggable:!0,visible:!1,zindex:100,modal:!0,shim:!0,closeButtonTitle:this.get("closeButtonTitle"),focusOnPreviousTargetAfterHide:!0,render:!1,extraClasses:this._getClassNames()};for(t in this.instanceconfig)n[t]=this.instanceconfig[t];this.panel=new M.core.dialogue(n),this.bodycontent.remove(),this.headercontent.remove(),this.panel.hide(),this.panel.render(),this.container=this.panel.get("boundingBox").one(".choosercontainer"),this.options=this.container.all(".option input[type=radio]"),this.hiddenRadioValue=e.Node.create('<input type="hidden" value="" />'),this.container.one("form").appendChild(this.hiddenRadioValue),this.panel.get("boundingBox").addClass("chooserdialogue")},display_chooser:function(t){var n,r,i;this.prepare_chooser(),t.preventDefault(),n=this.panel.get("boundingBox"),r=this.container.one(".alloptions"),i=e.one("document").on("orientationchange",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=e.one("window").on("resize",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=this.container.on("click",this.check_options,this),this.listenevents.push(i),i=this.container.on("key_up",this.check_options,this),this.listenevents.push(i),i=this.container.on("dblclick",function(e){e.target.ancestor("div.option")&&(this.check_options(),this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents(),this.container.one("form").submit())},this),this.listenevents.push(i),this.container.one("form").on("submit",function(){this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents()},this),i=this.container.one(".addcancel").on("click",this.cancel_popup,this),this.listenevents.push(i),i=n.one("button.closebutton").on("click",this.cancel_popup,this),this.listenevents.push(i),i=e.one("document").on("keydown",this.handle_key_press,this),this.listenevents.push(i),this.submitbutton=this.container.one(".submitbutton"),this.submitbutton.set("disabled","true"),this.options.removeAttribute("disabled"),this.panel.show(t),this.center_dialogue(r),this.container.one(".option input[type=radio]").focus(),this.check_options()},cancel_listenevents:function(){var e;while(this.listenevents.length)e=this.listenevents.shift(),e.detach()},center_dialogue:function(e){var t=this.panel.get("boundingBox"),n=t.get("winHeight"),r,i;if(this.panel.shouldResizeFullscreen())return;r=this.get("maxheight"),n<=r&&(n<=this.get("minheight")?r=this.get("minheight"):r=n),r>this.get("minheight")?this.panel.lockScroll&&!this.panel.lockScroll.isActive()&&this.panel.lockScroll.enableScrollLock(!0):this.panel.lockScroll&&this.panel.lockScroll.isActive()&&this.panel.lockScroll.disableScrollLock(),i=r,r-=156,e.setStyle("maxHeight",r+"px");var s=t.getStyle("height");s.match(/.*px$/)?s=s.replace(/px$/,""):s=i,s<this.get("baseheight")?(s=this.get("baseheight"),e.setStyle("height",s+"px")):e.setStyle("height","auto"),this.panel.centerDialogue()},handle_key_press:function(e){e.keyCode===27&&this.cancel_popup(e)},cancel_popup:function(e){e.preventDefault(),this.hide()},hide:function(){this.cancel_listenevents(),this.container.detachAll(),this.panel.hide()},check_options:function(){this.options.each(function(e){var t=e.get("parentNode").get("parentNode");e.get("checked")?(t.addClass("selected"),this.option_selected(e),this.submitbutton.removeAttribute("disabled"),e.focus()):t.removeClass("selected")},this)},option_selected:function(e){this.hiddenRadioValue.setAttrs({value:e.get("value"),name:e.get("name")})},_getClassNames:function(e){var t="chooserdialogue-"+this.name,n=[];n.push(t.toLowerCase());if(e){var r;for(r in e)n.push((t+"-"+r).toLowerCase())}return n}},{NAME:"moodle-core-chooserdialogue",ATTRS:{minheight:{value:300},baseheight:{value:400},maxheight:{value:660},closeButtonTitle:{validator:e.Lang.isString,value:"Close"}}}),M.core=M.core||{},M.core.chooserdialogue=n},"@VERSION@",{requires:["base","panel","moodle-core-notification"]});
diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js
index 8c6459396a65d..4ccb899a838b4 100644
--- a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js
+++ b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js
@@ -246,10 +246,10 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             }
         }
 
-        // Take off 15px top and bottom for borders, plus 40px each for the title and button area before setting the
-        // new max-height
+        // Take off 15px top and bottom for borders, plus 69px for the title and 57px for the
+        // button area before setting the new max-height.
         totalheight = newheight;
-        newheight = newheight - (15 + 15 + 40 + 40);
+        newheight = newheight - (69 + 57 + 15 + 15);
         dialogue.setStyle('maxHeight', newheight + 'px');
 
         var dialogueheight = bb.getStyle('height');
@@ -262,6 +262,8 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
         if (dialogueheight < this.get('baseheight')) {
             dialogueheight = this.get('baseheight');
             dialogue.setStyle('height', dialogueheight + 'px');
+        } else {
+            dialogue.setStyle('height', 'auto');
         }
 
         this.panel.centerDialogue();
diff --git a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js
index b584c620f4778..cd394077e0a21 100644
--- a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js
+++ b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js
@@ -38,6 +38,10 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
                 return;
             }
 
+            if (!M.core_formchangechecker.stateinformation.formchanged) {
+                M.core_formchangechecker.stateinformation.formchanged = this.get('initialdirtystate');
+            }
+
             // Add a listener here for an editor restore event.
             Y.on(M.core.event.EDITOR_CONTENT_RESTORED, M.core_formchangechecker.reset_form_dirty_state, this);
 
@@ -98,6 +102,9 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
         ATTRS: {
             formid: {
                 'value': ''
+            },
+            initialdirtystate: {
+                'value': false
             }
         }
     }
diff --git a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-min.js b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-min.js
index 81f74b4dc0f44..9eb3b20d52177 100644
--- a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-min.js
+++ b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-min.js
@@ -1 +1 @@
-YUI.add("moodle-core-formchangechecker",function(e,t){var n="core-formchangechecker",r=function(){r.superclass.constructor.apply(this,arguments)};e.extend(r,e.Base,{initialvaluelisteners:[],initializer:function(){var t="form#"+this.get("formid"),n=e.one(t);if(!n)return;e.on(M.core.event.EDITOR_CONTENT_RESTORED,M.core_formchangechecker.reset_form_dirty_state,this),n.delegate("change",M.core_formchangechecker.set_form_changed,"input",this),n.delegate("change",M.core_formchangechecker.set_form_changed,"textarea",this),n.delegate("change",M.core_formchangechecker.set_form_changed,"select",this),this.initialvaluelisteners.push(n.delegate("focus",this.store_initial_value,"input",this)),this.initialvaluelisteners.push(n.delegate("focus",this.store_initial_value,"textarea",this)),this.initialvaluelisteners.push(n.delegate("focus",this.store_initial_value,"select",this)),e.one(t).on("submit",M.core_formchangechecker.set_form_submitted,this),window.onbeforeunload=M.core_formchangechecker.report_form_dirty_state},store_initial_value:function(e){var t;if(e.target.hasClass("ignoredirty")||e.target.ancestor(".ignoredirty"))return;if(M.core_formchangechecker.get_form_dirty_state()){while(this.initialvaluelisteners.length)t=this.initialvaluelisteners.shift(),t.detach();return}M.core_formchangechecker.stateinformation.focused_element={element:e.target,initial_value:e.target.get("value")}}},{NAME:n,ATTRS:{formid:{value:""}}}),M.core_formchangechecker=M.core_formchangechecker||{},M.core_formchangechecker.instances=M.core_formchangechecker.instances||[],M.core_formchangechecker.init=function(e){var t=new r(e);return M.core_formchangechecker.instances.push(t),t},M.core_formchangechecker.stateinformation=[],M.core_formchangechecker.set_form_changed=function(e){if(e&&e.target&&(e.target.hasClass("ignoredirty")||e.target.ancestor(".ignoredirty")))return;M.core_formchangechecker.stateinformation.formchanged=1,delete M.core_formchangechecker.stateinformation.focused_element},M.core_formchangechecker.set_form_submitted=function(){M.core_formchangechecker.stateinformation.formsubmitted=1},M.core_formchangechecker.get_form_dirty_state=function(){var e=M.core_formchangechecker.stateinformation,t;if(e.formsubmitted)return 0;if(e.formchanged)return 1;if(e.focused_element&&e.focused_element.element.get("value")!==e.focused_element.initial_value)return 1;if(typeof window.tinyMCE!="undefined")for(t in window.tinyMCE.editors)if(window.tinyMCE.editors[t].isDirty())return 1;return 0},M.core_formchangechecker.reset_form_dirty_state=function(){M.core_formchangechecker.stateinformation.formsubmitted=!1,M.core_formchangechecker.stateinformation.formchanged=!1},M.core_formchangechecker.report_form_dirty_state=function(e){if(!M.core_formchangechecker.get_form_dirty_state())return;var t=M.util.get_string("changesmadereallygoaway","moodle");if(M.cfg.behatsiterunning)return;return e&&(e.returnValue=t),t}},"@VERSION@",{requires:["base","event-focus","moodle-core-event"]});
+YUI.add("moodle-core-formchangechecker",function(e,t){var n="core-formchangechecker",r=function(){r.superclass.constructor.apply(this,arguments)};e.extend(r,e.Base,{initialvaluelisteners:[],initializer:function(){var t="form#"+this.get("formid"),n=e.one(t);if(!n)return;M.core_formchangechecker.stateinformation.formchanged||(M.core_formchangechecker.stateinformation.formchanged=this.get("initialdirtystate")),e.on(M.core.event.EDITOR_CONTENT_RESTORED,M.core_formchangechecker.reset_form_dirty_state,this),n.delegate("change",M.core_formchangechecker.set_form_changed,"input",this),n.delegate("change",M.core_formchangechecker.set_form_changed,"textarea",this),n.delegate("change",M.core_formchangechecker.set_form_changed,"select",this),this.initialvaluelisteners.push(n.delegate("focus",this.store_initial_value,"input",this)),this.initialvaluelisteners.push(n.delegate("focus",this.store_initial_value,"textarea",this)),this.initialvaluelisteners.push(n.delegate("focus",this.store_initial_value,"select",this)),e.one(t).on("submit",M.core_formchangechecker.set_form_submitted,this),window.onbeforeunload=M.core_formchangechecker.report_form_dirty_state},store_initial_value:function(e){var t;if(e.target.hasClass("ignoredirty")||e.target.ancestor(".ignoredirty"))return;if(M.core_formchangechecker.get_form_dirty_state()){while(this.initialvaluelisteners.length)t=this.initialvaluelisteners.shift(),t.detach();return}M.core_formchangechecker.stateinformation.focused_element={element:e.target,initial_value:e.target.get("value")}}},{NAME:n,ATTRS:{formid:{value:""},initialdirtystate:{value:!1}}}),M.core_formchangechecker=M.core_formchangechecker||{},M.core_formchangechecker.instances=M.core_formchangechecker.instances||[],M.core_formchangechecker.init=function(e){var t=new r(e);return M.core_formchangechecker.instances.push(t),t},M.core_formchangechecker.stateinformation=[],M.core_formchangechecker.set_form_changed=function(e){if(e&&e.target&&(e.target.hasClass("ignoredirty")||e.target.ancestor(".ignoredirty")))return;M.core_formchangechecker.stateinformation.formchanged=1,delete M.core_formchangechecker.stateinformation.focused_element},M.core_formchangechecker.set_form_submitted=function(){M.core_formchangechecker.stateinformation.formsubmitted=1},M.core_formchangechecker.get_form_dirty_state=function(){var e=M.core_formchangechecker.stateinformation,t;if(e.formsubmitted)return 0;if(e.formchanged)return 1;if(e.focused_element&&e.focused_element.element.get("value")!==e.focused_element.initial_value)return 1;if(typeof window.tinyMCE!="undefined")for(t in window.tinyMCE.editors)if(window.tinyMCE.editors[t].isDirty())return 1;return 0},M.core_formchangechecker.reset_form_dirty_state=function(){M.core_formchangechecker.stateinformation.formsubmitted=!1,M.core_formchangechecker.stateinformation.formchanged=!1},M.core_formchangechecker.report_form_dirty_state=function(e){if(!M.core_formchangechecker.get_form_dirty_state())return;var t=M.util.get_string("changesmadereallygoaway","moodle");if(M.cfg.behatsiterunning)return;return e&&(e.returnValue=t),t}},"@VERSION@",{requires:["base","event-focus","moodle-core-event"]});
diff --git a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js
index b584c620f4778..cd394077e0a21 100644
--- a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js
+++ b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js
@@ -38,6 +38,10 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
                 return;
             }
 
+            if (!M.core_formchangechecker.stateinformation.formchanged) {
+                M.core_formchangechecker.stateinformation.formchanged = this.get('initialdirtystate');
+            }
+
             // Add a listener here for an editor restore event.
             Y.on(M.core.event.EDITOR_CONTENT_RESTORED, M.core_formchangechecker.reset_form_dirty_state, this);
 
@@ -98,6 +102,9 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
         ATTRS: {
             formid: {
                 'value': ''
+            },
+            initialdirtystate: {
+                'value': false
             }
         }
     }
diff --git a/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception-debug.js b/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception-debug.js
index be34b85566989..c0b79a6b1fa84 100644
--- a/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception-debug.js
+++ b/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception-debug.js
@@ -62,7 +62,8 @@ Y.extend(AJAXEXCEPTION, M.core.notification.info, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER,
-                '<h1 id="moodle-dialogue-' + this.get('COUNT') + '-header-text">' + Y.Escape.html(config.name) + '</h1>',
+                '<h1 id="moodle-dialogue-' + this.get('COUNT') + '-header-text">'
+                    + Y.Escape.html(config.name) + '</h1>',
                 Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-ajaxexception" data-rel="fatalerror"></div>')
                 .append(Y.Node.create('<div class="moodle-exception-message">' + Y.Escape.html(this.get('error')) + '</div>'))
diff --git a/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception.js b/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception.js
index be34b85566989..c0b79a6b1fa84 100644
--- a/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception.js
+++ b/lib/yui/build/moodle-core-notification-ajaxexception/moodle-core-notification-ajaxexception.js
@@ -62,7 +62,8 @@ Y.extend(AJAXEXCEPTION, M.core.notification.info, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER,
-                '<h1 id="moodle-dialogue-' + this.get('COUNT') + '-header-text">' + Y.Escape.html(config.name) + '</h1>',
+                '<h1 id="moodle-dialogue-' + this.get('COUNT') + '-header-text">'
+                    + Y.Escape.html(config.name) + '</h1>',
                 Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-ajaxexception" data-rel="fatalerror"></div>')
                 .append(Y.Node.create('<div class="moodle-exception-message">' + Y.Escape.html(this.get('error')) + '</div>'))
diff --git a/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js b/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
index ca595e48619b9..3ec70b72a7a0d 100644
--- a/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
+++ b/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
@@ -63,11 +63,11 @@ DIALOGUE = function(config) {
     // during widget instantiation, however, because we're creating it on the fly (and 'config.srcNode' isn't set yet), care must
     // be taken to add it to the DOM and to properly set the value of 'config.srcNode' before calling the parent constructor.
     // Note: additional classes can be added to this content node by setting the 'additionalBaseClass' config property (a string).
-    var id = 'moodle-dialogue-' + Y.stamp(this); // Can't use this.get('id') as it's not set at this stage.
+    var id = 'moodle-dialogue-' + Y.stamp(this) + '-wrap'; // Can't use this.get('id') as it's not set at this stage.
     config.notificationBase =
         Y.Node.create('<div class="' + CSS.BASE + '">')
               .append(Y.Node.create('<div id="' + id + '" role="dialog" ' +
-                                    'aria-labelledby="' + id + '-header-text" class="' + CSS.WRAP + '"></div>')
+                                    'aria-labelledby="' + id + '-header-text" class="' + CSS.WRAP + '"  aria-live="polite"></div>')
               .append(Y.Node.create('<div id="' + id + '-header-text" class="' + CSS.HEADER + ' yui3-widget-hd"></div>'))
               .append(Y.Node.create('<div class="' + CSS.BODY + ' yui3-widget-bd"></div>'))
               .append(Y.Node.create('<div class="' + CSS.FOOTER + ' yui3-widget-ft"></div>')));
diff --git a/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js b/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
index 4f4a4431f9410..1e87c5062b1de 100644
--- a/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
+++ b/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-core-notification-dialogue",function(e,t){var n,r,i,s,o,u,a;n="moodle-dialogue",r="notificationBase",i="yesLabel",s="noLabel",o="title",u="question",a={BASE:"moodle-dialogue-base",WRAP:"moodle-dialogue-wrap",HEADER:"moodle-dialogue-hd",BODY:"moodle-dialogue-bd",CONTENT:"moodle-dialogue-content",FOOTER:"moodle-dialogue-ft",HIDDEN:"hidden",LIGHTBOX:"moodle-dialogue-lightbox"},M.core=M.core||{};var f="Moodle dialogue",l,c=n+"-fullscreen",h=n+"-hidden",p=" [role=dialog]",d="[role=menubar]",v=".",m="moodle-has-zindex",g='input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]',y="form";l=function(t){var n="moodle-dialogue-"+e.stamp(this);t.notificationBase=e.Node.create('<div class="'+a.BASE+'">').append(e.Node.create('<div id="'+n+'" role="dialog" '+'aria-labelledby="'+n+'-header-text" class="'+a.WRAP+'"></div>').append(e.Node.create('<div id="'+n+'-header-text" class="'+a.HEADER+' yui3-widget-hd"></div>')).append(e.Node.create('<div class="'+a.BODY+' yui3-widget-bd"></div>')).append(e.Node.create('<div class="'+a.FOOTER+' yui3-widget-ft"></div>'))),e.one(document.body).append(t.notificationBase),t.srcNode="#"+n,delete t.buttons,l.superclass.constructor.apply(this,[t])},e.extend(l,e.Panel,{_resizeevent:null,_orientationevent:null,_calculatedzindex:!1,_currentMaskNodeId:null,_originalPosition:null,_hiddenSiblings:null,hideIfNotForm:function(){var e=this.get("boundingBox"),t=e.one(y);t===null&&this.hide()},initializer:function(){var t;this.get("closeButton")!==!1&&this.get("buttons").header[0].setAttribute("title",this.get("closeButtonTitle")),this._hiddenSiblings=[],this.get("render")&&this.render(),this.after("visibleChange",this.visibilityChanged,this),this.get("center")&&this.centerDialogue(),this.get("modal")&&(this.get(r).set("aria-hidden","true"),this.plug(e.M.core.LockScroll)),t=this.get("boundingBox"),t.addClass(m),e.Array.each(this.get("extraClasses"),t.addClass,t),this.get("visible")&&this.applyZIndex(),this.on("maskShow",this.applyZIndex),this.on("maskShow",function(){var t=e.one(e.config.win),n=this.get("boundingBox");this.get("center")||(this._originalPosition=n.getXY());var r=this.get("maskNode");this._currentMaskNodeId!==r.get("_yuid")&&(this._currentMaskNodeId=r.get("_yuid"),r.on("click",this.hideIfNotForm,this)),n.getStyle("position")!=="fixed"&&n.setStyles({top:t.get("scrollTop"),left:t.get("scrollLeft")})},this);var n=this.get("notificationBase"),i=this.get("additionalBaseClass");i!==""&&n.addClass(i),this.after("destroyedChange",function(){this.get(r).remove(!0)},this)},applyZIndex:function(){var t=1,n=1,r=this.get("boundingBox"),i=this.get("maskNode"),s=this.get("zIndex");s!==0&&!this._calculatedzindex?r.setStyle("zIndex",s):(e.all(p+", "+d+", "+v+m).each(function(e){var n=this.findZIndex(e);n>t&&(t=n)},this),n=(t+1).toString(),r.setStyle("zIndex",n),this.set("zIndex",n),this.get("modal")&&(i.setStyle("zIndex",n),e.UA.ie&&e.UA.compareVersions(e.UA.ie,9)<0&&setTimeout(function(){i.setStyle("position","static"),setTimeout(function(){i.setStyle("position","fixed")},0)},0)),this._calculatedzindex=!0)},findZIndex:function(e){var t=e.getStyle("zIndex")||e.ancestor().getStyle("zIndex");return t?parseInt(t,10):0},visibilityChanged:function(t){var n,r;t.attrName==="visible"&&(this.get("maskNode").addClass(a.LIGHTBOX),t.prevVal&&!t.newVal&&(r=this.get("boundingBox"),this._resizeevent&&(this._resizeevent.detach(),this._resizeevent=null),this._orientationevent&&(this._orientationevent.detach(),this._orientationevent=null),r.detach("key",this.keyDelegation),this.get("modal")&&this.setAccessibilityHidden()),!t.prevVal&&t.newVal&&(this.applyZIndex(),this.makeResponsive(),this.shouldResizeFullscreen()||this.get("draggable")&&(n="#"+this.get("id")+" ."+a.HEADER,this.plug(e.Plugin.Drag,{handles:[n]}),e.one(n).setStyle("cursor","move")),this.keyDelegation(),this.get("modal")&&this.setAccessibilityVisible()),this.get("center")&&!t.prevVal&&t.newVal&&this.centerDialogue())},makeResponsive:function(){var e=this.get("boundingBox");this.shouldResizeFullscreen()?(e.addClass(c),e.setStyles({left:null,top:null,width:null,height:null,right:null,bottom:null})):this.get("responsive")&&e.removeClass(c).setStyles({width:this.get("width"),height:this.get("height")}),this.lockScroll&&this.lockScroll.updateScrollLock(this.shouldResizeFullscreen())},centerDialogue:function(){var t=this.get("boundingBox"),n=t.hasClass(h),r,i;if(this.shouldResizeFullscreen())return;n&&t.setStyle("top","-1000px").removeClass(h),r=Math.max(Math.round((t.get("winWidth")-t.get("offsetWidth"))/2),15),i=Math.max(Math.round((t.get("winHeight")-t.get("offsetHeight"))/2),15)+e.one(window).get("scrollTop"),t.setStyles({left:r,top:i}),n&&t.addClass(h),this.makeResponsive()},shouldResizeFullscreen:function(){return window===window.parent&&this.get("responsive")&&Math.floor(e.one(document.body).get("winWidth"))<this.get("responsiveWidth")},show:function(){var e=null,t=this.headerNode,n=this.bodyNode,r=this.get("focusOnShowSelector"),i=null;return e=l.superclass.show.call(this),!this.get("center")&&this._originalPosition&&this.get("boundingBox").setXY(this._originalPosition),r!==null&&(i=this.get("boundingBox").one(r)),i||(t&&t!==""?i=t:n&&n!==""&&(i=n)),i&&i.focus(),e},hide:function(e){if(e&&e.type==="key"&&e.keyCode===27&&!this.get("focused"))return;return this.lockScroll&&this.lockScroll.disableScrollLock(),l.superclass.hide.call(this,arguments)},keyDelegation:function(){var e=this.get("boundingBox");e.delegate("key",function(e){var t=e.target,n="forward";e.shiftKey&&(n="backward"),this.trapFocus(t,n)&&e.preventDefault()},"down:9",g,this)},trapFocus:function(e,t){var n=this.get("boundingBox"),r=n.one(g),i=n.all(g).pop();if(e===i&&t==="forward")return r.focus();if(e===r&&t==="backward")return i.focus()},setAccessibilityVisible:function(){var t=this.get(r);e.one(document.body).get("children").each(function(e){if(e!==t){var n=e.get("aria-hidden");n!=="true"&&(e.setData("previous-aria-hidden",n),this._hiddenSiblings
-.push(e),e.set("aria-hidden","true"))}},this),t.set("aria-hidden","false")},setAccessibilityHidden:function(){var t=this.get(r);t.set("aria-hidden","true"),e.Array.each(this._hiddenSiblings,function(e){var t=e.getData("previous-aria-hidden");t===null?e.removeAttribute("aria-hidden"):e.set("aria-hidden",t)}),this._hiddenSiblings=[]}},{NAME:f,CSS_PREFIX:n,ATTRS:{additionalBaseClass:{value:""},notificationBase:{},lightbox:{lazyAdd:!1,setter:function(e){this.set("modal",e)}},closeButton:{validator:e.Lang.isBoolean,value:!0},closeButtonTitle:{validator:e.Lang.isString,value:M.util.get_string("closebuttontitle","moodle")},center:{validator:e.Lang.isBoolean,value:!0},draggable:{validator:e.Lang.isBoolean,value:!1},COUNT:{writeOnce:!0,valueFn:function(){return e.stamp(this)}},responsive:{validator:e.Lang.isBoolean,value:!0},responsiveWidth:{value:768},focusOnShowSelector:{value:null}}}),e.Base.modifyAttrs(l,{width:{value:"400px",setter:function(e){return e==="auto"?"":e}},visible:{value:!1},centered:{setter:function(e){return e&&this.set("center",!0),!1}},render:{value:!0,writeOnce:!0},extraClasses:{value:[]},id:{writeOnce:!0,valueFn:function(){var t="moodle-dialogue-"+e.stamp(this);return t}},buttons:{getter:e.WidgetButtons.prototype._getButtons,setter:e.WidgetButtons.prototype._setButtons,valueFn:function(){return this.get("closeButton")===!1?null:[{section:e.WidgetStdMod.HEADER,classNames:"closebutton",action:function(){this.hide()}}]}}}),e.Base.mix(l,[e.M.core.WidgetFocusAfterHide]),M.core.dialogue=l;var b=function(){b.superclass.constructor.apply(this,arguments)};e.extend(b,M.core.dialogue,{initializer:function(){this.show()}},{NAME:"Moodle information dialogue",CSS_PREFIX:n}),e.Base.modifyAttrs(b,{modal:{validator:e.Lang.isBoolean,value:!0}}),M.core.notification=M.core.notification||{},M.core.notification.info=b},"@VERSION@",{requires:["base","node","panel","escape","event-key","dd-plugin","moodle-core-widget-focusafterclose","moodle-core-lockscroll"]});
+YUI.add("moodle-core-notification-dialogue",function(e,t){var n,r,i,s,o,u,a;n="moodle-dialogue",r="notificationBase",i="yesLabel",s="noLabel",o="title",u="question",a={BASE:"moodle-dialogue-base",WRAP:"moodle-dialogue-wrap",HEADER:"moodle-dialogue-hd",BODY:"moodle-dialogue-bd",CONTENT:"moodle-dialogue-content",FOOTER:"moodle-dialogue-ft",HIDDEN:"hidden",LIGHTBOX:"moodle-dialogue-lightbox"},M.core=M.core||{};var f="Moodle dialogue",l,c=n+"-fullscreen",h=n+"-hidden",p=" [role=dialog]",d="[role=menubar]",v=".",m="moodle-has-zindex",g='input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]',y="form";l=function(t){var n="moodle-dialogue-"+e.stamp(this)+"-wrap";t.notificationBase=e.Node.create('<div class="'+a.BASE+'">').append(e.Node.create('<div id="'+n+'" role="dialog" '+'aria-labelledby="'+n+'-header-text" class="'+a.WRAP+'"  aria-live="polite"></div>').append(e.Node.create('<div id="'+n+'-header-text" class="'+a.HEADER+' yui3-widget-hd"></div>')).append(e.Node.create('<div class="'+a.BODY+' yui3-widget-bd"></div>')).append(e.Node.create('<div class="'+a.FOOTER+' yui3-widget-ft"></div>'))),e.one(document.body).append(t.notificationBase),t.srcNode="#"+n,delete t.buttons,l.superclass.constructor.apply(this,[t])},e.extend(l,e.Panel,{_resizeevent:null,_orientationevent:null,_calculatedzindex:!1,_currentMaskNodeId:null,_originalPosition:null,_hiddenSiblings:null,hideIfNotForm:function(){var e=this.get("boundingBox"),t=e.one(y);t===null&&this.hide()},initializer:function(){var t;this.get("closeButton")!==!1&&this.get("buttons").header[0].setAttribute("title",this.get("closeButtonTitle")),this._hiddenSiblings=[],this.get("render")&&this.render(),this.after("visibleChange",this.visibilityChanged,this),this.get("center")&&this.centerDialogue(),this.get("modal")&&(this.get(r).set("aria-hidden","true"),this.plug(e.M.core.LockScroll)),t=this.get("boundingBox"),t.addClass(m),e.Array.each(this.get("extraClasses"),t.addClass,t),this.get("visible")&&this.applyZIndex(),this.on("maskShow",this.applyZIndex),this.on("maskShow",function(){var t=e.one(e.config.win),n=this.get("boundingBox");this.get("center")||(this._originalPosition=n.getXY());var r=this.get("maskNode");this._currentMaskNodeId!==r.get("_yuid")&&(this._currentMaskNodeId=r.get("_yuid"),r.on("click",this.hideIfNotForm,this)),n.getStyle("position")!=="fixed"&&n.setStyles({top:t.get("scrollTop"),left:t.get("scrollLeft")})},this);var n=this.get("notificationBase"),i=this.get("additionalBaseClass");i!==""&&n.addClass(i),this.after("destroyedChange",function(){this.get(r).remove(!0)},this)},applyZIndex:function(){var t=1,n=1,r=this.get("boundingBox"),i=this.get("maskNode"),s=this.get("zIndex");s!==0&&!this._calculatedzindex?r.setStyle("zIndex",s):(e.all(p+", "+d+", "+v+m).each(function(e){var n=this.findZIndex(e);n>t&&(t=n)},this),n=(t+1).toString(),r.setStyle("zIndex",n),this.set("zIndex",n),this.get("modal")&&(i.setStyle("zIndex",n),e.UA.ie&&e.UA.compareVersions(e.UA.ie,9)<0&&setTimeout(function(){i.setStyle("position","static"),setTimeout(function(){i.setStyle("position","fixed")},0)},0)),this._calculatedzindex=!0)},findZIndex:function(e){var t=e.getStyle("zIndex")||e.ancestor().getStyle("zIndex");return t?parseInt(t,10):0},visibilityChanged:function(t){var n,r;t.attrName==="visible"&&(this.get("maskNode").addClass(a.LIGHTBOX),t.prevVal&&!t.newVal&&(r=this.get("boundingBox"),this._resizeevent&&(this._resizeevent.detach(),this._resizeevent=null),this._orientationevent&&(this._orientationevent.detach(),this._orientationevent=null),r.detach("key",this.keyDelegation),this.get("modal")&&this.setAccessibilityHidden()),!t.prevVal&&t.newVal&&(this.applyZIndex(),this.makeResponsive(),this.shouldResizeFullscreen()||this.get("draggable")&&(n="#"+this.get("id")+" ."+a.HEADER,this.plug(e.Plugin.Drag,{handles:[n]}),e.one(n).setStyle("cursor","move")),this.keyDelegation(),this.get("modal")&&this.setAccessibilityVisible()),this.get("center")&&!t.prevVal&&t.newVal&&this.centerDialogue())},makeResponsive:function(){var e=this.get("boundingBox");this.shouldResizeFullscreen()?(e.addClass(c),e.setStyles({left:null,top:null,width:null,height:null,right:null,bottom:null})):this.get("responsive")&&e.removeClass(c).setStyles({width:this.get("width"),height:this.get("height")}),this.lockScroll&&this.lockScroll.updateScrollLock(this.shouldResizeFullscreen())},centerDialogue:function(){var t=this.get("boundingBox"),n=t.hasClass(h),r,i;if(this.shouldResizeFullscreen())return;n&&t.setStyle("top","-1000px").removeClass(h),r=Math.max(Math.round((t.get("winWidth")-t.get("offsetWidth"))/2),15),i=Math.max(Math.round((t.get("winHeight")-t.get("offsetHeight"))/2),15)+e.one(window).get("scrollTop"),t.setStyles({left:r,top:i}),n&&t.addClass(h),this.makeResponsive()},shouldResizeFullscreen:function(){return window===window.parent&&this.get("responsive")&&Math.floor(e.one(document.body).get("winWidth"))<this.get("responsiveWidth")},show:function(){var e=null,t=this.headerNode,n=this.bodyNode,r=this.get("focusOnShowSelector"),i=null;return e=l.superclass.show.call(this),!this.get("center")&&this._originalPosition&&this.get("boundingBox").setXY(this._originalPosition),r!==null&&(i=this.get("boundingBox").one(r)),i||(t&&t!==""?i=t:n&&n!==""&&(i=n)),i&&i.focus(),e},hide:function(e){if(e&&e.type==="key"&&e.keyCode===27&&!this.get("focused"))return;return this.lockScroll&&this.lockScroll.disableScrollLock(),l.superclass.hide.call(this,arguments)},keyDelegation:function(){var e=this.get("boundingBox");e.delegate("key",function(e){var t=e.target,n="forward";e.shiftKey&&(n="backward"),this.trapFocus(t,n)&&e.preventDefault()},"down:9",g,this)},trapFocus:function(e,t){var n=this.get("boundingBox"),r=n.one(g),i=n.all(g).pop();if(e===i&&t==="forward")return r.focus();if(e===r&&t==="backward")return i.focus()},setAccessibilityVisible:function(){var t=this.get(r);e.one(document.body).get("children").each(function(e){if(e!==t){var n=e.get("aria-hidden");n!=="true"&&(e.setData("previous-aria-hidden"
+,n),this._hiddenSiblings.push(e),e.set("aria-hidden","true"))}},this),t.set("aria-hidden","false")},setAccessibilityHidden:function(){var t=this.get(r);t.set("aria-hidden","true"),e.Array.each(this._hiddenSiblings,function(e){var t=e.getData("previous-aria-hidden");t===null?e.removeAttribute("aria-hidden"):e.set("aria-hidden",t)}),this._hiddenSiblings=[]}},{NAME:f,CSS_PREFIX:n,ATTRS:{additionalBaseClass:{value:""},notificationBase:{},lightbox:{lazyAdd:!1,setter:function(e){this.set("modal",e)}},closeButton:{validator:e.Lang.isBoolean,value:!0},closeButtonTitle:{validator:e.Lang.isString,value:M.util.get_string("closebuttontitle","moodle")},center:{validator:e.Lang.isBoolean,value:!0},draggable:{validator:e.Lang.isBoolean,value:!1},COUNT:{writeOnce:!0,valueFn:function(){return e.stamp(this)}},responsive:{validator:e.Lang.isBoolean,value:!0},responsiveWidth:{value:768},focusOnShowSelector:{value:null}}}),e.Base.modifyAttrs(l,{width:{value:"400px",setter:function(e){return e==="auto"?"":e}},visible:{value:!1},centered:{setter:function(e){return e&&this.set("center",!0),!1}},render:{value:!0,writeOnce:!0},extraClasses:{value:[]},id:{writeOnce:!0,valueFn:function(){var t="moodle-dialogue-"+e.stamp(this);return t}},buttons:{getter:e.WidgetButtons.prototype._getButtons,setter:e.WidgetButtons.prototype._setButtons,valueFn:function(){return this.get("closeButton")===!1?null:[{section:e.WidgetStdMod.HEADER,classNames:"closebutton",action:function(){this.hide()}}]}}}),e.Base.mix(l,[e.M.core.WidgetFocusAfterHide]),M.core.dialogue=l;var b=function(){b.superclass.constructor.apply(this,arguments)};e.extend(b,M.core.dialogue,{initializer:function(){this.show()}},{NAME:"Moodle information dialogue",CSS_PREFIX:n}),e.Base.modifyAttrs(b,{modal:{validator:e.Lang.isBoolean,value:!0}}),M.core.notification=M.core.notification||{},M.core.notification.info=b},"@VERSION@",{requires:["base","node","panel","escape","event-key","dd-plugin","moodle-core-widget-focusafterclose","moodle-core-lockscroll"]});
diff --git a/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js b/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
index 7766ab595bebf..749b42242b92d 100644
--- a/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
+++ b/lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
@@ -63,11 +63,11 @@ DIALOGUE = function(config) {
     // during widget instantiation, however, because we're creating it on the fly (and 'config.srcNode' isn't set yet), care must
     // be taken to add it to the DOM and to properly set the value of 'config.srcNode' before calling the parent constructor.
     // Note: additional classes can be added to this content node by setting the 'additionalBaseClass' config property (a string).
-    var id = 'moodle-dialogue-' + Y.stamp(this); // Can't use this.get('id') as it's not set at this stage.
+    var id = 'moodle-dialogue-' + Y.stamp(this) + '-wrap'; // Can't use this.get('id') as it's not set at this stage.
     config.notificationBase =
         Y.Node.create('<div class="' + CSS.BASE + '">')
               .append(Y.Node.create('<div id="' + id + '" role="dialog" ' +
-                                    'aria-labelledby="' + id + '-header-text" class="' + CSS.WRAP + '"></div>')
+                                    'aria-labelledby="' + id + '-header-text" class="' + CSS.WRAP + '"  aria-live="polite"></div>')
               .append(Y.Node.create('<div id="' + id + '-header-text" class="' + CSS.HEADER + ' yui3-widget-hd"></div>'))
               .append(Y.Node.create('<div class="' + CSS.BODY + ' yui3-widget-bd"></div>'))
               .append(Y.Node.create('<div class="' + CSS.FOOTER + ' yui3-widget-ft"></div>')));
diff --git a/lib/yui/src/chooserdialogue/js/chooserdialogue.js b/lib/yui/src/chooserdialogue/js/chooserdialogue.js
index 020d7b03f6ee1..a2df1f799bcee 100644
--- a/lib/yui/src/chooserdialogue/js/chooserdialogue.js
+++ b/lib/yui/src/chooserdialogue/js/chooserdialogue.js
@@ -244,10 +244,10 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             }
         }
 
-        // Take off 15px top and bottom for borders, plus 40px each for the title and button area before setting the
-        // new max-height
+        // Take off 15px top and bottom for borders, plus 69px for the title and 57px for the
+        // button area before setting the new max-height.
         totalheight = newheight;
-        newheight = newheight - (15 + 15 + 40 + 40);
+        newheight = newheight - (69 + 57 + 15 + 15);
         dialogue.setStyle('maxHeight', newheight + 'px');
 
         var dialogueheight = bb.getStyle('height');
@@ -260,6 +260,8 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
         if (dialogueheight < this.get('baseheight')) {
             dialogueheight = this.get('baseheight');
             dialogue.setStyle('height', dialogueheight + 'px');
+        } else {
+            dialogue.setStyle('height', 'auto');
         }
 
         this.panel.centerDialogue();
diff --git a/lib/yui/src/formchangechecker/js/formchangechecker.js b/lib/yui/src/formchangechecker/js/formchangechecker.js
index f4545f4eecadc..59d3283e03cc4 100644
--- a/lib/yui/src/formchangechecker/js/formchangechecker.js
+++ b/lib/yui/src/formchangechecker/js/formchangechecker.js
@@ -36,6 +36,10 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
                 return;
             }
 
+            if (!M.core_formchangechecker.stateinformation.formchanged) {
+                M.core_formchangechecker.stateinformation.formchanged = this.get('initialdirtystate');
+            }
+
             // Add a listener here for an editor restore event.
             Y.on(M.core.event.EDITOR_CONTENT_RESTORED, M.core_formchangechecker.reset_form_dirty_state, this);
 
@@ -96,6 +100,9 @@ Y.extend(FORMCHANGECHECKER, Y.Base, {
         ATTRS: {
             formid: {
                 'value': ''
+            },
+            initialdirtystate: {
+                'value': false
             }
         }
     }
diff --git a/lib/yui/src/notification/js/ajaxexception.js b/lib/yui/src/notification/js/ajaxexception.js
index 230f2289e6b63..ac654764ffeec 100644
--- a/lib/yui/src/notification/js/ajaxexception.js
+++ b/lib/yui/src/notification/js/ajaxexception.js
@@ -32,7 +32,8 @@ Y.extend(AJAXEXCEPTION, M.core.notification.info, {
             delay = this.get('hideTimeoutDelay');
         this.get(BASE).addClass('moodle-dialogue-exception');
         this.setStdModContent(Y.WidgetStdMod.HEADER,
-                '<h1 id="moodle-dialogue-' + this.get('COUNT') + '-header-text">' + Y.Escape.html(config.name) + '</h1>',
+                '<h1 id="moodle-dialogue-' + this.get('COUNT') + '-header-text">'
+                    + Y.Escape.html(config.name) + '</h1>',
                 Y.WidgetStdMod.REPLACE);
         content = Y.Node.create('<div class="moodle-ajaxexception" data-rel="fatalerror"></div>')
                 .append(Y.Node.create('<div class="moodle-exception-message">' + Y.Escape.html(this.get('error')) + '</div>'))
diff --git a/lib/yui/src/notification/js/dialogue.js b/lib/yui/src/notification/js/dialogue.js
index f8664c6ff816d..193ada07ebc4f 100644
--- a/lib/yui/src/notification/js/dialogue.js
+++ b/lib/yui/src/notification/js/dialogue.js
@@ -33,11 +33,11 @@ DIALOGUE = function(config) {
     // during widget instantiation, however, because we're creating it on the fly (and 'config.srcNode' isn't set yet), care must
     // be taken to add it to the DOM and to properly set the value of 'config.srcNode' before calling the parent constructor.
     // Note: additional classes can be added to this content node by setting the 'additionalBaseClass' config property (a string).
-    var id = 'moodle-dialogue-' + Y.stamp(this); // Can't use this.get('id') as it's not set at this stage.
+    var id = 'moodle-dialogue-' + Y.stamp(this) + '-wrap'; // Can't use this.get('id') as it's not set at this stage.
     config.notificationBase =
         Y.Node.create('<div class="' + CSS.BASE + '">')
               .append(Y.Node.create('<div id="' + id + '" role="dialog" ' +
-                                    'aria-labelledby="' + id + '-header-text" class="' + CSS.WRAP + '"></div>')
+                                    'aria-labelledby="' + id + '-header-text" class="' + CSS.WRAP + '"  aria-live="polite"></div>')
               .append(Y.Node.create('<div id="' + id + '-header-text" class="' + CSS.HEADER + ' yui3-widget-hd"></div>'))
               .append(Y.Node.create('<div class="' + CSS.BODY + ' yui3-widget-bd"></div>'))
               .append(Y.Node.create('<div class="' + CSS.FOOTER + ' yui3-widget-ft"></div>')));
diff --git a/login/index.php b/login/index.php
index a04970acfffbc..7f6656026abef 100644
--- a/login/index.php
+++ b/login/index.php
@@ -30,10 +30,21 @@
 redirect_if_major_upgrade_required();
 
 $testsession = optional_param('testsession', 0, PARAM_INT); // test session works properly
-$anchor      = optional_param('anchor', '', PARAM_RAW);      // Used to restore hash anchor to wantsurl.
+$anchor      = optional_param('anchor', '', PARAM_RAW);     // Used to restore hash anchor to wantsurl.
 
 $resendconfirmemail = optional_param('resendconfirmemail', false, PARAM_BOOL);
 
+// It might be safe to do this for non-Behat sites, or there might
+// be a security risk. For now we only allow it on Behat sites.
+// If you wants to do the analysis, you may be able to remove the
+// if (BEHAT_SITE_RUNNING).
+if (defined('BEHAT_SITE_RUNNING') && BEHAT_SITE_RUNNING) {
+    $wantsurl    = optional_param('wantsurl', '', PARAM_LOCALURL);   // Overrides $SESSION->wantsurl if given.
+    if ($wantsurl !== '') {
+        $SESSION->wantsurl = (new moodle_url($wantsurl))->out(false);
+    }
+}
+
 $context = context_system::instance();
 $PAGE->set_url("$CFG->wwwroot/login/index.php");
 $PAGE->set_context($context);
@@ -182,7 +193,7 @@
                     echo $OUTPUT->notification(get_string('emailconfirmsentsuccess'), \core\output\notification::NOTIFY_SUCCESS);
                 }
             }
-            echo $OUTPUT->box(get_string("emailconfirmsent", "", $user->email), "generalbox boxaligncenter");
+            echo $OUTPUT->box(get_string("emailconfirmsent", "", s($user->email)), "generalbox boxaligncenter");
             $resendconfirmurl = new moodle_url('/login/index.php',
                 [
                     'username' => $frm->username,
diff --git a/message/amd/build/message_drawer.min.js b/message/amd/build/message_drawer.min.js
index 4c5809eab13e3..a1353b6911bcf 100644
--- a/message/amd/build/message_drawer.min.js
+++ b/message/amd/build/message_drawer.min.js
@@ -1 +1 @@
-define(["jquery","core/custom_interaction_events","core/pubsub","core_message/message_drawer_view_contact","core_message/message_drawer_view_contacts","core_message/message_drawer_view_conversation","core_message/message_drawer_view_group_info","core_message/message_drawer_view_overview","core_message/message_drawer_view_search","core_message/message_drawer_view_settings","core_message/message_drawer_router","core_message/message_drawer_routes","core_message/message_drawer_events"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n={PANEL_BODY_CONTAINER:'[data-region="panel-body-container"]',PANEL_HEADER_CONTAINER:'[data-region="panel-header-container"]',VIEW_CONTACT:'[data-region="view-contact"]',VIEW_CONTACTS:'[data-region="view-contacts"]',VIEW_CONVERSATION:'[data-region="view-conversation"]',VIEW_GROUP_INFO:'[data-region="view-group-info"]',VIEW_OVERVIEW:'[data-region="view-overview"]',VIEW_SEARCH:'[data-region="view-search"]',VIEW_SETTINGS:'[data-region="view-settings"]',ROUTES:"[data-route]",ROUTES_BACK:"[data-route-back]",HEADER_CONTAINER:'[data-region="header-container"]',BODY_CONTAINER:'[data-region="body-container"]',FOOTER_CONTAINER:'[data-region="footer-container"]'},o=function(a,b,c){var d=b.find(n.HEADER_CONTAINER).find(c);d.length||(d=b.find(n.PANEL_HEADER_CONTAINER).find(c));var e=b.find(n.BODY_CONTAINER).find(c);e.length||(e=b.find(n.PANEL_BODY_CONTAINER).find(c));var f=b.find(n.FOOTER_CONTAINER).find(c);return[a,d.length?d:null,e.length?e:null,f.length?f:null]},p=[[l.VIEW_CONTACT,n.VIEW_CONTACT,d.show,d.description],[l.VIEW_CONTACTS,n.VIEW_CONTACTS,e.show,e.description],[l.VIEW_CONVERSATION,n.VIEW_CONVERSATION,f.show,f.description],[l.VIEW_GROUP_INFO,n.VIEW_GROUP_INFO,g.show,g.description],[l.VIEW_OVERVIEW,n.VIEW_OVERVIEW,h.show,h.description],[l.VIEW_SEARCH,n.VIEW_SEARCH,i.show,i.description],[l.VIEW_SETTINGS,n.VIEW_SETTINGS,j.show,j.description]],q=function(a,b){p.forEach(function(c){k.add(a,c[0],o(a,b,c[1]),c[2],c[3])})},r=function(a,b){b.attr("data-shown")||(k.go(a,l.VIEW_OVERVIEW),b.attr("data-shown",!0)),b.removeClass("hidden"),b.attr("aria-expanded",!0),b.attr("aria-hidden",!1)},s=function(a){a.addClass("hidden"),a.attr("aria-expanded",!1),a.attr("aria-hidden",!0)},t=function(a){return!a.hasClass("hidden")},u=function(d,e,f){b.define(e,[b.events.activate]);var g=/^data-route-param-?(\d*)$/;e.on(b.events.activate,n.ROUTES,function(b,c){for(var e=a(b.target).closest(n.ROUTES),f=e.attr("data-route"),h=[],i=0;i<e[0].attributes.length;i++)h.push(e[0].attributes[i]);var j=h.filter(function(a){var b=a.nodeName,c=g.test(b);return c});j.sort(function(a,b){var c=g.exec(a.nodeName),d=g.exec(b.nodeName),e=c.length>1?c[1]:0,f=d.length>1?d[1]:0;return e<f?-1:f<e?1:0});var l=j.map(function(a){return a.nodeValue}),m=[d,f].concat(l);k.go.apply(null,m),c.originalEvent.preventDefault()}),e.on(b.events.activate,n.ROUTES_BACK,function(a,b){k.back(d),b.originalEvent.preventDefault()}),f||(c.subscribe(m.SHOW,function(){r(d,e)}),c.subscribe(m.HIDE,function(){s(e)}),c.subscribe(m.TOGGLE_VISIBILITY,function(){t(e)?s(e):r(d,e)})),c.subscribe(m.SHOW_CONVERSATION,function(a){r(d,e),k.go(d,l.VIEW_CONVERSATION,a)}),c.subscribe(m.CREATE_CONVERSATION_WITH_USER,function(a){r(d,e),k.go(d,l.VIEW_CONVERSATION,null,"create",a)}),c.subscribe(m.SHOW_SETTINGS,function(){r(d,e),k.go(d,l.VIEW_SETTINGS)}),c.subscribe(m.PREFERENCES_UPDATED,function(a){var b=a.filter(function(a){return"message_entertosend"==a.type}),c=b.length?b[0]:null;if(c){var d=e.find(n.FOOTER_CONTAINER).find(n.VIEW_CONVERSATION);d.attr("data-enter-to-send",c.value)}})},v=function(b,c,d,e,f){b=a(b),q(c,b),u(c,b,d),d&&(r(c,b),e?f?k.go(c,l.VIEW_CONVERSATION,f):k.go(c,l.VIEW_CONVERSATION,null,"create",e):f&&k.go(c,l.VIEW_CONVERSATION,f))};return{init:v}});
\ No newline at end of file
+define(["jquery","core/custom_interaction_events","core/pubsub","core_message/message_drawer_view_contact","core_message/message_drawer_view_contacts","core_message/message_drawer_view_conversation","core_message/message_drawer_view_group_info","core_message/message_drawer_view_overview","core_message/message_drawer_view_search","core_message/message_drawer_view_settings","core_message/message_drawer_router","core_message/message_drawer_routes","core_message/message_drawer_events","core/pending"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n){var o={PANEL_BODY_CONTAINER:'[data-region="panel-body-container"]',PANEL_HEADER_CONTAINER:'[data-region="panel-header-container"]',VIEW_CONTACT:'[data-region="view-contact"]',VIEW_CONTACTS:'[data-region="view-contacts"]',VIEW_CONVERSATION:'[data-region="view-conversation"]',VIEW_GROUP_INFO:'[data-region="view-group-info"]',VIEW_OVERVIEW:'[data-region="view-overview"]',VIEW_SEARCH:'[data-region="view-search"]',VIEW_SETTINGS:'[data-region="view-settings"]',ROUTES:"[data-route]",ROUTES_BACK:"[data-route-back]",HEADER_CONTAINER:'[data-region="header-container"]',BODY_CONTAINER:'[data-region="body-container"]',FOOTER_CONTAINER:'[data-region="footer-container"]'},p=function(a,b,c){var d=b.find(o.HEADER_CONTAINER).find(c);d.length||(d=b.find(o.PANEL_HEADER_CONTAINER).find(c));var e=b.find(o.BODY_CONTAINER).find(c);e.length||(e=b.find(o.PANEL_BODY_CONTAINER).find(c));var f=b.find(o.FOOTER_CONTAINER).find(c);return[a,d.length?d:null,e.length?e:null,f.length?f:null]},q=[[l.VIEW_CONTACT,o.VIEW_CONTACT,d.show,d.description],[l.VIEW_CONTACTS,o.VIEW_CONTACTS,e.show,e.description],[l.VIEW_CONVERSATION,o.VIEW_CONVERSATION,f.show,f.description],[l.VIEW_GROUP_INFO,o.VIEW_GROUP_INFO,g.show,g.description],[l.VIEW_OVERVIEW,o.VIEW_OVERVIEW,h.show,h.description],[l.VIEW_SEARCH,o.VIEW_SEARCH,i.show,i.description],[l.VIEW_SETTINGS,o.VIEW_SETTINGS,j.show,j.description]],r=function(a,b){q.forEach(function(c){k.add(a,c[0],p(a,b,c[1]),c[2],c[3])})},s=function(a,b){b.attr("data-shown")||(k.go(a,l.VIEW_OVERVIEW),b.attr("data-shown",!0)),b.removeClass("hidden"),b.attr("aria-expanded",!0),b.attr("aria-hidden",!1)},t=function(a){a.addClass("hidden"),a.attr("aria-expanded",!1),a.attr("aria-hidden",!0)},u=function(a){return!a.hasClass("hidden")},v=function(d,e,f){b.define(e,[b.events.activate]);var g=/^data-route-param-?(\d*)$/;e.on(b.events.activate,o.ROUTES,function(b,c){for(var e=a(b.target).closest(o.ROUTES),f=e.attr("data-route"),h=[],i=0;i<e[0].attributes.length;i++)h.push(e[0].attributes[i]);var j=h.filter(function(a){var b=a.nodeName,c=g.test(b);return c});j.sort(function(a,b){var c=g.exec(a.nodeName),d=g.exec(b.nodeName),e=c.length>1?c[1]:0,f=d.length>1?d[1]:0;return e<f?-1:f<e?1:0});var l=j.map(function(a){return a.nodeValue}),m=[d,f].concat(l);k.go.apply(null,m),c.originalEvent.preventDefault()}),e.on(b.events.activate,o.ROUTES_BACK,function(a,b){k.back(d),b.originalEvent.preventDefault()}),e.on("hide.bs.collapse",".collapse",function(b){var c=new n;a(b.target).one("hidden.bs.collapse",function(){c.resolve()})}),e.on("show.bs.collapse",".collapse",function(b){var c=new n;a(b.target).one("shown.bs.collapse",function(){c.resolve()})}),f||(c.subscribe(m.SHOW,function(){s(d,e)}),c.subscribe(m.HIDE,function(){t(e)}),c.subscribe(m.TOGGLE_VISIBILITY,function(){u(e)?t(e):s(d,e)})),c.subscribe(m.SHOW_CONVERSATION,function(a){s(d,e),k.go(d,l.VIEW_CONVERSATION,a)}),c.subscribe(m.CREATE_CONVERSATION_WITH_USER,function(a){s(d,e),k.go(d,l.VIEW_CONVERSATION,null,"create",a)}),c.subscribe(m.SHOW_SETTINGS,function(){s(d,e),k.go(d,l.VIEW_SETTINGS)}),c.subscribe(m.PREFERENCES_UPDATED,function(a){var b=a.filter(function(a){return"message_entertosend"==a.type}),c=b.length?b[0]:null;if(c){var d=e.find(o.FOOTER_CONTAINER).find(o.VIEW_CONVERSATION);d.attr("data-enter-to-send",c.value)}})},w=function(b,c,d,e){if(b=a(b),r(c,b),v(c,b,d),d&&(s(c,b),e)){var f=e.params||[];f=[c,e.path].concat(f),k.go.apply(null,f)}};return{init:w}});
\ No newline at end of file
diff --git a/message/amd/build/message_drawer_view_contacts.min.js b/message/amd/build/message_drawer_view_contacts.min.js
index 6d0d66e31b233..904728d62b58b 100644
--- a/message/amd/build/message_drawer_view_contacts.min.js
+++ b/message/amd/build/message_drawer_view_contacts.min.js
@@ -1 +1 @@
-define(["jquery","core/pubsub","core/str","core_message/message_drawer_events","core_message/message_drawer_view_contacts_section_contacts","core_message/message_drawer_view_contacts_section_requests"],function(a,b,c,d,e,f){var g={ACTION_SHOW_CONTACTS_SECTION:'[data-action="show-contacts-section"]',ACTION_SHOW_REQUESTS_SECTION:'[data-action="show-requests-section"]',CONTACT_REQUEST_COUNT:'[data-region="contact-request-count"]',CONTACTS_SECTION_CONTAINER:'[data-section="contacts"]',REQUESTS_SECTION_CONTAINER:'[data-section="requests"]'},h=function(a){return a.find(g.CONTACTS_SECTION_CONTAINER)},i=function(a){return a.find(g.REQUESTS_SECTION_CONTAINER)},j=function(a){return a.hasClass("active")},k=function(a){return function(){var b=a.find(g.CONTACT_REQUEST_COUNT),c=parseInt(b.text(),10);c=isNaN(c)?0:c-1,c<=0?b.addClass("hidden"):b.text(c)}},l=function(a){var c=h(a),j=i(a),l=a.find(g.ACTION_SHOW_CONTACTS_SECTION),m=a.find(g.ACTION_SHOW_REQUESTS_SECTION);l.on("show.bs.tab",function(){e.show(c)}),m.on("show.bs.tab",function(){f.show(j)}),b.subscribe(d.CONTACT_REQUEST_ACCEPTED,k(a)),b.subscribe(d.CONTACT_REQUEST_DECLINED,k(a))},m=function(b,c,d){d=a(d),d.attr("data-contacts-init")||(l(d),d.attr("data-contacts-init",!0));var g=h(d),k=i(d);return j(g)?e.show(g):f.show(k),a.Deferred().resolve().promise()},n=function(){return c.get_string("messagedrawerviewcontacts","core_message")};return{show:m,description:n}});
\ No newline at end of file
+define(["jquery","core/pubsub","core/str","core_message/message_drawer_events","core_message/message_drawer_view_contacts_section_contacts","core_message/message_drawer_view_contacts_section_requests"],function(a,b,c,d,e,f){var g={ACTION_SHOW_CONTACTS_SECTION:'[data-action="show-contacts-section"]',ACTION_SHOW_REQUESTS_SECTION:'[data-action="show-requests-section"]',CONTACT_REQUEST_COUNT:'[data-region="contact-request-count"]',CONTACTS_SECTION_CONTAINER:'[data-section="contacts"]',REQUESTS_SECTION_CONTAINER:'[data-section="requests"]'},h=function(a){return a.find(g.CONTACTS_SECTION_CONTAINER)},i=function(a){return a.find(g.REQUESTS_SECTION_CONTAINER)},j=function(a){return a.find(g.ACTION_SHOW_CONTACTS_SECTION)},k=function(a){return a.find(g.ACTION_SHOW_REQUESTS_SECTION)},l=function(a){return a.hasClass("active")},m=function(a){return function(){var b=a.find(g.CONTACT_REQUEST_COUNT),c=parseInt(b.text(),10);c=isNaN(c)?0:c-1,c<=0?b.addClass("hidden"):b.text(c)}},n=function(a){var c=h(a),g=i(a),l=j(a),n=k(a);l.on("show.bs.tab",function(){e.show(c)}),n.on("show.bs.tab",function(){f.show(g)}),b.subscribe(d.CONTACT_REQUEST_ACCEPTED,m(a)),b.subscribe(d.CONTACT_REQUEST_DECLINED,m(a))},o=function(b,c,d,g,m){d=a(d),d.attr("data-contacts-init")||(n(d),d.attr("data-contacts-init",!0));var o=h(d),p=i(d);if(m){var q=j(d),r=k(d);"requests"==m?(q.removeClass("active"),o.removeClass("show active"),r.addClass("active"),p.addClass("show active")):(r.removeClass("active"),p.removeClass("show active"),q.addClass("active"),o.addClass("show active"))}return l(o)?e.show(o):f.show(p),a.Deferred().resolve().promise()},p=function(){return c.get_string("messagedrawerviewcontacts","core_message")};return{show:o,description:p}});
\ No newline at end of file
diff --git a/message/amd/build/message_drawer_view_conversation.min.js b/message/amd/build/message_drawer_view_conversation.min.js
index 67374e6b6ad3e..972fcc33ed965 100644
--- a/message/amd/build/message_drawer_view_conversation.min.js
+++ b/message/amd/build/message_drawer_view_conversation.min.js
@@ -1 +1 @@
-define(["jquery","core/auto_rows","core/backoff_timer","core/custom_interaction_events","core/notification","core/pubsub","core/str","core_message/message_repository","core_message/message_drawer_events","core_message/message_drawer_view_conversation_constants","core_message/message_drawer_view_conversation_patcher","core_message/message_drawer_view_conversation_renderer","core_message/message_drawer_view_conversation_state_manager","core_message/message_drawer_router","core_message/message_drawer_routes"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o){var p={},q=null,r=!1,s=0,t=null,u=!0,v=!1,w=null,x=[],y=j.NEWEST_MESSAGES_FIRST,z=j.LOAD_MESSAGE_LIMIT,A=j.INITIAL_NEW_MESSAGE_POLL_TIMEOUT,B=j.SELECTORS,C=j.CONVERSATION_TYPES,D=function(){if(!q||q.type==C.PUBLIC)return null;var a=q.loggedInUserId;if(q.type==C.SELF)return a;var b=Object.keys(q.members).filter(function(b){return a!=b});return b.length?b[0]:null},E=function(a){return Object.keys(p).reduce(function(b,c){if(!b){var d=p[c].state;d.type!=C.PUBLIC&&a in d.members&&(b=d.id)}return b},null)},F=function(a){return{id:parseInt(a.attr("data-user-id"),10),fullname:null,profileimageurl:null,profileimageurlsmall:null,isonline:null,showonlinestatus:null,isblocked:null,iscontact:null,isdeleted:null,canmessage:null,requirescontact:null,contactrequests:[]}},G=function(){return s},H=function(a){s=a,p[q.id].messagesOffset=a},I=function(){return r},J=function(a){r=a,p[q.id].loadedAllMessages=a},K=function(a){return a.find(B.MESSAGES_CONTAINER)},L=function(b){return{id:b.id,name:b.name,subname:b.subname,imageUrl:b.imageUrl,isFavourite:b.isFavourite,isMuted:b.isMuted,type:b.type,totalMemberCount:b.totalMemberCount,loggedInUserId:b.loggedInUserId,messages:b.messages.map(function(b){return a.extend({},b)}),members:Object.keys(b.members).map(function(c){var d=a.extend({},b.members[c]);return d.contactrequests=b.members[c].contactrequests.map(function(b){return a.extend({},b)}),d})}},M=function(a,b){var c=a.id,d=c==b?C.SELF:C.PRIVATE,f=m.setLoadingMembers(q,!0);return f=m.setLoadingMessages(f,!0),w(f).then(function(){return h.getMemberInfo(c,[b],!0,!0)}).then(function(a){if(a.length)return a[0];throw new Error("Unable to load other user profile")}).then(function(b){var c=d==C.SELF?[b]:[b,a],e=m.addMembers(q,c);return e=m.setLoadingMembers(e,!1),e=m.setLoadingMessages(e,!1),e=m.setName(e,b.fullname),e=m.setType(e,d),e=m.setImageUrl(e,b.profileimageurl),e=m.setTotalMemberCount(e,c.length),w(e).then(function(){return b})})["catch"](function(a){var b=m.setLoadingMembers(q,!1);w(b),e.exception(a)})},N=function(a,b){var c=null;if(a.type==C.PRIVATE){var d=a.members.filter(function(a){return a.id!=b});c=d.length?d[0]:null}else a.type==C.SELF&&(c=a.members[0]);var e=a.name,f=a.imageurl;a.type!=C.PUBLIC&&(e=e||c?c.fullname:"",f=f||c?c.profileimageurl:"");var g=m.addMembers(q,a.members);return g=m.setName(g,e),g=m.setSubname(g,a.subname),g=m.setType(g,a.type),g=m.setImageUrl(g,f),g=m.setTotalMemberCount(g,a.membercount),g=m.setIsFavourite(g,a.isfavourite),g=m.setIsMuted(g,a.ismuted),g=m.addMessages(g,a.messages),g=m.setCanDeleteMessagesForAllUsers(g,a.candeletemessagesforallusers)},O=function(a,b,c,d,f){var g=b.id,i=m.setLoadingMembers(q,!0);return i=m.setLoadingMessages(i,!0),w(i).then(function(){return h.getConversation(g,a,!0,!0,0,0,c+1,d,f)}).then(function(a){return a.messages.length>c?a.messages=a.messages.slice(1):J(!0),H(d+c),a}).then(function(a){var c=a.members.filter(function(a){return a.id==b.id});c.length<1&&(a.members=a.members.concat([b]));var d=N(a,b.id);return d=m.setLoadingMembers(d,!1),d=m.setLoadingMessages(d,!1),w(d).then(function(){return a})}).then(function(){return S(a)})["catch"](function(a){var b=m.setLoadingMembers(q,!1);b=m.setLoadingMessages(b,!1),w(b),e.exception(a)})},P=function(a,b,c,d){var f=a.members.filter(function(a){return a.id==b.id});f.length<1&&(a.members=a.members.concat([b]));var g=N(a,b.id);g=m.setLoadingMembers(g,!1),g=m.setLoadingMessages(g,!0);var h=a.messages.length;return w(g).then(function(){if(h<c)return Q(a.id,c,h,d,[]).then(function(a){return a.messages});var b=m.setLoadingMessages(q,!1);return w(b).then(function(){return a.messages})}).then(function(a){return H(a.length),a}).then(function(){return S(a.id)})["catch"](e.exception)},Q=function(a,b,c,d,e,f){return h.getMessages(q.loggedInUserId,a,b?b+1:b,c,d,f).then(function(a){return a.messages.length&&e.length&&(a.messages=a.messages.filter(function(a){return e.indexOf(parseInt(a.id,10))<0})),a}).then(function(a){return b?(a.messages.length>b?a.messages=a.messages.slice(0,-1):J(!0),a):a}).then(function(a){var b=a.members.filter(function(a){return!(a.id in q.members)}),c=m.addMembers(q,b);return c=m.addMessages(c,a.messages),c=m.setLoadingMessages(c,!1),w(c).then(function(){return a})})["catch"](function(a){var b=m.setLoadingMessages(q,!1);throw w(b),a})},R=function(b,c){return function(){var d=q.messages,e=d.length?d[d.length-1]:null;if(e&&!u&&!v){for(var g=[],h=d.length-1;h>=0;h--){var j=d[h];if(j.timeCreated!==e.timeCreated)break;g.push(j.id)}return Q(b,0,0,c,g,e.timeCreated).then(function(a){if(a.messages.length){t.restart();var c=L(q);return f.publish(i.CONVERSATION_NEW_LAST_MESSAGE,c),S(b)}return a})}return a.Deferred().resolve().promise()}},S=function(a){var b=q.loggedInUserId;return h.markAllConversationMessagesAsRead(b,a).then(function(){var b=m.markMessagesAsRead(q,q.messages);return f.publish(i.CONVERSATION_READ,a),w(b)})},T=function(a){return ha(a).then(function(){var b=m.addPendingBlockUsersById(q,[a]);return w(b)})},U=function(a){var b=m.setLoadingConfirmAction(q,!0);return w(b).then(function(){return h.blockUser(q.loggedInUserId,a)}).then(function(b){var c=m.addMembers(q,[b]);return c=m.removePendingBlockUsersById(c,[a]),c=m.setLoadingConfirmAction(c,!1),f.publish(i.CONTACT_BLOCKED,a),w(c)})},V=function(a){return ha(a).then(function(){var b=m.addPendingUnblockUsersById(q,[a]);return w(b)})},W=function(a){var b=m.setLoadingConfirmAction(q,!0);return w(b).then(function(){return h.unblockUser(q.loggedInUserId,a)}).then(function(b){var c=m.addMembers(q,[b]);return c=m.removePendingUnblockUsersById(c,[a]),c=m.setLoadingConfirmAction(c,!1),f.publish(i.CONTACT_UNBLOCKED,a),w(c)})},X=function(a){return ha(a).then(function(){var b=m.addPendingRemoveContactsById(q,[a]);return w(b)})},Y=function(a){var b=m.setLoadingConfirmAction(q,!0);return w(b).then(function(){return h.deleteContacts(q.loggedInUserId,[a])}).then(function(b){var c=m.addMembers(q,b);return c=m.removePendingRemoveContactsById(c,[a]),c=m.setLoadingConfirmAction(c,!1),f.publish(i.CONTACT_REMOVED,a),w(c)})},Z=function(a){return ha(a).then(function(){var b=m.addPendingAddContactsById(q,[a]);return w(b)})},$=function(a){var b=m.setLoadingConfirmAction(q,!0);return w(b).then(function(){return h.createContactRequest(q.loggedInUserId,a)}).then(function(a){if(!a.request)throw new Error(a.warnings[0].message);return a.request}).then(function(b){var c=m.removePendingAddContactsById(q,[a]);return c=m.addContactRequests(c,[b]),c=m.setLoadingConfirmAction(c,!1),w(c)})},_=function(){var a=q.loggedInUserId,b=q.id;return h.setFavouriteConversations(a,[b]).then(function(){var a=m.setIsFavourite(q,!0);return w(a)}).then(function(){return f.publish(i.CONVERSATION_SET_FAVOURITE,L(q))})},aa=function(){var a=q.loggedInUserId,b=q.id;return h.unsetFavouriteConversations(a,[b]).then(function(){var a=m.setIsFavourite(q,!1);return w(a)}).then(function(){return f.publish(i.CONVERSATION_UNSET_FAVOURITE,L(q))})},ba=function(){var a=q.loggedInUserId,b=q.id;return h.setMutedConversations(a,[b]).then(function(){var a=m.setIsMuted(q,!0);return w(a)}).then(function(){return f.publish(i.CONVERSATION_SET_MUTED,L(q))})},ca=function(){var a=q.loggedInUserId,b=q.id;return h.unsetMutedConversations(a,[b]).then(function(){var a=m.setIsMuted(q,!1);return w(a)}).then(function(){return f.publish(i.CONVERSATION_UNSET_MUTED,L(q))})},da=function(a){var b=q.selectedMessageIds;return ha(a).then(function(){var a=m.addPendingDeleteMessagesById(q,b);return w(a)})},ea=function(){var a=q.pendingDeleteMessageIds,b=m.setLoadingConfirmAction(q,!0);return w(b).then(function(){return b.deleteMessagesForAllUsers?h.deleteMessagesForAllUsers(q.loggedInUserId,a):h.deleteMessages(q.loggedInUserId,a)}).then(function(){var b=m.removeMessagesById(q,a);b=m.removePendingDeleteMessagesById(b,a),b=m.removeSelectedMessagesById(b,a),b=m.setLoadingConfirmAction(b,!1),b=m.setDeleteMessagesForAllUsers(b,!1);var c=q.messages[q.messages.length-1],d=b.messages.length?b.messages[b.messages.length-1]:null;if(d&&d.id!=c.id){var e=L(b);f.publish(i.CONVERSATION_NEW_LAST_MESSAGE,e)}else b.messages.length||f.publish(i.CONVERSATION_DELETED,b.id);return w(b)})},fa=function(a){return ha(a).then(function(){var a=m.setPendingDeleteConversation(q,!0);return w(a)})},ga=function(){var a=m.setLoadingConfirmAction(q,!0);return w(a).then(function(){return h.deleteConversation(q.loggedInUserId,q.id)}).then(function(){var a=m.removeMessages(q,q.messages);return a=m.removeSelectedMessagesById(a,q.selectedMessageIds),a=m.setPendingDeleteConversation(a,!1),a=m.setLoadingConfirmAction(a,!1),f.publish(i.CONVERSATION_DELETED,a.id),w(a)})},ha=function(a){var b=q.pendingDeleteMessageIds,c=m.removePendingAddContactsById(q,[a]);return c=m.removePendingRemoveContactsById(c,[a]),c=m.removePendingUnblockUsersById(c,[a]),c=m.removePendingBlockUsersById(c,[a]),c=m.removePendingDeleteMessagesById(c,b),c=m.setPendingDeleteConversation(c,!1),c=m.setDeleteMessagesForAllUsers(c,!1),w(c)},ia=function(a){var b=q.loggedInUserId,c=q.members[a].contactrequests.filter(function(a){return a.requesteduserid==b}),d=c[0],e=m.setLoadingConfirmAction(q,!0);return w(e).then(function(){return h.acceptContactRequest(a,b)}).then(function(a){var b=m.removeContactRequests(q,[d]);return b=m.addMembers(q,[a]),b=m.setLoadingConfirmAction(b,!1),w(b)}).then(function(){f.publish(i.CONTACT_ADDED,q.members[a]),f.publish(i.CONTACT_REQUEST_ACCEPTED,d)})},ja=function(a){var b=q.loggedInUserId,c=q.members[a].contactrequests.filter(function(a){return a.requesteduserid==b}),d=c[0],e=m.setLoadingConfirmAction(q,!0);return w(e).then(function(){return h.declineContactRequest(a,b)}).then(function(a){var b=m.removeContactRequests(q,[d]);return b=m.addMembers(q,[a]),b=m.setLoadingConfirmAction(b,!1),w(b)}).then(function(){f.publish(i.CONTACT_REQUEST_DECLINED,d)})},ka=function(a,b){v=!0;var c=m.setSendingMessage(q,!0),d=null,g=!1;return w(c).then(function(){if(a||q.type==C.PUBLIC)return h.sendMessageToConversation(a,b);var c=D();return h.sendMessageToUser(c,b).then(function(a){return d=parseInt(a.conversationid,10),g=a.candeletemessagesforallusers,a})}).then(function(a){var b=m.addMessages(q,[a]);b=m.setSendingMessage(b,!1);var c=L(b);return b.id||(b=m.setId(b,d),c.id=d,Aa(d),f.publish(i.CONVERSATION_CREATED,c),b=m.setCanDeleteMessagesForAllUsers(b,g)),w(b).then(function(){v=!1,f.publish(i.CONVERSATION_NEW_LAST_MESSAGE,c)})})["catch"](function(a){v=!1;var b=m.setSendingMessage(q,!1);w(b),e.exception(a)})},la=function(a){var b=q;return b=q.selectedMessageIds.indexOf(a)>-1?m.removeSelectedMessagesById(q,[a]):m.addSelectedMessagesById(q,[a]),w(b)},ma=function(){return ha(D()).then(function(){var a=m.removeSelectedMessagesById(q,q.selectedMessageIds);return w(a)})},na=function(b,c,d,e){var f=function(a){return l.render(b,c,d,a)};if(!e){var g=m.buildInitialState(q.midnight,q.loggedInUserId,q.id),h=k.buildPatch(g,q);f(h)}return x.push(f),function(b){var c=k.buildPatch(q,b),d=x.map(function(a){return a(c)});return a.when.apply(null,d).then(function(){q=b,b.id&&(p[b.id]={state:b,messagesOffset:G(),loadedAllMessages:I()})})}},oa=function(a){return function(b,c){q.loadingConfirmAction||a(D())["catch"](function(a){var b=m.setLoadingConfirmAction(q,!1);w(b),e.exception(a)}),c.originalEvent.preventDefault()}},pa=function(b,c){var d=a(b.target),e=d.closest(B.FOOTER_CONTAINER),f=e.find(B.MESSAGE_TEXT_AREA),g=f.val().trim();""!==g&&ka(q.id,g),c.originalEvent.preventDefault()},qa=function(b,c){var d=window.getSelection(),f=a(b.target);if(""==d.toString()&&!f.is("a")){var g=f.closest(B.MESSAGE),h=parseInt(g.attr("data-message-id"),10);la(h)["catch"](e.exception),c.originalEvent.preventDefault()}},ra=function(a,b){ma()["catch"](e.exception),b.originalEvent.preventDefault()},sa=function(a){return function(b,c){var d=D(),e=q.members[d];n.go(a,o.VIEW_CONTACT,e),c.originalEvent.preventDefault()}},ta=function(a,b){_()["catch"](e.exception),b.originalEvent.preventDefault()},ua=function(a,b){aa()["catch"](e.exception),b.originalEvent.preventDefault()},va=function(a,b){ba()["catch"](e.exception),b.originalEvent.preventDefault()},wa=function(a,b){ca()["catch"](e.exception),b.originalEvent.preventDefault()},xa=function(b){var c=a(b.target).prop("checked"),d=m.setDeleteMessagesForAllUsers(q,c);w(d)},ya=function(a){return function(b,c){n.go(a,o.VIEW_GROUP_INFO,{id:q.id,name:q.name,subname:q.subname,imageUrl:q.imageUrl,totalMemberCount:q.totalMemberCount},q.loggedInUserId),c.originalEvent.preventDefault()}},za=function(a,c,g,h){var j=!1,k=K(g),l=[[B.ACTION_REQUEST_BLOCK,oa(T)],[B.ACTION_REQUEST_UNBLOCK,oa(V)],[B.ACTION_REQUEST_ADD_CONTACT,oa(Z)],[B.ACTION_REQUEST_REMOVE_CONTACT,oa(X)],[B.ACTION_REQUEST_DELETE_CONVERSATION,oa(fa)],[B.ACTION_CANCEL_EDIT_MODE,ra],[B.ACTION_VIEW_CONTACT,sa(a)],[B.ACTION_VIEW_GROUP_INFO,ya(a)],[B.ACTION_CONFIRM_FAVOURITE,ta],[B.ACTION_CONFIRM_MUTE,va],[B.ACTION_CONFIRM_UNFAVOURITE,ua],[B.ACTION_CONFIRM_UNMUTE,wa]],n=[[B.ACTION_CANCEL_CONFIRM,oa(ha)],[B.ACTION_CONFIRM_BLOCK,oa(U)],[B.ACTION_CONFIRM_UNBLOCK,oa(W)],[B.ACTION_CONFIRM_ADD_CONTACT,oa($)],[B.ACTION_CONFIRM_REMOVE_CONTACT,oa(Y)],[B.ACTION_CONFIRM_DELETE_SELECTED_MESSAGES,oa(ea)],[B.ACTION_CONFIRM_DELETE_CONVERSATION,oa(ga)],[B.ACTION_REQUEST_ADD_CONTACT,oa(Z)],[B.ACTION_ACCEPT_CONTACT_REQUEST,oa(ia)],[B.ACTION_DECLINE_CONTACT_REQUEST,oa(ja)],[B.MESSAGE,qa],[B.DELETE_MESSAGES_FOR_ALL_USERS_TOGGLE,xa]],p=[[B.SEND_MESSAGE_BUTTON,pa],[B.ACTION_REQUEST_DELETE_SELECTED_MESSAGES,oa(da)],[B.ACTION_REQUEST_ADD_CONTACT,oa(Z)],[B.ACTION_REQUEST_UNBLOCK,oa(V)]];b.init(h),d.define(c,[d.events.activate]),d.define(g,[d.events.activate]),d.define(h,[d.events.activate,d.events.enter]),d.define(k,[d.events.scrollTop,d.events.scrollLock]),k.on(d.events.scrollTop,function(a,b){var c=Object.keys(q.members).length>1;if(!u&&!j&&!I()&&c){j=!0;var d=m.setLoadingMessages(q,!0);w(d).then(function(){return Q(q.id,z,G(),y,[])}).then(function(){j=!1,H(G()+z)})["catch"](function(a){j=!1,e.exception(a)})}b.originalEvent.preventDefault()}),l.forEach(function(a){var b=a[0],e=a[1];c.on(d.events.activate,b,e)}),n.forEach(function(a){var b=a[0],c=a[1];g.on(d.events.activate,b,c)}),p.forEach(function(a){var b=a[0],c=a[1];h.on(d.events.activate,b,c)}),h.on(d.events.enter,B.MESSAGE_TEXT_AREA,function(a,b){var c=h.attr("data-enter-to-send");c&&"false"!=c&&"0"!=c&&pa(a,b)}),f.subscribe(i.ROUTE_CHANGED,function(a){t&&a.route!=o.VIEW_CONVERSATION&&t.stop()})},Aa=function(a){t&&t.stop(),t=new c(R(a,y),function(a){return a?2*a:A}),t.start()},Ba=function(a,b,c){var d=c.id,e=parseInt(a.attr("data-midnight"),10),f=m.buildInitialState(e,d,b);return q||(q=f),t&&t.stop(),w(f)},Ca=function(a,b,c){return Ba(a,null,b).then(function(){return b.id!=c?h.getConversationBetweenUsers(b.id,c,!0,!0,0,0,z,0,y):h.getSelfConversation(b.id,z,0,y)}).then(function(c){return Ea(a,c,b)})["catch"](function(){return M(b,c)})},Da=function(a,b,c){var d=null;return b in p&&(d=p[b]),Ba(a,b,c).then(function(){if(d){var a=d.state;return a=m.setLoadingMessages(a,!1),a=m.setLoadingMembers(a,!1),H(d.messagesOffset),J(d.loadedAllMessages),w(a)}return O(b,c,z,0,y)}).then(function(){return Aa(b)})},Ea=function(a,b,c){var d=null;return b.id in p&&(d=p[b.id]),Ba(a,b.id,c).then(function(){if(d){var a=d.state;return a=m.setLoadingMessages(a,!1),a=m.setLoadingMembers(a,!1),H(d.messagesOffset),J(d.loadedAllMessages),w(a)}return P(b,c,z,y)}).then(function(){return Aa(b.id)})},Fa=function(b,c,d,f,g,h,i){var k=null,l=null;g&&null!==g&&"object"==typeof g?(k=g,l=parseInt(k.id,10)):(k=null,l=parseInt(g,10),l=isNaN(l)?null:l),!l&&h&&i&&(l=E(i));var m=!q||q.id!=l||i&&i!=D();if(d.attr("data-init")||(w=na(c,d,f,m),za(b,c,d,f),d.attr("data-init",!0)),m){u=!0;var n=null,o=F(d);return n=k?Ea(d,k,o,i):l?Da(d,l,o,i):Ca(d,o,i),n.then(function(){u=!1,c.find(j.SELECTORS.CAN_RECEIVE_FOCUS).first().focus()})["catch"](function(a){u=!1,e.exception(a)})}if(Aa(l),q.type==C.PRIVATE&&h){var p=D();switch(h){case"block":return T(p);case"unblock":return V(p);case"add-contact":return Z(p);case"remove-contact":return X(p)}}return a.Deferred().resolve().promise()},Ga=function(){return g.get_string("messagedrawerviewconversation","core_message",q.name)};return{show:Fa,description:Ga}});
\ No newline at end of file
+define(["jquery","core/auto_rows","core/backoff_timer","core/custom_interaction_events","core/notification","core/pubsub","core/str","core_message/message_repository","core_message/message_drawer_events","core_message/message_drawer_view_conversation_constants","core_message/message_drawer_view_conversation_patcher","core_message/message_drawer_view_conversation_renderer","core_message/message_drawer_view_conversation_state_manager","core_message/message_drawer_router","core_message/message_drawer_routes"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o){var p={},q=null,r=!1,s=0,t=null,u=!1,v=[],w=!0,x=!1,y=null,z=[],A=j.NEWEST_MESSAGES_FIRST,B=j.LOAD_MESSAGE_LIMIT,C=j.MILLISECONDS_IN_SEC,D=j.SELECTORS,E=j.CONVERSATION_TYPES,F=function(){if(!q||q.type==E.PUBLIC)return null;var a=q.loggedInUserId;if(q.type==E.SELF)return a;var b=Object.keys(q.members).filter(function(b){return a!=b});return b.length?b[0]:null},G=function(a){return Object.keys(p).reduce(function(b,c){if(!b){var d=p[c].state;d.type!=E.PUBLIC&&a in d.members&&(b=d.id)}return b},null)},H=function(a){return{id:parseInt(a.attr("data-user-id"),10),fullname:null,profileimageurl:null,profileimageurlsmall:null,isonline:null,showonlinestatus:null,isblocked:null,iscontact:null,isdeleted:null,canmessage:null,requirescontact:null,contactrequests:[]}},I=function(){return s},J=function(a){s=a,p[q.id].messagesOffset=a},K=function(){return r},L=function(a){r=a,p[q.id].loadedAllMessages=a},M=function(a){return a.find(D.MESSAGES_CONTAINER)},N=function(b){return{id:b.id,name:b.name,subname:b.subname,imageUrl:b.imageUrl,isFavourite:b.isFavourite,isMuted:b.isMuted,type:b.type,totalMemberCount:b.totalMemberCount,loggedInUserId:b.loggedInUserId,messages:b.messages.map(function(b){return a.extend({},b)}),members:Object.keys(b.members).map(function(c){var d=a.extend({},b.members[c]);return d.contactrequests=b.members[c].contactrequests.map(function(b){return a.extend({},b)}),d})}},O=function(a,b){var c=a.id,d=c==b?E.SELF:E.PRIVATE,f=m.setLoadingMembers(q,!0);return f=m.setLoadingMessages(f,!0),y(f),h.getMemberInfo(c,[b],!0,!0).then(function(a){if(a.length)return a[0];throw new Error("Unable to load other user profile")}).then(function(b){var c=d==E.SELF?[b]:[b,a],e=m.addMembers(q,c);return e=m.setLoadingMembers(e,!1),e=m.setLoadingMessages(e,!1),e=m.setName(e,b.fullname),e=m.setType(e,d),e=m.setImageUrl(e,b.profileimageurl),e=m.setTotalMemberCount(e,c.length),y(e),b})["catch"](function(a){var b=m.setLoadingMembers(q,!1);y(b),e.exception(a)})},P=function(a,b){var c=null;if(a.type==E.PRIVATE){var d=a.members.filter(function(a){return a.id!=b});c=d.length?d[0]:null}else a.type==E.SELF&&(c=a.members[0]);var e=a.name,f=a.imageurl;a.type!=E.PUBLIC&&(e=e||c?c.fullname:"",f=f||c?c.profileimageurl:"");var g=m.addMembers(q,a.members);return g=m.setName(g,e),g=m.setSubname(g,a.subname),g=m.setType(g,a.type),g=m.setImageUrl(g,f),g=m.setTotalMemberCount(g,a.membercount),g=m.setIsFavourite(g,a.isfavourite),g=m.setIsMuted(g,a.ismuted),g=m.addMessages(g,a.messages),g=m.setCanDeleteMessagesForAllUsers(g,a.candeletemessagesforallusers)},Q=function(a,b,c,d,f){var g=b.id,i=m.setLoadingMembers(q,!0);return i=m.setLoadingMessages(i,!0),y(i),h.getConversation(g,a,!0,!0,0,0,c+1,d,f).then(function(a){return a.messages.length>c?a.messages=a.messages.slice(1):L(!0),J(d+c),a}).then(function(a){var c=a.members.filter(function(a){return a.id==b.id});c.length<1&&(a.members=a.members.concat([b]));var d=P(a,b.id);return d=m.setLoadingMembers(d,!1),d=m.setLoadingMessages(d,!1),y(d).then(function(){return a})}).then(function(){return U(a)})["catch"](function(a){var b=m.setLoadingMembers(q,!1);b=m.setLoadingMessages(b,!1),y(b),e.exception(a)})},R=function(a,b,c,d){var f=a.members.filter(function(a){return a.id==b.id});f.length<1&&(a.members=a.members.concat([b]));var g=a.messages.length,h=g>=c,i=P(a,b.id);i=m.setLoadingMembers(i,!1),i=m.setLoadingMessages(i,!h);var j=y(i);return j.then(function(){return h?{messages:a.messages}:S(a.id,c,g,d,[])}).then(function(){var a=q.messages;return J(a.length),U(q.id),a})["catch"](e.exception)},S=function(a,b,c,d,e,f){return h.getMessages(q.loggedInUserId,a,b?b+1:b,c,d,f).then(function(a){return a.messages.length&&e.length&&(a.messages=a.messages.filter(function(a){return e.indexOf(parseInt(a.id,10))<0})),a}).then(function(a){return b?(a.messages.length>b?a.messages=a.messages.slice(0,-1):L(!0),a):a}).then(function(a){var b=a.members.filter(function(a){return!(a.id in q.members)}),c=m.addMembers(q,b);return c=m.addMessages(c,a.messages),c=m.setLoadingMessages(c,!1),y(c).then(function(){return a})})["catch"](function(a){var b=m.setLoadingMessages(q,!1);throw y(b),a})},T=function(b,c){return function(){var d=q.messages,e=d.length?d[d.length-1]:null;if(e&&!w&&!x){for(var g=[],h=d.length-1;h>=0;h--){var j=d[h];if(j.timeCreated!==e.timeCreated)break;g.push(j.id)}return S(b,0,0,c,g,e.timeCreated).then(function(a){if(a.messages.length){t.restart();var c=N(q);return f.publish(i.CONVERSATION_NEW_LAST_MESSAGE,c),U(b)}return a})}return a.Deferred().resolve().promise()}},U=function(a){var b=q.loggedInUserId;return h.markAllConversationMessagesAsRead(b,a).then(function(){var b=m.markMessagesAsRead(q,q.messages);return f.publish(i.CONVERSATION_READ,a),y(b)})},V=function(a){ja(a);var b=m.addPendingBlockUsersById(q,[a]);y(b)},W=function(a){var b=m.setLoadingConfirmAction(q,!0);return y(b),h.blockUser(q.loggedInUserId,a).then(function(b){var c=m.addMembers(q,[b]);return c=m.removePendingBlockUsersById(c,[a]),c=m.setLoadingConfirmAction(c,!1),f.publish(i.CONTACT_BLOCKED,a),y(c)})},X=function(a){ja(a);var b=m.addPendingUnblockUsersById(q,[a]);y(b)},Y=function(a){var b=m.setLoadingConfirmAction(q,!0);return y(b),h.unblockUser(q.loggedInUserId,a).then(function(b){var c=m.addMembers(q,[b]);return c=m.removePendingUnblockUsersById(c,[a]),c=m.setLoadingConfirmAction(c,!1),f.publish(i.CONTACT_UNBLOCKED,a),y(c)})},Z=function(a){ja(a);var b=m.addPendingRemoveContactsById(q,[a]);y(b)},$=function(a){var b=m.setLoadingConfirmAction(q,!0);return y(b),h.deleteContacts(q.loggedInUserId,[a]).then(function(b){var c=m.addMembers(q,b);return c=m.removePendingRemoveContactsById(c,[a]),c=m.setLoadingConfirmAction(c,!1),f.publish(i.CONTACT_REMOVED,a),y(c)})},_=function(a){ja(a);var b=m.addPendingAddContactsById(q,[a]);y(b)},aa=function(a){var b=m.setLoadingConfirmAction(q,!0);return y(b),h.createContactRequest(q.loggedInUserId,a).then(function(a){if(!a.request)throw new Error(a.warnings[0].message);return a.request}).then(function(b){var c=m.removePendingAddContactsById(q,[a]);return c=m.addContactRequests(c,[b]),c=m.setLoadingConfirmAction(c,!1),y(c)})},ba=function(){var a=q.loggedInUserId,b=q.id;return h.setFavouriteConversations(a,[b]).then(function(){var a=m.setIsFavourite(q,!0);return y(a)}).then(function(){return f.publish(i.CONVERSATION_SET_FAVOURITE,N(q))})},ca=function(){var a=q.loggedInUserId,b=q.id;return h.unsetFavouriteConversations(a,[b]).then(function(){var a=m.setIsFavourite(q,!1);return y(a)}).then(function(){return f.publish(i.CONVERSATION_UNSET_FAVOURITE,N(q))})},da=function(){var a=q.loggedInUserId,b=q.id;return h.setMutedConversations(a,[b]).then(function(){var a=m.setIsMuted(q,!0);return y(a)}).then(function(){return f.publish(i.CONVERSATION_SET_MUTED,N(q))})},ea=function(){var a=q.loggedInUserId,b=q.id;return h.unsetMutedConversations(a,[b]).then(function(){var a=m.setIsMuted(q,!1);return y(a)}).then(function(){return f.publish(i.CONVERSATION_UNSET_MUTED,N(q))})},fa=function(a){var b=q.selectedMessageIds;ja(a);var c=m.addPendingDeleteMessagesById(q,b);y(c)},ga=function(){var a=q.pendingDeleteMessageIds,b=m.setLoadingConfirmAction(q,!0);y(b);var c=null;return c=b.deleteMessagesForAllUsers?h.deleteMessagesForAllUsers(q.loggedInUserId,a):h.deleteMessages(q.loggedInUserId,a),c.then(function(){var b=m.removeMessagesById(q,a);b=m.removePendingDeleteMessagesById(b,a),b=m.removeSelectedMessagesById(b,a),b=m.setLoadingConfirmAction(b,!1),b=m.setDeleteMessagesForAllUsers(b,!1);var c=q.messages[q.messages.length-1],d=b.messages.length?b.messages[b.messages.length-1]:null;if(d&&d.id!=c.id){var e=N(b);f.publish(i.CONVERSATION_NEW_LAST_MESSAGE,e)}else b.messages.length||f.publish(i.CONVERSATION_DELETED,b.id);return y(b)})},ha=function(a){ja(a);var b=m.setPendingDeleteConversation(q,!0);y(b)},ia=function(){var a=m.setLoadingConfirmAction(q,!0);return y(a),h.deleteConversation(q.loggedInUserId,q.id).then(function(){var a=m.removeMessages(q,q.messages);return a=m.removeSelectedMessagesById(a,q.selectedMessageIds),a=m.setPendingDeleteConversation(a,!1),a=m.setLoadingConfirmAction(a,!1),f.publish(i.CONVERSATION_DELETED,a.id),y(a)})},ja=function(a){var b=q.pendingDeleteMessageIds,c=m.removePendingAddContactsById(q,[a]);c=m.removePendingRemoveContactsById(c,[a]),c=m.removePendingUnblockUsersById(c,[a]),c=m.removePendingBlockUsersById(c,[a]),c=m.removePendingDeleteMessagesById(c,b),c=m.setPendingDeleteConversation(c,!1),c=m.setDeleteMessagesForAllUsers(c,!1),y(c)},ka=function(a){var b=q.loggedInUserId,c=q.members[a].contactrequests.filter(function(a){return a.requesteduserid==b}),d=c[0],e=m.setLoadingConfirmAction(q,!0);return y(e),h.acceptContactRequest(a,b).then(function(a){var b=m.removeContactRequests(q,[d]);return b=m.addMembers(q,[a]),b=m.setLoadingConfirmAction(b,!1),y(b)}).then(function(){f.publish(i.CONTACT_ADDED,q.members[a]),f.publish(i.CONTACT_REQUEST_ACCEPTED,d)})},la=function(a){var b=q.loggedInUserId,c=q.members[a].contactrequests.filter(function(a){return a.requesteduserid==b}),d=c[0],e=m.setLoadingConfirmAction(q,!0);return y(e),h.declineContactRequest(a,b).then(function(a){var b=m.removeContactRequests(q,[d]);return b=m.addMembers(q,[a]),b=m.setLoadingConfirmAction(b,!1),y(b)}).then(function(){f.publish(i.CONTACT_REQUEST_DECLINED,d)})},ma=function(a,b){x=!0;var c=m.setSendingMessage(q,!0),d=null;y(c);var g=null,j=null;if(a||q.type==E.PUBLIC)g=h.sendMessageToConversation(a,b);else{var k=F();g=h.sendMessageToUser(k,b).then(function(a){return d=parseInt(a.conversationid,10),j=a.candeletemessagesforallusers,a})}g.then(function(a){var b=m.addMessages(q,[a]);b=m.setSendingMessage(b,!1);var c=N(b);b.id||(b=m.setId(b,d),c.id=d,Da(d),f.publish(i.CONVERSATION_CREATED,c),b=m.setCanDeleteMessagesForAllUsers(b,j)),y(b),x=!1,f.publish(i.CONVERSATION_NEW_LAST_MESSAGE,c)})["catch"](function(a){x=!1;var b=m.setSendingMessage(q,!1);y(b),e.exception(a)})},na=function(a){var b=q;b=q.selectedMessageIds.indexOf(a)>-1?m.removeSelectedMessagesById(q,[a]):m.addSelectedMessagesById(q,[a]),y(b)},oa=function(){ja(F());var a=m.removeSelectedMessagesById(q,q.selectedMessageIds);y(a)},pa=function(b,c,d){if(!u&&v.length){u=!0;var f=v.shift(),g=z.map(function(a){return a(f.patch)});a.when.apply(null,g).then(function(){u=!1,f.deferred.resolve(!0),pa(b,c,d)})["catch"](function(a){u=!1,f.deferred.reject(a),e.exception(a)})}},qa=function(b,c,d,e){var f=function(a){return l.render(b,c,d,a)};if(!e){var g=m.buildInitialState(q.midnight,q.loggedInUserId,q.id),h=k.buildPatch(g,q);f(h)}return z.push(f),function(e){var f=k.buildPatch(q,e),g=a.Deferred();return Object.keys(f).length?v.push({patch:f,deferred:g}):g.resolve(!0),q=e,e.id&&(p[e.id]={state:e,messagesOffset:I(),loadedAllMessages:K()}),pa(b,c,d),g.promise()}},ra=function(a){return function(b,c){if(!q.loadingConfirmAction){a(F());var d=m.setLoadingConfirmAction(q,!1);y(d)}c.originalEvent.preventDefault()}},sa=function(b,c){var d=a(b.target),e=d.closest(D.FOOTER_CONTAINER),f=e.find(D.MESSAGE_TEXT_AREA),g=f.val().trim();""!==g&&ma(q.id,g),c.originalEvent.preventDefault()},ta=function(b,c){var d=window.getSelection(),e=a(b.target);if(""==d.toString()&&!e.is("a")){var f=e.closest(D.MESSAGE),g=parseInt(f.attr("data-message-id"),10);na(g),c.originalEvent.preventDefault()}},ua=function(a,b){oa(),b.originalEvent.preventDefault()},va=function(a){return function(b,c){var d=F(),e=q.members[d];n.go(a,o.VIEW_CONTACT,e),c.originalEvent.preventDefault()}},wa=function(a,b){ba()["catch"](e.exception),b.originalEvent.preventDefault()},xa=function(a,b){ca()["catch"](e.exception),b.originalEvent.preventDefault()},ya=function(a,b){da()["catch"](e.exception),b.originalEvent.preventDefault()},za=function(a,b){ea()["catch"](e.exception),b.originalEvent.preventDefault()},Aa=function(b){var c=a(b.target).prop("checked"),d=m.setDeleteMessagesForAllUsers(q,c);y(d)},Ba=function(a){return function(b,c){n.go(a,o.VIEW_GROUP_INFO,{id:q.id,name:q.name,subname:q.subname,imageUrl:q.imageUrl,totalMemberCount:q.totalMemberCount},q.loggedInUserId),c.originalEvent.preventDefault()}},Ca=function(a,c,g,h){var j=!1,k=M(g),l=[[D.ACTION_REQUEST_BLOCK,ra(V)],[D.ACTION_REQUEST_UNBLOCK,ra(X)],[D.ACTION_REQUEST_ADD_CONTACT,ra(_)],[D.ACTION_REQUEST_REMOVE_CONTACT,ra(Z)],[D.ACTION_REQUEST_DELETE_CONVERSATION,ra(ha)],[D.ACTION_CANCEL_EDIT_MODE,ua],[D.ACTION_VIEW_CONTACT,va(a)],[D.ACTION_VIEW_GROUP_INFO,Ba(a)],[D.ACTION_CONFIRM_FAVOURITE,wa],[D.ACTION_CONFIRM_MUTE,ya],[D.ACTION_CONFIRM_UNFAVOURITE,xa],[D.ACTION_CONFIRM_UNMUTE,za]],n=[[D.ACTION_CANCEL_CONFIRM,ra(ja)],[D.ACTION_CONFIRM_BLOCK,ra(W)],[D.ACTION_CONFIRM_UNBLOCK,ra(Y)],[D.ACTION_CONFIRM_ADD_CONTACT,ra(aa)],[D.ACTION_CONFIRM_REMOVE_CONTACT,ra($)],[D.ACTION_CONFIRM_DELETE_SELECTED_MESSAGES,ra(ga)],[D.ACTION_CONFIRM_DELETE_CONVERSATION,ra(ia)],[D.ACTION_REQUEST_ADD_CONTACT,ra(_)],[D.ACTION_ACCEPT_CONTACT_REQUEST,ra(ka)],[D.ACTION_DECLINE_CONTACT_REQUEST,ra(la)],[D.MESSAGE,ta],[D.DELETE_MESSAGES_FOR_ALL_USERS_TOGGLE,Aa]],p=[[D.SEND_MESSAGE_BUTTON,sa],[D.ACTION_REQUEST_DELETE_SELECTED_MESSAGES,ra(fa)],[D.ACTION_REQUEST_ADD_CONTACT,ra(_)],[D.ACTION_REQUEST_UNBLOCK,ra(X)]];b.init(h),d.define(c,[d.events.activate]),d.define(g,[d.events.activate]),d.define(h,[d.events.activate,d.events.enter]),d.define(k,[d.events.scrollTop,d.events.scrollLock]),k.on(d.events.scrollTop,function(a,b){var c=Object.keys(q.members).length>1;if(!w&&!j&&!K()&&c){j=!0;var d=m.setLoadingMessages(q,!0);y(d),S(q.id,B,I(),A,[]).then(function(){j=!1,J(I()+B)})["catch"](function(a){j=!1,e.exception(a)})}b.originalEvent.preventDefault()}),l.forEach(function(a){var b=a[0],e=a[1];c.on(d.events.activate,b,e)}),n.forEach(function(a){var b=a[0],c=a[1];g.on(d.events.activate,b,c)}),p.forEach(function(a){var b=a[0],c=a[1];h.on(d.events.activate,b,c)}),h.on(d.events.enter,D.MESSAGE_TEXT_AREA,function(a,b){var c=h.attr("data-enter-to-send");c&&"false"!=c&&"0"!=c&&sa(a,b)}),f.subscribe(i.ROUTE_CHANGED,function(a){t&&a.route!=o.VIEW_CONVERSATION&&t.stop()})},Da=function(a){t&&t.stop(),t=new c(T(a,A),c.getIncrementalCallback(q.messagePollMin*C,C,q.messagePollMax*C,q.messagePollAfterMax*C)),t.start()},Ea=function(a,b,c){w=!0,u=!1,v=[],x=!1;var d=c.id,e=parseInt(a.attr("data-midnight"),10),f=parseInt(a.attr("data-message-poll-min"),10),g=parseInt(a.attr("data-message-poll-max"),10),h=parseInt(a.attr("data-message-poll-after-max"),10),i=m.buildInitialState(e,d,b,f,g,h);q||(q=i),t&&t.stop(),y(i)},Fa=function(a,b,c){Ea(a,null,b);var d=null;return d=b.id!=c?h.getConversationBetweenUsers(b.id,c,!0,!0,0,0,B,0,A):h.getSelfConversation(b.id,B,0,A),d.then(function(c){return Ha(a,c,b)})["catch"](function(){return O(b,c)})},Ga=function(b,c,d){var e=null;c in p&&(e=p[c]),Ea(b,c,d);var f=a.Deferred().resolve({}).promise();if(e){var g=e.state;g=m.setLoadingMessages(g,!1),g=m.setLoadingMembers(g,!1),J(e.messagesOffset),L(e.loadedAllMessages),y(g)}else f=Q(c,d,B,0,A);return f.then(function(){return Da(c)})},Ha=function(b,c,d){var e=null;c.id in p&&(e=p[c.id]),Ea(b,c.id,d);var f=a.Deferred().resolve({}).promise();if(e){var g=e.state;g=m.setLoadingMessages(g,!1),g=m.setLoadingMembers(g,!1),J(e.messagesOffset),L(e.loadedAllMessages),y(g)}else f=R(c,d,B,A);return f.then(function(){return Da(c.id)})},Ia=function(b,c,d,f,g,h,i){var k=null,l=null;g&&null!==g&&"object"==typeof g?(k=g,l=parseInt(k.id,10)):(k=null,l=parseInt(g,10),l=isNaN(l)?null:l),!l&&h&&i&&(l=G(i));var m=!q||q.id!=l||i&&i!=F();if(d.attr("data-init")||(y=qa(c,d,f,m),Ca(b,c,d,f),d.attr("data-init",!0)),m){var n=null,o=H(d);return n=k?Ha(d,k,o,i):l?Ga(d,l,o,i):Fa(d,o,i),n.then(function(){w=!1,c.find(j.SELECTORS.CAN_RECEIVE_FOCUS).first().focus()})["catch"](function(a){w=!1,e.exception(a)})}if(Da(l),q.type==E.PRIVATE&&h){var p=F();switch(h){case"block":return V(p);case"unblock":return X(p);case"add-contact":return _(p);case"remove-contact":return Z(p)}}return a.Deferred().resolve().promise()},Ja=function(){return g.get_string("messagedrawerviewconversation","core_message",q.name)};return{show:Ia,description:Ja}});
\ No newline at end of file
diff --git a/message/amd/build/message_drawer_view_conversation_constants.min.js b/message/amd/build/message_drawer_view_conversation_constants.min.js
index 2abab80dce2ab..130466d9b8da5 100644
--- a/message/amd/build/message_drawer_view_conversation_constants.min.js
+++ b/message/amd/build/message_drawer_view_conversation_constants.min.js
@@ -1 +1 @@
-define([],function(){var a={ACTION_ACCEPT_CONTACT_REQUEST:'[data-action="accept-contact-request"]',ACTION_CANCEL_CONFIRM:'[data-action="cancel-confirm"]',ACTION_CANCEL_EDIT_MODE:'[data-action="cancel-edit-mode"]',ACTION_CONFIRM_ADD_CONTACT:'[data-action="confirm-add-contact"]',ACTION_CONFIRM_BLOCK:'[data-action="confirm-block"]',ACTION_CONFIRM_DELETE_SELECTED_MESSAGES:'[data-action="confirm-delete-selected-messages"]',ACTION_CONFIRM_DELETE_CONVERSATION:'[data-action="confirm-delete-conversation"]',ACTION_CONFIRM_FAVOURITE:'[data-action="confirm-favourite"]',ACTION_CONFIRM_MUTE:'[data-action="confirm-mute"]',ACTION_CONFIRM_UNFAVOURITE:'[data-action="confirm-unfavourite"]',ACTION_CONFIRM_REMOVE_CONTACT:'[data-action="confirm-remove-contact"]',ACTION_CONFIRM_UNBLOCK:'[data-action="confirm-unblock"]',ACTION_CONFIRM_UNMUTE:'[data-action="confirm-unmute"]',ACTION_DECLINE_CONTACT_REQUEST:'[data-action="decline-contact-request"]',ACTION_REQUEST_ADD_CONTACT:'[data-action="request-add-contact"]',ACTION_REQUEST_BLOCK:'[data-action="request-block"]',ACTION_REQUEST_DELETE_CONVERSATION:'[data-action="request-delete-conversation"]',ACTION_REQUEST_DELETE_SELECTED_MESSAGES:'[data-action="delete-selected-messages"]',ACTION_REQUEST_REMOVE_CONTACT:'[data-action="request-remove-contact"]',ACTION_REQUEST_UNBLOCK:'[data-action="request-unblock"]',ACTION_VIEW_CONTACT:'[data-action="view-contact"]',ACTION_VIEW_GROUP_INFO:'[data-action="view-group-info"]',CAN_RECEIVE_FOCUS:'input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]',CONFIRM_DIALOGUE_BUTTON_TEXT:'[data-region="dialogue-button-text"]',CONFIRM_DIALOGUE_CANCEL_BUTTON:'[data-action="cancel-confirm"]',CONFIRM_DIALOGUE_CONTAINER:'[data-region="confirm-dialogue-container"]',CONFIRM_DIALOGUE_HEADER:'[data-region="dialogue-header"]',CONFIRM_DIALOGUE_TEXT:'[data-region="dialogue-text"]',CONTACT_REQUEST_SENT_MESSAGE_CONTAINER:'[data-region="contact-request-sent-message-container"]',CONTENT_PLACEHOLDER_CONTAINER:'[data-region="content-placeholder"]',CONTENT_CONTAINER:'[data-region="content-container"]',CONTENT_MESSAGES_CONTAINER:'[data-region="content-message-container"]',CONTENT_MESSAGES_FOOTER_CONTAINER:'[data-region="content-messages-footer-container"]',CONTENT_MESSAGES_FOOTER_EDIT_MODE_CONTAINER:'[data-region="content-messages-footer-edit-mode-container"]',CONTENT_MESSAGES_FOOTER_REQUIRE_CONTACT_CONTAINER:'[data-region="content-messages-footer-require-contact-container"]',CONTENT_MESSAGES_FOOTER_REQUIRE_UNBLOCK_CONTAINER:'[data-region="content-messages-footer-require-unblock-container"]',CONTENT_MESSAGES_FOOTER_UNABLE_TO_MESSAGE_CONTAINER:'[data-region="content-messages-footer-unable-to-message"]',DAY_MESSAGES_CONTAINER:'[data-region="day-messages-container"]',DELETE_MESSAGES_FOR_ALL_USERS_TOGGLE:'[data-region="delete-messages-for-all-users-toggle"]',DELETE_MESSAGES_FOR_ALL_USERS_TOGGLE_CONTAINER:'[data-region="delete-messages-for-all-users-toggle-container"]',FAVOURITE_ICON_CONTAINER:'[data-region="favourite-icon-container"]',FOOTER_CONTAINER:'[data-region="content-messages-footer-container"]',HEADER:'[data-region="header-content"]',HEADER_EDIT_MODE:'[data-region="header-edit-mode"]',HEADER_PLACEHOLDER_CONTAINER:'[data-region="header-placeholder"]',LOADING_ICON_CONTAINER:'[data-region="loading-icon-container"]',MESSAGE:'[data-region="message"]',MESSAGE_NOT_SELECTED:'[data-region="message"][aria-checked="false"]',MESSAGE_NOT_SELECTED_ICON:'[data-region="not-selected-icon"]',MESSAGE_SELECTED_ICON:'[data-region="selected-icon"]',MESSAGES:'[data-region="content-message-container"]',MESSAGES_CONTAINER:'[data-region="content-message-container"]',MESSAGES_SELECTED_COUNT:'[data-region="message-selected-court"]',MESSAGE_TEXT_AREA:'[data-region="send-message-txt"]',MORE_MESSAGES_LOADING_ICON_CONTAINER:'[data-region="more-messages-loading-icon-container"]',MUTED_ICON_CONTAINER:'[data-region="muted-icon-container"]',PLACEHOLDER_CONTAINER:'[data-region="placeholder-container"]',SELF_CONVERSATION_MESSAGE_CONTAINER:'[data-region="self-conversation-message-container"]',SEND_MESSAGE_BUTTON:'[data-action="send-message"]',SEND_MESSAGE_ICON_CONTAINER:'[data-region="send-icon-container"]',TEXT:'[data-region="text"]',TITLE:'[data-region="title"]'},b={HEADER_PRIVATE:"core_message/message_drawer_view_conversation_header_content_type_private",HEADER_PRIVATE_NO_CONTROLS:"core_message/message_drawer_view_conversation_header_content_type_private_no_controls",HEADER_PUBLIC:"core_message/message_drawer_view_conversation_header_content_type_public",HEADER_SELF:"core_message/message_drawer_view_conversation_header_content_type_self",DAY:"core_message/message_drawer_view_conversation_body_day",MESSAGE:"core_message/message_drawer_view_conversation_body_message",MESSAGES:"core_message/message_drawer_view_conversation_body_messages"},c={PRIVATE:1,PUBLIC:2,SELF:3};return{SELECTORS:a,TEMPLATES:b,CONVERSATION_TYPES:c,NEWEST_MESSAGES_FIRST:!0,LOAD_MESSAGE_LIMIT:100,INITIAL_NEW_MESSAGE_POLL_TIMEOUT:1e3}});
\ No newline at end of file
+define([],function(){var a={ACTION_ACCEPT_CONTACT_REQUEST:'[data-action="accept-contact-request"]',ACTION_CANCEL_CONFIRM:'[data-action="cancel-confirm"]',ACTION_CANCEL_EDIT_MODE:'[data-action="cancel-edit-mode"]',ACTION_CONFIRM_ADD_CONTACT:'[data-action="confirm-add-contact"]',ACTION_CONFIRM_BLOCK:'[data-action="confirm-block"]',ACTION_CONFIRM_DELETE_SELECTED_MESSAGES:'[data-action="confirm-delete-selected-messages"]',ACTION_CONFIRM_DELETE_CONVERSATION:'[data-action="confirm-delete-conversation"]',ACTION_CONFIRM_FAVOURITE:'[data-action="confirm-favourite"]',ACTION_CONFIRM_MUTE:'[data-action="confirm-mute"]',ACTION_CONFIRM_UNFAVOURITE:'[data-action="confirm-unfavourite"]',ACTION_CONFIRM_REMOVE_CONTACT:'[data-action="confirm-remove-contact"]',ACTION_CONFIRM_UNBLOCK:'[data-action="confirm-unblock"]',ACTION_CONFIRM_UNMUTE:'[data-action="confirm-unmute"]',ACTION_DECLINE_CONTACT_REQUEST:'[data-action="decline-contact-request"]',ACTION_REQUEST_ADD_CONTACT:'[data-action="request-add-contact"]',ACTION_REQUEST_BLOCK:'[data-action="request-block"]',ACTION_REQUEST_DELETE_CONVERSATION:'[data-action="request-delete-conversation"]',ACTION_REQUEST_DELETE_SELECTED_MESSAGES:'[data-action="delete-selected-messages"]',ACTION_REQUEST_REMOVE_CONTACT:'[data-action="request-remove-contact"]',ACTION_REQUEST_UNBLOCK:'[data-action="request-unblock"]',ACTION_VIEW_CONTACT:'[data-action="view-contact"]',ACTION_VIEW_GROUP_INFO:'[data-action="view-group-info"]',CAN_RECEIVE_FOCUS:'input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]',CONFIRM_DIALOGUE_BUTTON_TEXT:'[data-region="dialogue-button-text"]',CONFIRM_DIALOGUE_CANCEL_BUTTON:'[data-action="cancel-confirm"]',CONFIRM_DIALOGUE_CONTAINER:'[data-region="confirm-dialogue-container"]',CONFIRM_DIALOGUE_HEADER:'[data-region="dialogue-header"]',CONFIRM_DIALOGUE_TEXT:'[data-region="dialogue-text"]',CONTACT_REQUEST_SENT_MESSAGE_CONTAINER:'[data-region="contact-request-sent-message-container"]',CONTENT_PLACEHOLDER_CONTAINER:'[data-region="content-placeholder"]',CONTENT_CONTAINER:'[data-region="content-container"]',CONTENT_MESSAGES_CONTAINER:'[data-region="content-message-container"]',CONTENT_MESSAGES_FOOTER_CONTAINER:'[data-region="content-messages-footer-container"]',CONTENT_MESSAGES_FOOTER_EDIT_MODE_CONTAINER:'[data-region="content-messages-footer-edit-mode-container"]',CONTENT_MESSAGES_FOOTER_REQUIRE_CONTACT_CONTAINER:'[data-region="content-messages-footer-require-contact-container"]',CONTENT_MESSAGES_FOOTER_REQUIRE_UNBLOCK_CONTAINER:'[data-region="content-messages-footer-require-unblock-container"]',CONTENT_MESSAGES_FOOTER_UNABLE_TO_MESSAGE_CONTAINER:'[data-region="content-messages-footer-unable-to-message"]',DAY_MESSAGES_CONTAINER:'[data-region="day-messages-container"]',DELETE_MESSAGES_FOR_ALL_USERS_TOGGLE:'[data-region="delete-messages-for-all-users-toggle"]',DELETE_MESSAGES_FOR_ALL_USERS_TOGGLE_CONTAINER:'[data-region="delete-messages-for-all-users-toggle-container"]',FAVOURITE_ICON_CONTAINER:'[data-region="favourite-icon-container"]',FOOTER_CONTAINER:'[data-region="content-messages-footer-container"]',HEADER:'[data-region="header-content"]',HEADER_EDIT_MODE:'[data-region="header-edit-mode"]',HEADER_PLACEHOLDER_CONTAINER:'[data-region="header-placeholder"]',LOADING_ICON_CONTAINER:'[data-region="loading-icon-container"]',MESSAGE:'[data-region="message"]',MESSAGE_NOT_SELECTED:'[data-region="message"][aria-checked="false"]',MESSAGE_NOT_SELECTED_ICON:'[data-region="not-selected-icon"]',MESSAGE_SELECTED_ICON:'[data-region="selected-icon"]',MESSAGES:'[data-region="content-message-container"]',MESSAGES_CONTAINER:'[data-region="content-message-container"]',MESSAGES_SELECTED_COUNT:'[data-region="message-selected-court"]',MESSAGE_TEXT_AREA:'[data-region="send-message-txt"]',MORE_MESSAGES_LOADING_ICON_CONTAINER:'[data-region="more-messages-loading-icon-container"]',MUTED_ICON_CONTAINER:'[data-region="muted-icon-container"]',PLACEHOLDER_CONTAINER:'[data-region="placeholder-container"]',SELF_CONVERSATION_MESSAGE_CONTAINER:'[data-region="self-conversation-message-container"]',SEND_MESSAGE_BUTTON:'[data-action="send-message"]',SEND_MESSAGE_ICON_CONTAINER:'[data-region="send-icon-container"]',TEXT:'[data-region="text"]',TITLE:'[data-region="title"]'},b={HEADER_PRIVATE:"core_message/message_drawer_view_conversation_header_content_type_private",HEADER_PRIVATE_NO_CONTROLS:"core_message/message_drawer_view_conversation_header_content_type_private_no_controls",HEADER_PUBLIC:"core_message/message_drawer_view_conversation_header_content_type_public",HEADER_SELF:"core_message/message_drawer_view_conversation_header_content_type_self",DAY:"core_message/message_drawer_view_conversation_body_day",MESSAGE:"core_message/message_drawer_view_conversation_body_message",MESSAGES:"core_message/message_drawer_view_conversation_body_messages"},c={PRIVATE:1,PUBLIC:2,SELF:3};return{SELECTORS:a,TEMPLATES:b,CONVERSATION_TYPES:c,NEWEST_MESSAGES_FIRST:!0,LOAD_MESSAGE_LIMIT:100,MILLISECONDS_IN_SEC:1e3}});
\ No newline at end of file
diff --git a/message/amd/build/message_drawer_view_conversation_patcher.min.js b/message/amd/build/message_drawer_view_conversation_patcher.min.js
index e346c141aaf10..223d02f17dce1 100644
--- a/message/amd/build/message_drawer_view_conversation_patcher.min.js
+++ b/message/amd/build/message_drawer_view_conversation_patcher.min.js
@@ -1 +1 @@
-define(["jquery","core/user_date","core_message/message_drawer_view_conversation_constants"],function(a,b,c){var d=function(a,c){var d=a.reduce(function(a,d){var e=b.getUserMidnightForTimestamp(d.timeCreated,c);return a.hasOwnProperty(e)?a[e].push(d):a[e]=[d],a},{});return Object.keys(d).map(function(a){return{timestamp:a,messages:d[a]}})},e=function(a,b,c){b=b.slice();var d=[],e=[],f=[];return a.forEach(function(a){for(var d=!1,g=0;g<b.length;g++){var h=b[g];if(c(a,h)){d=!0,f.push({a:a,b:h});break}}d?b.splice(g,1):e.push(a)}),d=b,{missingFromA:d,missingFromB:e,matches:f}},f=function(a,b){for(var c=null,d=0;d<a.length;d++){var e=a[d];if(b(e))return e}return c},g=function(a,b){a.sort(),b.sort();var c=a.length,d=b.length;return c<1&&d<1||c==d&&a.every(function(a,c){return a==b[c]})},h=function(a,b){return{remove:b.missingFromB,add:b.missingFromA.map(function(b){var c=f(a,function(a){return b.timestamp<a.timestamp});return{before:c,value:b}})}},i=function(a){var b=[],c=[];return a.forEach(function(a){var d=a.a,g=a.b,h=e(d.messages,g.messages,function(a,b){return a.id==b.id});b=b.concat(h.missingFromB),h.missingFromA.forEach(function(a){var b=f(d.messages,function(b){return a.timeCreated==b.timeCreated?a.id<b.id:a.timeCreated<b.timeCreated});c.push({before:b,value:a,day:d})})}),{add:c,remove:b}},j=function(a,b){var c=a.messages.map(function(a){return a.id}),f=b.messages.map(function(a){return a.id});if(g(c,f))return null;var j=d(a.messages,a.midnight),k=d(b.messages,b.midnight),l=e(j,k,function(a,b){return a.timestamp==b.timestamp});return{days:h(j,l),messages:i(l.matches)}},k=function(a,b){var d=I(a,b),e=y(a,b),f=G(a),g=G(b),h=d&&d.show&&!d.hasMessages,i=d&&!d.show,j=!f&&g;return j=j||h||i,j=j||null!==e,j?{type:c.CONVERSATION_TYPES.PRIVATE,showControls:!h&&!e,context:{id:b.id,name:b.name,subname:b.subname,totalmembercount:b.totalMemberCount,imageurl:b.imageUrl,isfavourite:b.isFavourite,ismuted:b.isMuted,showfavourite:null!==b.id,userid:g.id,showonlinestatus:g.showonlinestatus,isonline:g.isonline,isblocked:g.isblocked,iscontact:g.iscontact}}:null},l=function(a,b){var d=null===a.name&&null!==b.name;return d?{type:c.CONVERSATION_TYPES.SELF,showControls:!1,context:{id:b.id,name:b.name,subname:b.subname,imageurl:b.imageUrl,isfavourite:b.isFavourite,showfavourite:null!==b.id,showonlinestatus:!0}}:null},m=function(a,b){var d=a.totalMemberCount,e=b.totalMemberCount;return d!=e?{type:c.CONVERSATION_TYPES.PUBLIC,showControls:!0,context:{id:b.id,name:b.name,subname:b.subname,totalmembercount:b.totalMemberCount,imageurl:b.imageUrl,isfavourite:b.isFavourite,ismuted:b.isMuted,showfavourite:null!==b.id}}:null},n=function(a,b){var c=a.messages,d=b.messages;if(d.length<1)return null;if(c.length<1)return d[d.length-1].id;var e=c[a.messages.length-1],f=d[d.length-1],g=c[0],h=d[0];return e.id!=f.id?f.id:g.id!=h.id?g.id:null},o=function(a,b){return!(a.loadingMembers||!b.loadingMembers)||!(a.loadingMembers&&!b.loadingMembers)&&null},p=function(a,b){return a.hasTriedToLoadMessages===b.hasTriedToLoadMessages?null:!(b.hasTriedToLoadMessages||!b.loadingMessages)||!(b.hasTriedToLoadMessages&&!b.loadingMessages)&&null},q=function(a,b){return!(a.loadingMessages||!b.loadingMessages)||!(a.loadingMessages&&!b.loadingMessages)&&null},r=function(a,b){return!(a.sendingMessage||!b.sendingMessage)||!(a.sendingMessage&&!b.sendingMessage)&&null},s=function(a,b){if(b.pendingBlockUserIds.length){var c=b.pendingBlockUserIds[0];return b.members[c]}return!a.pendingBlockUserIds.length&&null},t=function(a,b){if(b.pendingUnblockUserIds.length){var c=b.pendingUnblockUserIds[0];return b.members[c]}return!a.pendingUnblockUserIds.length&&null},u=function(a,b){if(b.pendingAddContactIds.length){var c=b.pendingAddContactIds[0];return b.members[c]}return!a.pendingAddContactIds.length&&null},v=function(a,b){if(b.pendingRemoveContactIds.length){var c=b.pendingRemoveContactIds[0];return b.members[c]}return!a.pendingRemoveContactIds.length&&null},w=function(a,b){var c=a.pendingDeleteMessageIds.length,d=b.pendingDeleteMessageIds.length;return d&&!c?{show:!0,type:b.type,canDeleteMessagesForAllUsers:b.canDeleteMessagesForAllUsers}:c&&!d?{show:!1}:null},x=function(a,b){return!a.pendingDeleteConversation&&b.pendingDeleteConversation?b.type:!(a.pendingDeleteConversation&&!b.pendingDeleteConversation)&&null},y=function(a,b){var c=a.loggedInUserId,d=G(a),e=G(b),f=d?d.contactrequests.filter(function(a){return a.requesteduserid==c&&a.userid==d.id}):[],g=e?e.contactrequests.filter(function(a){return a.requesteduserid==c&&a.userid==e.id}):[],h=f.length?f[0]:null,i=g.length?g[0]:null;return!h&&i?e:!(h&&!i)&&null},z=function(a,b){var c=G(a),d=G(b);return c||d?!c&&d?!!d.isblocked||null:!d&&c?!c.isblocked&&null:!(c.isblocked&&!d.isblocked)&&(!(c.isblocked||!d.isblocked)||null):null},A=function(a,b){var c=a.isFavourite,d=b.isFavourite;return null===a.id&&null===b.id?null:null===a.id&&null!==b.id?"show-add":null!==a.id&&null===b.id?"hide":c==d?null:!c&&d?"show-remove":c&&!d?"show-add":null},B=function(a,b){var c=a.isMuted,d=b.isMuted;return null===a.id&&null===b.id?null:null===a.id&&null!==b.id?"show-mute":null!==a.id&&null===b.id?"hide":c==d?null:!c&&d?"show-unmute":c&&!d?"show-mute":null},C=function(a,b){var c=a.loggedInUserId,d=G(a),e=G(b),f=d?d.contactrequests.filter(function(a){return a.userid==c&&a.requesteduserid==d.id||a.userid==d.id&&a.requesteduserid==c}):[],g=e?e.contactrequests.filter(function(a){return a.userid==c&&a.requesteduserid==e.id||a.userid==e.id&&a.requesteduserid==c}):[],h=f.length>0,i=g.length>0;return d||e?h&&i?null:h||!i||e.iscontact?!d&&e?e.iscontact?"contact":null:!e&&d?d.iscontact?"non-contact":null:d.iscontact&&!e.iscontact?i?"pending-contact":"non-contact":!d.iscontact&&e.iscontact?"contact":null:"pending-contact":null},D=function(a,b){return!(a.loadingConfirmAction||!b.loadingConfirmAction)||!(a.loadingConfirmAction&&!b.loadingConfirmAction)&&null},E=function(a,b){var c=a.selectedMessageIds.length>0,d=b.selectedMessageIds.length>0,e=a.messages.length!=b.messages.length;return!(c||!d)||!(c&&!d)&&(!(!c||!e)||null)},F=function(a,b){var c=a.selectedMessageIds,d=b.selectedMessageIds;if(g(c,d))return null;var f=e(c,d,function(a,b){return a==b});return{count:d.length,add:f.missingFromA,remove:f.missingFromB}},G=function(a){return Object.keys(a.members).reduce(function(b,c){return c==a.loggedInUserId||b||(b=a.members[c]),b},null)},H=function(a,b){var c=b.contactrequests.filter(function(b){return b.userid==a||b.requesteduserid}),d=c.length>0;return b.requirescontact&&!b.iscontact&&!d},I=function(a,b){var c=G(a),d=G(b),e=a.messages.length>0,f=b.messages.length>0,g=b.loggedInUserId,h=c&&H(g,c),i=d&&H(g,d),j=u(a,b),k=j===!1;if(!a.hasTriedToLoadMessages&&!b.hasTriedToLoadMessages)return null;if(!c&&!d)return null;if(!c&&i)return{show:!0,hasMessages:f,user:d};if(k&&i)return{show:!0,hasMessages:f,user:d};if(a.hasTriedToLoadMessages&&b.hasTriedToLoadMessages){if(!h&&i)return{show:!0,hasMessages:f,user:d};if(h&&!i)return{show:!1,hasMessages:f}}return!a.hasTriedToLoadMessages&&b.hasTriedToLoadMessages&&i?{show:!0,hasMessages:f,user:d}:a.hasTriedToLoadMessages&&!b.hasTriedToLoadMessages&&h?{show:!1,hasMessages:e}:null},J=function(a,b){var c=G(a),d=G(b);return c||d?c&&!d?!c.isblocked&&null:!c&&d?!!d.isblocked||null:!(c.isblocked||!d.isblocked)||!(c.isblocked&&!d.isblocked)&&null:null},K=function(a,b){var d=G(a),e=G(b);return b.type==c.CONVERSATION_TYPES.SELF?null:d||e?d&&!e?!d.canmessage||null:!d&&e?!e.canmessage||null:!(!d.canmessage&&e.canmessage)&&(!(!d.canmessage||e.canmessage)||null):null},L=function(a,b){var c=p(a,b),d=E(a,b),e=I(a,b),f=J(a,b),g=K(a,b),h=null!==e?e.show&&e.hasMessages:null,i=G(b),j=function(a,c){if(a)return c;if(null!==a&&!a){if(!i)return{type:"content"};if(i.isblocked)return{type:"unblock"};if(b.messages.length&&H(b.loggedInUserId,i))return{type:"add-contact",user:i};if(!i.canmessage||i.requirescontact&&!i.iscontact)return{type:"unable-to-message"}}return null};if(null===c&&null===d&&null===e&&null===f)return null;for(var k=[[c,{type:"placeholder"}],[d,{type:"edit-mode"}],[g,{type:"unable-to-message"}],[f,{type:"unblock"}],[h,{type:"add-contact",user:i}]],l=0;l<k.length;l++){var m=k[l][0],n=k[l][1],o=j(m,n);if(null!==o)return o}return{type:"content"}},M=function(a,b){var c=p(a,b),d=E(a,b);return null===c&&null===d?null:c?{type:"placeholder"}:d?{type:"edit-mode"}:{type:"content"}},N=function(a,b){var c=a.type,d=b.type,e=a.id,f=b.id,g=Object.keys(a.members),h=Object.keys(b.members);g.sort(),h.sort();var i=g.every(function(a,b){return a==h[b]});return c!=d||(!(!e||f)||(!(!e||!f||e==f)||(!(e||f||i)||null)))},O=function(a,b){return a.type!=b.type?b.type==c.CONVERSATION_TYPES.SELF:null},P=function(a,b){var c=b.loggedInUserId,d=G(a),e=G(b),f=d?d.contactrequests.filter(function(a){return a.userid==c}):[],g=e?e.contactrequests.filter(function(a){return a.userid==c}):[],h=f.length>0,i=g.length>0,j=a.messages.length>0,k=a.messages.length>0;return h||!i||e.iscontact||k?!(d&&!d.iscontact&&i&&e.iscontact)&&(!(h&&!i)&&(!(!j&&k)&&null)):e.fullname},Q=function(b,d){var e={all:{reset:N,conversation:j,scrollToMessage:n,loadingMembers:o,loadingFirstMessages:p,loadingMessages:q,sendingMessage:r,confirmDeleteSelectedMessages:w,inEditMode:E,selectedMessages:F,isFavourite:A,isMuted:B}};e[c.CONVERSATION_TYPES.PRIVATE]={header:k,footer:L,confirmBlockUser:s,confirmUnblockUser:t,confirmAddContact:u,confirmRemoveContact:v,confirmContactRequest:y,confirmDeleteConversation:x,isBlocked:z,isContact:C,loadingConfirmAction:D,requireAddContact:I,contactRequestSent:P},e[c.CONVERSATION_TYPES.PUBLIC]={header:m,footer:M},e[c.CONVERSATION_TYPES.SELF]={header:l,footer:M,confirmDeleteConversation:x,selfConversationMessage:O};var f=a.extend({},e.all);return d.type&&d.type in e&&(f=a.extend(f,e[d.type])),Object.keys(f).reduce(function(a,c){var e=f[c],g=e(b,d);return null!==g&&(a[c]=g),a},{})};return{buildPatch:Q}});
\ No newline at end of file
+define(["jquery","core/user_date","core_message/message_drawer_view_conversation_constants"],function(a,b,c){var d=function(a,c){var d=a.reduce(function(a,d){var e=b.getUserMidnightForTimestamp(d.timeCreated,c);return a.hasOwnProperty(e)?a[e].push(d):a[e]=[d],a},{});return Object.keys(d).map(function(a){return{timestamp:a,messages:d[a]}})},e=function(a,b,c){b=b.slice();var d=[],e=[],f=[];return a.forEach(function(a){for(var d=!1,g=0;g<b.length;g++){var h=b[g];if(c(a,h)){d=!0,f.push({a:a,b:h});break}}d?b.splice(g,1):e.push(a)}),d=b,{missingFromA:d,missingFromB:e,matches:f}},f=function(a,b){for(var c=null,d=0;d<a.length;d++){var e=a[d];if(b(e))return e}return c},g=function(a,b){a.sort(),b.sort();var c=a.length,d=b.length;return c<1&&d<1||c==d&&a.every(function(a,c){return a==b[c]})},h=function(a,b){return{remove:b.missingFromB,add:b.missingFromA.map(function(b){var c=f(a,function(a){return b.timestamp<a.timestamp});return{before:c,value:b}})}},i=function(a){var b=[],c=[];return a.forEach(function(a){var d=a.a,g=a.b,h=e(d.messages,g.messages,function(a,b){return a.id==b.id});b=b.concat(h.missingFromB),h.missingFromA.forEach(function(a){var b=f(d.messages,function(b){return a.timeCreated==b.timeCreated?a.id<b.id:a.timeCreated<b.timeCreated});c.push({before:b,value:a,day:d})})}),{add:c,remove:b}},j=function(a,b){var c=a.messages.map(function(a){return a.id}),f=b.messages.map(function(a){return a.id});if(g(c,f))return null;var j=d(a.messages,a.midnight),k=d(b.messages,b.midnight),l=e(j,k,function(a,b){return a.timestamp==b.timestamp});return{days:h(j,l),messages:i(l.matches)}},k=function(a,b){var d=I(a,b),e=y(a,b),f=G(a),g=G(b),h=d&&d.show&&!d.hasMessages,i=d&&!d.show,j=!f&&g;return j=j||h||i,j=j||null!==e,j?{type:c.CONVERSATION_TYPES.PRIVATE,showControls:!h&&!e,context:{id:b.id,name:b.name,subname:b.subname,totalmembercount:b.totalMemberCount,imageurl:b.imageUrl,isfavourite:b.isFavourite,ismuted:b.isMuted,showfavourite:null!==b.id,userid:g.id,showonlinestatus:g.showonlinestatus,isonline:g.isonline,isblocked:g.isblocked,iscontact:g.iscontact}}:null},l=function(a,b){var d=null===a.name&&null!==b.name;return d?{type:c.CONVERSATION_TYPES.SELF,showControls:!1,context:{id:b.id,name:b.name,subname:b.subname,imageurl:b.imageUrl,isfavourite:b.isFavourite,showfavourite:null!==b.id,showonlinestatus:!0}}:null},m=function(a,b){var d=a.totalMemberCount,e=b.totalMemberCount;return d!=e?{type:c.CONVERSATION_TYPES.PUBLIC,showControls:!0,context:{id:b.id,name:b.name,subname:b.subname,totalmembercount:b.totalMemberCount,imageurl:b.imageUrl,isfavourite:b.isFavourite,ismuted:b.isMuted,showfavourite:null!==b.id}}:null},n=function(a,b){var c=a.messages,d=b.messages;if(d.length<1)return null;if(c.length<1)return d[d.length-1].id;var e=c[a.messages.length-1],f=d[d.length-1],g=c[0],h=d[0];return e.id!=f.id?f.id:g.id!=h.id?g.id:null},o=function(a,b){return!(a.loadingMembers||!b.loadingMembers)||!(a.loadingMembers&&!b.loadingMembers)&&null},p=function(a,b){return a.hasTriedToLoadMessages===b.hasTriedToLoadMessages?null:!(b.hasTriedToLoadMessages||!b.loadingMessages)||!(b.hasTriedToLoadMessages&&!b.loadingMessages)&&null},q=function(a,b){return!(a.loadingMessages||!b.loadingMessages)||!(a.loadingMessages&&!b.loadingMessages)&&null},r=function(a,b){return!(a.sendingMessage||!b.sendingMessage)||!(a.sendingMessage&&!b.sendingMessage)&&null},s=function(a,b){if(b.pendingBlockUserIds.length){var c=b.pendingBlockUserIds[0];return b.members[c]}return!a.pendingBlockUserIds.length&&null},t=function(a,b){if(b.pendingUnblockUserIds.length){var c=b.pendingUnblockUserIds[0];return b.members[c]}return!a.pendingUnblockUserIds.length&&null},u=function(a,b){if(b.pendingAddContactIds.length){var c=b.pendingAddContactIds[0];return b.members[c]}return!a.pendingAddContactIds.length&&null},v=function(a,b){if(b.pendingRemoveContactIds.length){var c=b.pendingRemoveContactIds[0];return b.members[c]}return!a.pendingRemoveContactIds.length&&null},w=function(a,b){var c=a.pendingDeleteMessageIds.length,d=b.pendingDeleteMessageIds.length;return d&&!c?{show:!0,type:b.type,canDeleteMessagesForAllUsers:b.canDeleteMessagesForAllUsers}:c&&!d?{show:!1}:null},x=function(a,b){return!a.pendingDeleteConversation&&b.pendingDeleteConversation?b.type:!(a.pendingDeleteConversation&&!b.pendingDeleteConversation)&&null},y=function(a,b){var c=a.loggedInUserId,d=G(a),e=G(b),f=d?d.contactrequests.filter(function(a){return a.requesteduserid==c&&a.userid==d.id}):[],g=e?e.contactrequests.filter(function(a){return a.requesteduserid==c&&a.userid==e.id}):[],h=f.length?f[0]:null,i=g.length?g[0]:null;return!h&&i?e:!(h&&!i)&&null},z=function(a,b){var c=G(a),d=G(b);return c||d?!c&&d?!!d.isblocked||null:!d&&c?!c.isblocked&&null:!(c.isblocked&&!d.isblocked)&&(!(c.isblocked||!d.isblocked)||null):null},A=function(a,b){var c=a.isFavourite,d=b.isFavourite;return null===a.id&&null===b.id?null:null===a.id&&null!==b.id?"show-add":null!==a.id&&null===b.id?"hide":c==d?null:!c&&d?"show-remove":c&&!d?"show-add":null},B=function(a,b){var c=a.isMuted,d=b.isMuted;return null===a.id&&null===b.id?null:null===a.id&&null!==b.id?"show-mute":null!==a.id&&null===b.id?"hide":c==d?null:!c&&d?"show-unmute":c&&!d?"show-mute":null},C=function(a,b){var c=a.loggedInUserId,d=G(a),e=G(b),f=d?d.contactrequests.filter(function(a){return a.userid==c&&a.requesteduserid==d.id||a.userid==d.id&&a.requesteduserid==c}):[],g=e?e.contactrequests.filter(function(a){return a.userid==c&&a.requesteduserid==e.id||a.userid==e.id&&a.requesteduserid==c}):[],h=f.length>0,i=g.length>0;return d||e?h&&i?null:h||!i||e.iscontact?!d&&e?e.iscontact?"contact":null:!e&&d?d.iscontact?"non-contact":null:d.iscontact&&!e.iscontact?i?"pending-contact":"non-contact":!d.iscontact&&e.iscontact?"contact":null:"pending-contact":null},D=function(a,b){return!(a.loadingConfirmAction||!b.loadingConfirmAction)||!(a.loadingConfirmAction&&!b.loadingConfirmAction)&&null},E=function(a,b){var c=a.selectedMessageIds.length>0,d=b.selectedMessageIds.length>0,e=a.messages.length!=b.messages.length;return!(c||!d)||!(c&&!d)&&(!(!c||!e)||null)},F=function(a,b){var c=a.selectedMessageIds,d=b.selectedMessageIds;if(g(c,d))return null;var f=e(c,d,function(a,b){return a==b});return{count:d.length,add:f.missingFromA,remove:f.missingFromB}},G=function(a){return Object.keys(a.members).reduce(function(b,c){return c==a.loggedInUserId||b||(b=a.members[c]),b},null)},H=function(a,b){if(b.canmessage)return!1;var c=b.contactrequests.filter(function(b){return b.userid==a||b.requesteduserid}),d=c.length>0;return b.requirescontact&&!b.iscontact&&!d},I=function(a,b){var c=G(a),d=G(b),e=a.messages.length>0,f=b.messages.length>0,g=b.loggedInUserId,h=c&&H(g,c),i=d&&H(g,d),j=u(a,b),k=j===!1;if(!a.hasTriedToLoadMessages&&!b.hasTriedToLoadMessages)return null;if(!c&&!d)return null;if(!c&&i)return{show:!0,hasMessages:f,user:d};if(k&&i)return{show:!0,hasMessages:f,user:d};if(a.hasTriedToLoadMessages&&b.hasTriedToLoadMessages){if(!h&&i)return{show:!0,hasMessages:f,user:d};if(h&&!i)return{show:!1,hasMessages:f}}return!a.hasTriedToLoadMessages&&b.hasTriedToLoadMessages&&i?{show:!0,hasMessages:f,user:d}:a.hasTriedToLoadMessages&&!b.hasTriedToLoadMessages&&h?{show:!1,hasMessages:e}:null},J=function(a,b){var c=G(a),d=G(b);return c||d?c&&!d?!c.isblocked&&null:!c&&d?!!d.isblocked||null:!(c.isblocked||!d.isblocked)||!(c.isblocked&&!d.isblocked)&&null:null},K=function(a,b){var d=G(a),e=G(b);return b.type==c.CONVERSATION_TYPES.SELF?null:d||e?d&&!e?!d.canmessage||null:!d&&e?!e.canmessage||null:!(!d.canmessage&&e.canmessage)&&(!(!d.canmessage||e.canmessage)||null):null},L=function(a,b){var c=p(a,b),d=E(a,b),e=I(a,b),f=J(a,b),g=K(a,b),h=null!==e?e.show&&e.hasMessages:null,i=G(b),j=function(a,c){if(a)return c;if(null!==a&&!a){if(!i)return{type:"content"};if(i.isblocked)return{type:"unblock"};if(b.messages.length&&H(b.loggedInUserId,i))return{type:"add-contact",user:i};if(!i.canmessage&&i.requirescontact&&!i.iscontact)return{type:"unable-to-message"}}return null};if(null===c&&null===d&&null===e&&null===f)return null;for(var k=[[c,{type:"placeholder"}],[d,{type:"edit-mode"}],[g,{type:"unable-to-message"}],[f,{type:"unblock"}],[h,{type:"add-contact",user:i}]],l=0;l<k.length;l++){var m=k[l][0],n=k[l][1],o=j(m,n);if(null!==o)return o}return{type:"content"}},M=function(a,b){var c=p(a,b),d=E(a,b);return null===c&&null===d?null:c?{type:"placeholder"}:d?{type:"edit-mode"}:{type:"content"}},N=function(a,b){var c=a.type,d=b.type,e=a.id,f=b.id,g=Object.keys(a.members),h=Object.keys(b.members);g.sort(),h.sort();var i=g.every(function(a,b){return a==h[b]});return c!=d||(!(!e||f)||(!(!e||!f||e==f)||(!(e||f||i)||null)))},O=function(a,b){return a.type!=b.type?b.type==c.CONVERSATION_TYPES.SELF:null},P=function(a,b){var c=b.loggedInUserId,d=G(a),e=G(b),f=d?d.contactrequests.filter(function(a){return a.userid==c}):[],g=e?e.contactrequests.filter(function(a){return a.userid==c}):[],h=f.length>0,i=g.length>0,j=a.messages.length>0,k=a.messages.length>0;return h||!i||e.iscontact||k?!(d&&!d.iscontact&&i&&e.iscontact)&&(!(h&&!i)&&(!(!j&&k)&&null)):e.fullname},Q=function(b,d){var e={all:{reset:N,conversation:j,scrollToMessage:n,loadingMembers:o,loadingFirstMessages:p,loadingMessages:q,sendingMessage:r,confirmDeleteSelectedMessages:w,inEditMode:E,selectedMessages:F,isFavourite:A,isMuted:B}};e[c.CONVERSATION_TYPES.PRIVATE]={header:k,footer:L,confirmBlockUser:s,confirmUnblockUser:t,confirmAddContact:u,confirmRemoveContact:v,confirmContactRequest:y,confirmDeleteConversation:x,isBlocked:z,isContact:C,loadingConfirmAction:D,requireAddContact:I,contactRequestSent:P},e[c.CONVERSATION_TYPES.PUBLIC]={header:m,footer:M},e[c.CONVERSATION_TYPES.SELF]={header:l,footer:M,confirmDeleteConversation:x,selfConversationMessage:O};var f=a.extend({},e.all);return d.type&&d.type in e&&(f=a.extend(f,e[d.type])),Object.keys(f).reduce(function(a,c){var e=f[c],g=e(b,d);return null!==g&&(a[c]=g),a},{})};return{buildPatch:Q}});
\ No newline at end of file
diff --git a/message/amd/build/message_drawer_view_conversation_state_manager.min.js b/message/amd/build/message_drawer_view_conversation_state_manager.min.js
index baa15c2287bcf..759a316b042b3 100644
--- a/message/amd/build/message_drawer_view_conversation_state_manager.min.js
+++ b/message/amd/build/message_drawer_view_conversation_state_manager.min.js
@@ -1 +1 @@
-define(["jquery"],function(a){var b=function(b){return a.extend(!0,{},b)},c=function(a,b,c){return a.map(function(a){var d=a.useridfrom==b;return{id:parseInt(a.id,10),isRead:a.isread,fromLoggedInUser:d,userFrom:c[a.useridfrom],text:a.text,timeCreated:parseInt(a.timecreated,10)}})},d=function(a){return a.map(function(a){return{id:a.id,fullname:a.fullname,profileurl:a.profileurl,profileimageurl:a.profileimageurl,profileimageurlsmall:a.profileimageurlsmall,isonline:a.isonline,showonlinestatus:a.showonlinestatus,isblocked:a.isblocked,iscontact:a.iscontact,isdeleted:a.isdeleted,canmessage:a.canmessage,requirescontact:a.requirescontact,contactrequests:a.contactrequests||[]}})},e=function(a,b,c){return{midnight:a,loggedInUserId:b,id:c,name:null,subname:null,type:null,totalMemberCount:null,imageUrl:null,isFavourite:null,isMuted:null,canDeleteMessagesForAllUsers:!1,deleteMessagesForAllUsers:!1,members:{},messages:[],hasTriedToLoadMessages:!1,loadingMessages:!0,sendingMessage:!1,loadingMembers:!0,loadingConfirmAction:!1,pendingBlockUserIds:[],pendingUnblockUserIds:[],pendingRemoveContactIds:[],pendingAddContactIds:[],pendingDeleteMessageIds:[],pendingDeleteConversation:!1,selectedMessageIds:[]}},f=function(a,d){var e=b(a),f=c(d,a.loggedInUserId,a.members),g=a.messages.concat(f);return g.sort(function(a,b){return a.timeCreated<b.timeCreated?-1:a.timeCreated>b.timeCreated?1:a.id<b.id?-1:a.id>b.id?1:0}),e.messages=g.filter(function(a,b,c){return!b||a.id!==c[b-1].id}),e},g=function(a,c){var d=b(a),e=c.map(function(a){return a.id});return d.messages=d.messages.filter(function(a){return e.indexOf(a.id)<0}),d},h=function(a,c){var d=b(a);return d.messages=d.messages.filter(function(a){return c.indexOf(a.id)<0}),d},i=function(a,c){var e=b(a),f=d(c);return f.forEach(function(a){e.members[a.id]=a}),e},j=function(a,c){var d=b(a);return c.forEach(function(a){delete d.members[a.id]}),d},k=function(a,c){var d=b(a);return d.loadingMessages=c,a.loadingMessages&&!c&&(d.hasTriedToLoadMessages=!0),d},l=function(a,c){var d=b(a);return d.sendingMessage=c,d},m=function(a,c){var d=b(a);return d.loadingMembers=c,d},n=function(a,c){var d=b(a);return d.id=c,d},o=function(a,c){var d=b(a);return d.name=c,d},p=function(a,c){var d=b(a);return d.subname=c,d},q=function(a,c){var d=b(a);return d.type=c,d},r=function(a,c){var d=b(a);return d.isFavourite=c,d},s=function(a,c){var d=b(a);return d.isMuted=c,d},t=function(a,c){var d=b(a);return d.totalMemberCount=c,d},u=function(a,c){var d=b(a);return d.imageUrl=c,d},v=function(a,c){var d=b(a);return d.loadingConfirmAction=c,d},w=function(a,c){var d=b(a);return d.pendingDeleteConversation=c,d},x=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingBlockUserIds.push(a)}),d},y=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingRemoveContactIds.push(a)}),d},z=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingUnblockUserIds.push(a)}),d},A=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingAddContactIds.push(a)}),d},B=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingDeleteMessageIds.push(a)}),d},C=function(a,c){var d=b(a);return d.pendingBlockUserIds=d.pendingBlockUserIds.filter(function(a){return c.indexOf(a)<0}),d},D=function(a,c){var d=b(a);return d.pendingRemoveContactIds=d.pendingRemoveContactIds.filter(function(a){return c.indexOf(a)<0}),d},E=function(a,c){var d=b(a);return d.pendingUnblockUserIds=d.pendingUnblockUserIds.filter(function(a){return c.indexOf(a)<0}),d},F=function(a,c){var d=b(a);return d.pendingAddContactIds=d.pendingAddContactIds.filter(function(a){return c.indexOf(a)<0}),d},G=function(a,c){var d=b(a);return d.pendingDeleteMessageIds=d.pendingDeleteMessageIds.filter(function(a){return c.indexOf(a)<0}),d},H=function(a,c){var d=b(a);return d.selectedMessageIds=d.selectedMessageIds.concat(c),d},I=function(a,c){var d=b(a);return d.selectedMessageIds=d.selectedMessageIds.filter(function(a){return c.indexOf(a)<0}),d},J=function(a,c){var d=b(a),e=c.map(function(a){return a.id});return d.messages=d.messages.map(function(a){return e.indexOf(a.id)>=0&&(a.isRead=!0),a}),d},K=function(a,c){var d=b(a);return c.forEach(function(a){var b=a.userid,c=a.requesteduserid;d.members[b].contactrequests.push(a),d.members[c].contactrequests.push(a)}),d},L=function(a,c){var d=b(a);return c.forEach(function(a){var b=a.userid,c=a.requesteduserid;d.members[b].contactrequests=d.members[b].contactrequests.filter(function(a){return a.userid!=b}),d.members[c].contactrequests=d.members[c].contactrequests.filter(function(a){return a.requesteduserid!=c})}),d},M=function(a,c){var d=b(a);return d.canDeleteMessagesForAllUsers=c,d},N=function(a,c){var d=b(a);return d.deleteMessagesForAllUsers=c,d};return{buildInitialState:e,addMessages:f,removeMessages:g,removeMessagesById:h,addMembers:i,removeMembers:j,setLoadingMessages:k,setSendingMessage:l,setLoadingMembers:m,setId:n,setName:o,setSubname:p,setType:q,setIsFavourite:r,setIsMuted:s,setCanDeleteMessagesForAllUsers:M,setDeleteMessagesForAllUsers:N,setTotalMemberCount:t,setImageUrl:u,setLoadingConfirmAction:v,setPendingDeleteConversation:w,addPendingBlockUsersById:x,addPendingRemoveContactsById:y,addPendingUnblockUsersById:z,addPendingAddContactsById:A,addPendingDeleteMessagesById:B,removePendingBlockUsersById:C,removePendingRemoveContactsById:D,removePendingUnblockUsersById:E,removePendingAddContactsById:F,removePendingDeleteMessagesById:G,addSelectedMessagesById:H,removeSelectedMessagesById:I,markMessagesAsRead:J,addContactRequests:K,removeContactRequests:L}});
\ No newline at end of file
+define(["jquery"],function(a){var b=function(b){return a.extend(!0,{},b)},c=function(a,b,c){return a.map(function(a){var d=a.useridfrom==b;return{id:parseInt(a.id,10),isRead:a.isread,fromLoggedInUser:d,userFrom:c[a.useridfrom],text:a.text,timeCreated:parseInt(a.timecreated,10)}})},d=function(a){return a.map(function(a){return{id:a.id,fullname:a.fullname,profileurl:a.profileurl,profileimageurl:a.profileimageurl,profileimageurlsmall:a.profileimageurlsmall,isonline:a.isonline,showonlinestatus:a.showonlinestatus,isblocked:a.isblocked,iscontact:a.iscontact,isdeleted:a.isdeleted,canmessage:a.canmessage,requirescontact:a.requirescontact,contactrequests:a.contactrequests||[]}})},e=function(a,b,c,d,e,f){return{midnight:a,loggedInUserId:b,id:c,messagePollMin:d,messagePollMax:e,messagePollAfterMax:f,name:null,subname:null,type:null,totalMemberCount:null,imageUrl:null,isFavourite:null,isMuted:null,canDeleteMessagesForAllUsers:!1,deleteMessagesForAllUsers:!1,members:{},messages:[],hasTriedToLoadMessages:!1,loadingMessages:!0,sendingMessage:!1,loadingMembers:!0,loadingConfirmAction:!1,pendingBlockUserIds:[],pendingUnblockUserIds:[],pendingRemoveContactIds:[],pendingAddContactIds:[],pendingDeleteMessageIds:[],pendingDeleteConversation:!1,selectedMessageIds:[]}},f=function(a,d){var e=b(a),f=c(d,a.loggedInUserId,a.members),g=a.messages.concat(f);return g.sort(function(a,b){return a.timeCreated<b.timeCreated?-1:a.timeCreated>b.timeCreated?1:a.id<b.id?-1:a.id>b.id?1:0}),e.messages=g.filter(function(a,b,c){return!b||a.id!==c[b-1].id}),e},g=function(a,c){var d=b(a),e=c.map(function(a){return a.id});return d.messages=d.messages.filter(function(a){return e.indexOf(a.id)<0}),d},h=function(a,c){var d=b(a);return d.messages=d.messages.filter(function(a){return c.indexOf(a.id)<0}),d},i=function(a,c){var e=b(a),f=d(c);return f.forEach(function(a){e.members[a.id]=a}),e},j=function(a,c){var d=b(a);return c.forEach(function(a){delete d.members[a.id]}),d},k=function(a,c){var d=b(a);return d.loadingMessages=c,a.loadingMessages&&!c&&(d.hasTriedToLoadMessages=!0),d},l=function(a,c){var d=b(a);return d.sendingMessage=c,d},m=function(a,c){var d=b(a);return d.loadingMembers=c,d},n=function(a,c){var d=b(a);return d.id=c,d},o=function(a,c){var d=b(a);return d.name=c,d},p=function(a,c){var d=b(a);return d.subname=c,d},q=function(a,c){var d=b(a);return d.type=c,d},r=function(a,c){var d=b(a);return d.isFavourite=c,d},s=function(a,c){var d=b(a);return d.isMuted=c,d},t=function(a,c){var d=b(a);return d.totalMemberCount=c,d},u=function(a,c){var d=b(a);return d.imageUrl=c,d},v=function(a,c){var d=b(a);return d.loadingConfirmAction=c,d},w=function(a,c){var d=b(a);return d.pendingDeleteConversation=c,d},x=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingBlockUserIds.push(a)}),d},y=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingRemoveContactIds.push(a)}),d},z=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingUnblockUserIds.push(a)}),d},A=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingAddContactIds.push(a)}),d},B=function(a,c){var d=b(a);return c.forEach(function(a){d.pendingDeleteMessageIds.push(a)}),d},C=function(a,c){var d=b(a);return d.pendingBlockUserIds=d.pendingBlockUserIds.filter(function(a){return c.indexOf(a)<0}),d},D=function(a,c){var d=b(a);return d.pendingRemoveContactIds=d.pendingRemoveContactIds.filter(function(a){return c.indexOf(a)<0}),d},E=function(a,c){var d=b(a);return d.pendingUnblockUserIds=d.pendingUnblockUserIds.filter(function(a){return c.indexOf(a)<0}),d},F=function(a,c){var d=b(a);return d.pendingAddContactIds=d.pendingAddContactIds.filter(function(a){return c.indexOf(a)<0}),d},G=function(a,c){var d=b(a);return d.pendingDeleteMessageIds=d.pendingDeleteMessageIds.filter(function(a){return c.indexOf(a)<0}),d},H=function(a,c){var d=b(a);return d.selectedMessageIds=d.selectedMessageIds.concat(c),d},I=function(a,c){var d=b(a);return d.selectedMessageIds=d.selectedMessageIds.filter(function(a){return c.indexOf(a)<0}),d},J=function(a,c){var d=b(a),e=c.map(function(a){return a.id});return d.messages=d.messages.map(function(a){return e.indexOf(a.id)>=0&&(a.isRead=!0),a}),d},K=function(a,c){var d=b(a);return c.forEach(function(a){var b=a.userid,c=a.requesteduserid;d.members[b].contactrequests.push(a),d.members[c].contactrequests.push(a)}),d},L=function(a,c){var d=b(a);return c.forEach(function(a){var b=a.userid,c=a.requesteduserid;d.members[b].contactrequests=d.members[b].contactrequests.filter(function(a){return a.userid!=b}),d.members[c].contactrequests=d.members[c].contactrequests.filter(function(a){return a.requesteduserid!=c})}),d},M=function(a,c){var d=b(a);return d.canDeleteMessagesForAllUsers=c,d},N=function(a,c){var d=b(a);return d.deleteMessagesForAllUsers=c,d};return{buildInitialState:e,addMessages:f,removeMessages:g,removeMessagesById:h,addMembers:i,removeMembers:j,setLoadingMessages:k,setSendingMessage:l,setLoadingMembers:m,setId:n,setName:o,setSubname:p,setType:q,setIsFavourite:r,setIsMuted:s,setCanDeleteMessagesForAllUsers:M,setDeleteMessagesForAllUsers:N,setTotalMemberCount:t,setImageUrl:u,setLoadingConfirmAction:v,setPendingDeleteConversation:w,addPendingBlockUsersById:x,addPendingRemoveContactsById:y,addPendingUnblockUsersById:z,addPendingAddContactsById:A,addPendingDeleteMessagesById:B,removePendingBlockUsersById:C,removePendingRemoveContactsById:D,removePendingUnblockUsersById:E,removePendingAddContactsById:F,removePendingDeleteMessagesById:G,addSelectedMessagesById:H,removeSelectedMessagesById:I,markMessagesAsRead:J,addContactRequests:K,removeContactRequests:L}});
\ No newline at end of file
diff --git a/message/amd/src/message_drawer.js b/message/amd/src/message_drawer.js
index d7a1bada04776..87d4a31a77c09 100644
--- a/message/amd/src/message_drawer.js
+++ b/message/amd/src/message_drawer.js
@@ -34,7 +34,8 @@ define(
     'core_message/message_drawer_view_settings',
     'core_message/message_drawer_router',
     'core_message/message_drawer_routes',
-    'core_message/message_drawer_events'
+    'core_message/message_drawer_events',
+    'core/pending',
 ],
 function(
     $,
@@ -49,7 +50,8 @@ function(
     ViewSettings,
     Router,
     Routes,
-    Events
+    Events,
+    Pending
 ) {
 
     var SELECTORS = {
@@ -215,6 +217,22 @@ function(
             data.originalEvent.preventDefault();
         });
 
+        // These are theme-specific to help us fix random behat fails.
+        // These events target those events defined in BS3 and BS4 onwards.
+        root.on('hide.bs.collapse', '.collapse', function(e) {
+            var pendingPromise = new Pending();
+            $(e.target).one('hidden.bs.collapse', function() {
+                pendingPromise.resolve();
+            });
+        });
+
+        root.on('show.bs.collapse', '.collapse', function(e) {
+            var pendingPromise = new Pending();
+            $(e.target).one('shown.bs.collapse', function() {
+                pendingPromise.resolve();
+            });
+        });
+
         if (!alwaysVisible) {
             PubSub.subscribe(Events.SHOW, function() {
                 show(namespace, root);
@@ -267,25 +285,20 @@ function(
      * @param {Object} root The message drawer container.
      * @param {String} uniqueId Unique identifier for the Routes
      * @param {bool} alwaysVisible Should we show the app now, or wait for the user?
-     * @param {int} sendToUser Should we message someone now?
-     * @param {int} conversationId The value of the conversation id, null if none
+     * @param {Object} route
      */
-    var init = function(root, uniqueId, alwaysVisible, sendToUser, conversationId) {
+    var init = function(root, uniqueId, alwaysVisible, route) {
         root = $(root);
         createRoutes(uniqueId, root);
         registerEventListeners(uniqueId, root, alwaysVisible);
+
         if (alwaysVisible) {
             show(uniqueId, root);
-            // Are we sending to a specific user?
-            if (sendToUser) {
-                // Check if a conversation already exists, if not, create one.
-                if (conversationId) {
-                    Router.go(uniqueId, Routes.VIEW_CONVERSATION, conversationId);
-                } else {
-                    Router.go(uniqueId, Routes.VIEW_CONVERSATION, null, 'create', sendToUser);
-                }
-            } else if (conversationId) { // We aren't sending to a specific user, but to a group conversation.
-                Router.go(uniqueId, Routes.VIEW_CONVERSATION, conversationId);
+
+            if (route) {
+                var routeParams = route.params || [];
+                routeParams = [uniqueId, route.path].concat(routeParams);
+                Router.go.apply(null, routeParams);
             }
         }
     };
diff --git a/message/amd/src/message_drawer_view_contacts.js b/message/amd/src/message_drawer_view_contacts.js
index f64898a6ae5b1..ab255c78a17db 100644
--- a/message/amd/src/message_drawer_view_contacts.js
+++ b/message/amd/src/message_drawer_view_contacts.js
@@ -66,6 +66,26 @@ function(
         return body.find(SELECTORS.REQUESTS_SECTION_CONTAINER);
     };
 
+    /**
+     * Get the element that triggers showing the contacts section.
+     *
+     * @param {Object} body Contacts page body element.
+     * @return {Object}
+     */
+    var getShowContactsAction = function(body) {
+        return body.find(SELECTORS.ACTION_SHOW_CONTACTS_SECTION);
+    };
+
+    /**
+     * Get the element that triggers showing the requests section.
+     *
+     * @param {Object} body Contacts page body element.
+     * @return {Object}
+     */
+    var getShowRequestsAction = function(body) {
+        return body.find(SELECTORS.ACTION_SHOW_REQUESTS_SECTION);
+    };
+
     /**
      * Check if the given section is visible.
      *
@@ -105,8 +125,8 @@ function(
     var registerEventListeners = function(body) {
         var contactsSection = getContactsSectionContainer(body);
         var requestsSection = getRequestsSectionContainer(body);
-        var showContactsAction = body.find(SELECTORS.ACTION_SHOW_CONTACTS_SECTION);
-        var showRequestsAction = body.find(SELECTORS.ACTION_SHOW_REQUESTS_SECTION);
+        var showContactsAction = getShowContactsAction(body);
+        var showRequestsAction = getShowRequestsAction(body);
 
         showContactsAction.on('show.bs.tab', function() {
             ContactsSection.show(contactsSection);
@@ -126,9 +146,11 @@ function(
      * @param {string} namespace The route namespace.
      * @param {Object} header Contacts header container element.
      * @param {Object} body Contacts body container element.
+     * @param {Object} footer Contacts footer container element.
+     * @param {String|null} tab Tab to show, either 'requests' or 'contacts', if any.
      * @return {Object} jQuery promise
      */
-    var show = function(namespace, header, body) {
+    var show = function(namespace, header, body, footer, tab) {
         body = $(body);
 
         if (!body.attr('data-contacts-init')) {
@@ -139,6 +161,27 @@ function(
         var contactsSection = getContactsSectionContainer(body);
         var requestsSection = getRequestsSectionContainer(body);
 
+        if (tab) {
+            var showContactsAction = getShowContactsAction(body);
+            var showRequestsAction = getShowRequestsAction(body);
+
+            // Unfortunately we need to hardcode the class changes here rather than trigger
+            // the bootstrap tab functionality because the bootstrap JS doesn't appear to be
+            // loaded by this point which means the tab plugin isn't added and the event listeners
+            // haven't been set up so we can't just trigger a click either.
+            if (tab == 'requests') {
+                showContactsAction.removeClass('active');
+                contactsSection.removeClass('show active');
+                showRequestsAction.addClass('active');
+                requestsSection.addClass('show active');
+            } else {
+                showRequestsAction.removeClass('active');
+                requestsSection.removeClass('show active');
+                showContactsAction.addClass('active');
+                contactsSection.addClass('show active');
+            }
+        }
+
         if (isSectionVisible(contactsSection)) {
             ContactsSection.show(contactsSection);
         } else {
diff --git a/message/amd/src/message_drawer_view_conversation.js b/message/amd/src/message_drawer_view_conversation.js
index e2ca7e58647f8..7ff0805234ade 100644
--- a/message/amd/src/message_drawer_view_conversation.js
+++ b/message/amd/src/message_drawer_view_conversation.js
@@ -97,11 +97,13 @@ function(
     var loadedAllMessages = false;
     var messagesOffset = 0;
     var newMessagesPollTimer = null;
+    var isRendering = false;
+    var renderBuffer = [];
     // If the UI is currently resetting.
     var isResetting = true;
     // If the UI is currently sending a message.
     var isSendingMessage = false;
-    // This is the render function which will be generated when this module is
+    // These functions which will be generated when this module is
     // first called. See generateRenderFunction for details.
     var render = null;
     // The list of renderers that have been registered to render
@@ -110,7 +112,7 @@ function(
 
     var NEWEST_FIRST = Constants.NEWEST_MESSAGES_FIRST;
     var LOAD_MESSAGE_LIMIT = Constants.LOAD_MESSAGE_LIMIT;
-    var INITIAL_NEW_MESSAGE_POLL_TIMEOUT = Constants.INITIAL_NEW_MESSAGE_POLL_TIMEOUT;
+    var MILLISECONDS_IN_SEC = Constants.MILLISECONDS_IN_SEC;
     var SELECTORS = Constants.SELECTORS;
     var CONVERSATION_TYPES = Constants.CONVERSATION_TYPES;
 
@@ -279,10 +281,9 @@ function(
         var conversationType = loggedInUserId == otherUserId ? CONVERSATION_TYPES.SELF : CONVERSATION_TYPES.PRIVATE;
         var newState = StateManager.setLoadingMembers(viewState, true);
         newState = StateManager.setLoadingMessages(newState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.getMemberInfo(loggedInUserId, [otherUserId], true, true);
-            })
+        render(newState);
+
+        return Repository.getMemberInfo(loggedInUserId, [otherUserId], true, true)
             .then(function(profiles) {
                 if (profiles.length) {
                     return profiles[0];
@@ -301,10 +302,8 @@ function(
                 newState = StateManager.setType(newState, conversationType);
                 newState = StateManager.setImageUrl(newState, profile.profileimageurl);
                 newState = StateManager.setTotalMemberCount(newState, members.length);
-                return render(newState)
-                    .then(function() {
-                        return profile;
-                    });
+                render(newState);
+                return profile;
             })
             .catch(function(error) {
                 var newState = StateManager.setLoadingMembers(viewState, false);
@@ -374,20 +373,19 @@ function(
         var loggedInUserId = loggedInUserProfile.id;
         var newState = StateManager.setLoadingMembers(viewState, true);
         newState = StateManager.setLoadingMessages(newState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.getConversation(
-                    loggedInUserId,
-                    conversationId,
-                    true,
-                    true,
-                    0,
-                    0,
-                    messageLimit + 1,
-                    messageOffset,
-                    newestFirst
-                );
-            })
+        render(newState);
+
+        return Repository.getConversation(
+            loggedInUserId,
+            conversationId,
+            true,
+            true,
+            0,
+            0,
+            messageLimit + 1,
+            messageOffset,
+            newestFirst
+        )
             .then(function(conversation) {
                 if (conversation.messages.length > messageLimit) {
                     conversation.messages = conversation.messages.slice(1);
@@ -450,37 +448,30 @@ function(
             conversation.members = conversation.members.concat([loggedInUserProfile]);
         }
 
+        var messageCount = conversation.messages.length;
+        var hasLoadedEnoughMessages = messageCount >= messageLimit;
         var newState = updateStateFromConversation(conversation, loggedInUserProfile.id);
         newState = StateManager.setLoadingMembers(newState, false);
-        newState = StateManager.setLoadingMessages(newState, true);
-        var messageCount = conversation.messages.length;
-        return render(newState)
-            .then(function() {
-                if (messageCount < messageLimit) {
+        newState = StateManager.setLoadingMessages(newState, !hasLoadedEnoughMessages);
+        var renderPromise = render(newState);
+
+        return renderPromise.then(function() {
+                if (!hasLoadedEnoughMessages) {
                     // We haven't got enough messages so let's load some more.
-                    return loadMessages(conversation.id, messageLimit, messageCount, newestFirst, [])
-                        .then(function(result) {
-                            // Give the list of messages to the next handler.
-                            return result.messages;
-                        });
+                    return loadMessages(conversation.id, messageLimit, messageCount, newestFirst, []);
                 } else {
                     // We've got enough messages. No need to load any more for now.
-                    var newState = StateManager.setLoadingMessages(viewState, false);
-                    return render(newState)
-                        .then(function() {
-                            // Give the list of messages to the next handler.
-                            return conversation.messages;
-                        });
+                    return {messages: conversation.messages};
                 }
             })
-            .then(function(messages) {
+            .then(function() {
+                var messages = viewState.messages;
                 // Update the offset to reflect the number of messages we've loaded.
                 setMessagesOffset(messages.length);
+                markConversationAsRead(viewState.id);
+
                 return messages;
             })
-            .then(function() {
-                return markConversationAsRead(conversation.id);
-            })
             .catch(Notification.exception);
     };
 
@@ -627,14 +618,12 @@ function(
      * Tell the statemanager there is request to block a user and run the renderer
      * to show the block user dialogue.
      *
-     * @param  {Number} userId User id.
-     * @return {Promise} Renderer promise.
+     * @param {Number} userId User id.
      */
     var requestBlockUser = function(userId) {
-        return cancelRequest(userId).then(function() {
-            var newState = StateManager.addPendingBlockUsersById(viewState, [userId]);
-            return render(newState);
-        });
+        cancelRequest(userId);
+        var newState = StateManager.addPendingBlockUsersById(viewState, [userId]);
+        render(newState);
     };
 
     /**
@@ -646,10 +635,9 @@ function(
      */
     var blockUser = function(userId) {
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.blockUser(viewState.loggedInUserId, userId);
-            })
+        render(newState);
+
+        return Repository.blockUser(viewState.loggedInUserId, userId)
             .then(function(profile) {
                 var newState = StateManager.addMembers(viewState, [profile]);
                 newState = StateManager.removePendingBlockUsersById(newState, [userId]);
@@ -663,14 +651,12 @@ function(
      * Tell the statemanager there is a request to unblock a user and run the renderer
      * to show the unblock user dialogue.
      *
-     * @param  {Number} userId User id of user to unblock.
-     * @return {Promise} Renderer promise.
+     * @param {Number} userId User id of user to unblock.
      */
     var requestUnblockUser = function(userId) {
-        return cancelRequest(userId).then(function() {
-            var newState = StateManager.addPendingUnblockUsersById(viewState, [userId]);
-            return render(newState);
-        });
+        cancelRequest(userId);
+        var newState = StateManager.addPendingUnblockUsersById(viewState, [userId]);
+        render(newState);
     };
 
     /**
@@ -682,10 +668,9 @@ function(
      */
     var unblockUser = function(userId) {
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.unblockUser(viewState.loggedInUserId, userId);
-            })
+        render(newState);
+
+        return Repository.unblockUser(viewState.loggedInUserId, userId)
             .then(function(profile) {
                 var newState = StateManager.addMembers(viewState, [profile]);
                 newState = StateManager.removePendingUnblockUsersById(newState, [userId]);
@@ -699,14 +684,12 @@ function(
      * Tell the statemanager there is a request to remove a user from the contact list
      * and run the renderer to show the remove user from contacts dialogue.
      *
-     * @param  {Number} userId User id of user to remove from contacts.
-     * @return {Promise} Renderer promise.
+     * @param {Number} userId User id of user to remove from contacts.
      */
     var requestRemoveContact = function(userId) {
-        return cancelRequest(userId).then(function() {
-            var newState = StateManager.addPendingRemoveContactsById(viewState, [userId]);
-            return render(newState);
-        });
+        cancelRequest(userId);
+        var newState = StateManager.addPendingRemoveContactsById(viewState, [userId]);
+        render(newState);
     };
 
     /**
@@ -718,10 +701,9 @@ function(
      */
     var removeContact = function(userId) {
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.deleteContacts(viewState.loggedInUserId, [userId]);
-            })
+        render(newState);
+
+        return Repository.deleteContacts(viewState.loggedInUserId, [userId])
             .then(function(profiles) {
                 var newState = StateManager.addMembers(viewState, profiles);
                 newState = StateManager.removePendingRemoveContactsById(newState, [userId]);
@@ -735,14 +717,12 @@ function(
      * Tell the statemanager there is a request to add a user to the contact list
      * and run the renderer to show the add user to contacts dialogue.
      *
-     * @param  {Number} userId User id of user to add to contacts.
-     * @return {Promise} Renderer promise.
+     * @param {Number} userId User id of user to add to contacts.
      */
     var requestAddContact = function(userId) {
-        return cancelRequest(userId).then(function() {
-            var newState = StateManager.addPendingAddContactsById(viewState, [userId]);
-            return render(newState);
-        });
+        cancelRequest(userId);
+        var newState = StateManager.addPendingAddContactsById(viewState, [userId]);
+        render(newState);
     };
 
     /**
@@ -754,10 +734,9 @@ function(
      */
     var addContact = function(userId) {
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.createContactRequest(viewState.loggedInUserId, userId);
-            })
+        render(newState);
+
+        return Repository.createContactRequest(viewState.loggedInUserId, userId)
             .then(function(response) {
                 if (!response.request) {
                     throw new Error(response.warnings[0].message);
@@ -865,15 +844,13 @@ function(
      * Tell the statemanager there is a request to delete the selected messages
      * and run the renderer to show confirm delete messages dialogue.
      *
-     * @param  {Number} userId User id.
-     * @return {Promise} Renderer promise.
+     * @param {Number} userId User id.
      */
     var requestDeleteSelectedMessages = function(userId) {
         var selectedMessageIds = viewState.selectedMessageIds;
-        return cancelRequest(userId).then(function() {
-            var newState = StateManager.addPendingDeleteMessagesById(viewState, selectedMessageIds);
-            return render(newState);
-        });
+        cancelRequest(userId);
+        var newState = StateManager.addPendingDeleteMessagesById(viewState, selectedMessageIds);
+        render(newState);
     };
 
     /**
@@ -885,15 +862,18 @@ function(
     var deleteSelectedMessages = function() {
         var messageIds = viewState.pendingDeleteMessageIds;
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                if (newState.deleteMessagesForAllUsers) {
-                    return Repository.deleteMessagesForAllUsers(viewState.loggedInUserId, messageIds);
-                }
 
-                return Repository.deleteMessages(viewState.loggedInUserId, messageIds);
-            })
-            .then(function() {
+        render(newState);
+
+        var deleteMessagesPromise = null;
+
+        if (newState.deleteMessagesForAllUsers) {
+            deleteMessagesPromise = Repository.deleteMessagesForAllUsers(viewState.loggedInUserId, messageIds);
+        } else {
+            deleteMessagesPromise = Repository.deleteMessages(viewState.loggedInUserId, messageIds);
+        }
+
+        return deleteMessagesPromise.then(function() {
                 var newState = StateManager.removeMessagesById(viewState, messageIds);
                 newState = StateManager.removePendingDeleteMessagesById(newState, messageIds);
                 newState = StateManager.removeSelectedMessagesById(newState, messageIds);
@@ -918,14 +898,12 @@ function(
      * Tell the statemanager there is a request to delete a conversation
      * and run the renderer to show confirm delete conversation dialogue.
      *
-     * @param  {Number} userId User id of other user.
-     * @return {Promise} Renderer promise.
+     * @param {Number} userId User id of other user.
      */
     var requestDeleteConversation = function(userId) {
-        return cancelRequest(userId).then(function() {
-            var newState = StateManager.setPendingDeleteConversation(viewState, true);
-            return render(newState);
-        });
+        cancelRequest(userId);
+        var newState = StateManager.setPendingDeleteConversation(viewState, true);
+        render(newState);
     };
 
     /**
@@ -936,10 +914,9 @@ function(
      */
     var deleteConversation = function() {
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.deleteConversation(viewState.loggedInUserId, viewState.id);
-            })
+        render(newState);
+
+        return Repository.deleteConversation(viewState.loggedInUserId, viewState.id)
             .then(function() {
                 var newState = StateManager.removeMessages(viewState, viewState.messages);
                 newState = StateManager.removeSelectedMessagesById(newState, viewState.selectedMessageIds);
@@ -955,7 +932,6 @@ function(
      * Tell the statemanager to cancel all pending actions.
      *
      * @param  {Number} userId User id.
-     * @return {Promise} Renderer promise.
      */
     var cancelRequest = function(userId) {
         var pendingDeleteMessageIds = viewState.pendingDeleteMessageIds;
@@ -966,7 +942,7 @@ function(
         newState = StateManager.removePendingDeleteMessagesById(newState, pendingDeleteMessageIds);
         newState = StateManager.setPendingDeleteConversation(newState, false);
         newState = StateManager.setDeleteMessagesForAllUsers(newState, false);
-        return render(newState);
+        render(newState);
     };
 
     /**
@@ -984,10 +960,9 @@ function(
         });
         var request = requests[0];
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.acceptContactRequest(userId, loggedInUserId);
-            })
+        render(newState);
+
+        return Repository.acceptContactRequest(userId, loggedInUserId)
             .then(function(profile) {
                 var newState = StateManager.removeContactRequests(viewState, [request]);
                 newState = StateManager.addMembers(viewState, [profile]);
@@ -1016,10 +991,9 @@ function(
         });
         var request = requests[0];
         var newState = StateManager.setLoadingConfirmAction(viewState, true);
-        return render(newState)
-            .then(function() {
-                return Repository.declineContactRequest(userId, loggedInUserId);
-            })
+        render(newState);
+
+        return Repository.declineContactRequest(userId, loggedInUserId)
             .then(function(profile) {
                 var newState = StateManager.removeContactRequests(viewState, [request]);
                 newState = StateManager.addMembers(viewState, [profile]);
@@ -1044,24 +1018,26 @@ function(
         isSendingMessage = true;
         var newState = StateManager.setSendingMessage(viewState, true);
         var newConversationId = null;
-        var newCanDeleteMessagesForAllUsers = false;
-        return render(newState)
-            .then(function() {
-                if (!conversationId && (viewState.type != CONVERSATION_TYPES.PUBLIC)) {
-                    // If it's a new private conversation then we need to use the old
-                    // web service function to create the conversation.
-                    var otherUserId = getOtherUserId();
-                    return Repository.sendMessageToUser(otherUserId, text)
-                        .then(function(message) {
-                            newConversationId = parseInt(message.conversationid, 10);
-                            newCanDeleteMessagesForAllUsers = message.candeletemessagesforallusers;
-                            return message;
-                        });
-                } else {
-                    return Repository.sendMessageToConversation(conversationId, text);
-                }
-            })
-            .then(function(message) {
+
+        render(newState);
+
+        var sendMessagePromise = null;
+        var newCanDeleteMessagesForAllUsers = null;
+        if (!conversationId && (viewState.type != CONVERSATION_TYPES.PUBLIC)) {
+            // If it's a new private conversation then we need to use the old
+            // web service function to create the conversation.
+            var otherUserId = getOtherUserId();
+            sendMessagePromise = Repository.sendMessageToUser(otherUserId, text)
+                .then(function(message) {
+                    newConversationId = parseInt(message.conversationid, 10);
+                    newCanDeleteMessagesForAllUsers = message.candeletemessagesforallusers;
+                    return message;
+                });
+        } else {
+            sendMessagePromise = Repository.sendMessageToConversation(conversationId, text);
+        }
+
+        sendMessagePromise.then(function(message) {
                 var newState = StateManager.addMessages(viewState, [message]);
                 newState = StateManager.setSendingMessage(newState, false);
                 var conversation = formatConversationForEvent(newState);
@@ -1076,12 +1052,10 @@ function(
                     newState = StateManager.setCanDeleteMessagesForAllUsers(newState, newCanDeleteMessagesForAllUsers);
                 }
 
-                return render(newState)
-                    .then(function() {
-                        isSendingMessage = false;
-                        PubSub.publish(MessageDrawerEvents.CONVERSATION_NEW_LAST_MESSAGE, conversation);
-                        return;
-                    });
+                render(newState);
+                isSendingMessage = false;
+                PubSub.publish(MessageDrawerEvents.CONVERSATION_NEW_LAST_MESSAGE, conversation);
+                return;
             })
             .catch(function(error) {
                 isSendingMessage = false;
@@ -1095,7 +1069,6 @@ function(
      * Toggle the selected messages update the statemanager and render the result.
      *
      * @param  {Number} messageId The id of the message to be toggled
-     * @return {Promise} Renderer promise.
      */
     var toggleSelectMessage = function(messageId) {
         var newState = viewState;
@@ -1106,7 +1079,7 @@ function(
             newState = StateManager.addSelectedMessagesById(viewState, [messageId]);
         }
 
-        return render(newState);
+        render(newState);
     };
 
     /**
@@ -1115,10 +1088,45 @@ function(
      * @return {Promise} Renderer promise.
      */
     var cancelEditMode = function() {
-        return cancelRequest(getOtherUserId())
+        cancelRequest(getOtherUserId());
+        var newState = StateManager.removeSelectedMessagesById(viewState, viewState.selectedMessageIds);
+        render(newState);
+    };
+
+    /**
+     * Process the patches in the render buffer one at a time in order until the
+     * buffer is empty.
+     *
+     * @param {Object} header The conversation header container element.
+     * @param {Object} body The conversation body container element.
+     * @param {Object} footer The conversation footer container element.
+     */
+    var processRenderBuffer = function(header, body, footer) {
+        if (isRendering) {
+            return;
+        }
+
+        if (!renderBuffer.length) {
+            return;
+        }
+
+        isRendering = true;
+        var renderable = renderBuffer.shift();
+        var renderPromises = renderers.map(function(renderFunc) {
+            return renderFunc(renderable.patch);
+        });
+
+        $.when.apply(null, renderPromises)
             .then(function() {
-                var newState = StateManager.removeSelectedMessagesById(viewState, viewState.selectedMessageIds);
-                return render(newState);
+                isRendering = false;
+                renderable.deferred.resolve(true);
+                // Keep processing the buffer until it's empty.
+                processRenderBuffer(header, body, footer);
+            })
+            .catch(function(error) {
+                isRendering = false;
+                renderable.deferred.reject(error);
+                Notification.exception(error);
             });
     };
 
@@ -1148,25 +1156,39 @@ function(
 
         return function(newState) {
             var patch = Patcher.buildPatch(viewState, newState);
+            var deferred = $.Deferred();
+
+            // Check if the patch has any data. Ignore empty patches.
+            if (Object.keys(patch).length) {
+                // Add the patch to the render buffer which gets processed in order.
+                renderBuffer.push({
+                    patch: patch,
+                    deferred: deferred
+                });
+            } else {
+                deferred.resolve(true);
+            }
             // This is a great place to add in some console logging if you need
             // to debug something. You can log the current state, the next state,
             // and the generated patch and see exactly what will be updated.
-            var renderPromises = renderers.map(function(renderFunc) {
-                return renderFunc(patch);
-            });
-            return $.when.apply(null, renderPromises)
-                .then(function() {
-                    viewState = newState;
-                    if (newState.id) {
-                        // Only cache created conversations.
-                        stateCache[newState.id] = {
-                            state: newState,
-                            messagesOffset: getMessagesOffset(),
-                            loadedAllMessages: hasLoadedAllMessages()
-                        };
-                    }
-                    return;
-                });
+
+            // Optimistically update the state. We're going to assume that the rendering
+            // will always succeed. The rendering is asynchronous (annoyingly) so it's buffered
+            // but it'll reach eventual consistency with the current state.
+            viewState = newState;
+            if (newState.id) {
+                // Only cache created conversations.
+                stateCache[newState.id] = {
+                    state: newState,
+                    messagesOffset: getMessagesOffset(),
+                    loadedAllMessages: hasLoadedAllMessages()
+                };
+            }
+
+            // Start processing the buffer.
+            processRenderBuffer(header, body, footer);
+
+            return deferred.promise();
         };
     };
 
@@ -1179,12 +1201,9 @@ function(
     var generateConfirmActionHandler = function(actionCallback) {
         return function(e, data) {
             if (!viewState.loadingConfirmAction) {
-                actionCallback(getOtherUserId())
-                    .catch(function(error) {
-                        var newState = StateManager.setLoadingConfirmAction(viewState, false);
-                        render(newState);
-                        Notification.exception(error);
-                    });
+                actionCallback(getOtherUserId());
+                var newState = StateManager.setLoadingConfirmAction(viewState, false);
+                render(newState);
             }
             data.originalEvent.preventDefault();
         };
@@ -1232,7 +1251,7 @@ function(
         var element = target.closest(SELECTORS.MESSAGE);
         var messageId = parseInt(element.attr('data-message-id'), 10);
 
-        toggleSelectMessage(messageId).catch(Notification.exception);
+        toggleSelectMessage(messageId);
 
         data.originalEvent.preventDefault();
     };
@@ -1244,7 +1263,7 @@ function(
      * @param {Object} data Data for this event.
      */
     var handleCancelEditMode = function(e, data) {
-        cancelEditMode().catch(Notification.exception);
+        cancelEditMode();
         data.originalEvent.preventDefault();
     };
 
@@ -1413,10 +1432,9 @@ function(
             if (!isResetting && !isLoadingMoreMessages && !hasLoadedAllMessages() && hasMembers) {
                 isLoadingMoreMessages = true;
                 var newState = StateManager.setLoadingMessages(viewState, true);
-                render(newState)
-                    .then(function() {
-                        return loadMessages(viewState.id, LOAD_MESSAGE_LIMIT, getMessagesOffset(), NEWEST_FIRST, []);
-                    })
+                render(newState);
+
+                loadMessages(viewState.id, LOAD_MESSAGE_LIMIT, getMessagesOffset(), NEWEST_FIRST, [])
                     .then(function() {
                         isLoadingMoreMessages = false;
                         setMessagesOffset(getMessagesOffset() + LOAD_MESSAGE_LIMIT);
@@ -1477,13 +1495,12 @@ function(
 
         newMessagesPollTimer = new BackOffTimer(
             getLoadNewMessagesCallback(conversationId, NEWEST_FIRST),
-            function(time) {
-                if (!time) {
-                    return INITIAL_NEW_MESSAGE_POLL_TIMEOUT;
-                }
-
-                return time * 2;
-            }
+            BackOffTimer.getIncrementalCallback(
+                viewState.messagePollMin * MILLISECONDS_IN_SEC,
+                MILLISECONDS_IN_SEC,
+                viewState.messagePollMax * MILLISECONDS_IN_SEC,
+                viewState.messagePollAfterMax * MILLISECONDS_IN_SEC
+            )
         );
 
         newMessagesPollTimer.start();
@@ -1495,12 +1512,28 @@ function(
      * @param  {Object} body Conversation body container element.
      * @param  {Number|null} conversationId The conversation id.
      * @param  {Object} loggedInUserProfile The logged in user's profile.
-     * @return {Promise} Renderer promise.
      */
     var resetState = function(body, conversationId, loggedInUserProfile) {
+        // Reset all of the states back to the beginning if we're loading a new
+        // conversation.
+        isResetting = true;
+        isRendering = false;
+        renderBuffer = [];
+        isSendingMessage = false;
+
         var loggedInUserId = loggedInUserProfile.id;
         var midnight = parseInt(body.attr('data-midnight'), 10);
-        var initialState = StateManager.buildInitialState(midnight, loggedInUserId, conversationId);
+        var messagePollMin = parseInt(body.attr('data-message-poll-min'), 10);
+        var messagePollMax = parseInt(body.attr('data-message-poll-max'), 10);
+        var messagePollAfterMax = parseInt(body.attr('data-message-poll-after-max'), 10);
+        var initialState = StateManager.buildInitialState(
+            midnight,
+            loggedInUserId,
+            conversationId,
+            messagePollMin,
+            messagePollMax,
+            messagePollAfterMax
+        );
 
         if (!viewState) {
             viewState = initialState;
@@ -1510,7 +1543,7 @@ function(
             newMessagesPollTimer.stop();
         }
 
-        return render(initialState);
+        render(initialState);
     };
 
     /**
@@ -1524,32 +1557,34 @@ function(
     var resetNoConversation = function(body, loggedInUserProfile, otherUserId) {
         // Always reset the state back to the initial state so that the
         // state manager and patcher can work correctly.
-        return resetState(body, null, loggedInUserProfile)
-            .then(function() {
-                if (loggedInUserProfile.id != otherUserId) {
-                    // Private conversation between two different users.
-                    return Repository.getConversationBetweenUsers(
-                        loggedInUserProfile.id,
-                        otherUserId,
-                        true,
-                        true,
-                        0,
-                        0,
-                        LOAD_MESSAGE_LIMIT,
-                        0,
-                        NEWEST_FIRST
-                    );
-                } else {
-                    // Self conversation.
-                    return Repository.getSelfConversation(
-                        loggedInUserProfile.id,
-                        LOAD_MESSAGE_LIMIT,
-                        0,
-                        NEWEST_FIRST
-                    );
-                }
-            })
-            .then(function(conversation) {
+        resetState(body, null, loggedInUserProfile);
+
+        var resetNoConversationPromise = null;
+
+        if (loggedInUserProfile.id != otherUserId) {
+            // Private conversation between two different users.
+            resetNoConversationPromise = Repository.getConversationBetweenUsers(
+                loggedInUserProfile.id,
+                otherUserId,
+                true,
+                true,
+                0,
+                0,
+                LOAD_MESSAGE_LIMIT,
+                0,
+                NEWEST_FIRST
+            );
+        } else {
+            // Self conversation.
+            resetNoConversationPromise = Repository.getSelfConversation(
+                loggedInUserProfile.id,
+                LOAD_MESSAGE_LIMIT,
+                0,
+                NEWEST_FIRST
+            );
+        }
+
+        return resetNoConversationPromise.then(function(conversation) {
                 // Looks like we have a conversation after all! Let's use that.
                 return resetByConversation(body, conversation, loggedInUserProfile);
             })
@@ -1575,31 +1610,32 @@ function(
 
         // Always reset the state back to the initial state so that the
         // state manager and patcher can work correctly.
-        return resetState(body, conversationId, loggedInUserProfile)
-            .then(function() {
-                if (cache) {
-                    // We've seen this conversation before so there is no need to
-                    // send any network requests.
-                    var newState = cache.state;
-                    // Reset some loading states just in case they were left weirdly.
-                    newState = StateManager.setLoadingMessages(newState, false);
-                    newState = StateManager.setLoadingMembers(newState, false);
-                    setMessagesOffset(cache.messagesOffset);
-                    setLoadedAllMessages(cache.loadedAllMessages);
-                    return render(newState);
-                } else {
-                    return loadNewConversation(
-                        conversationId,
-                        loggedInUserProfile,
-                        LOAD_MESSAGE_LIMIT,
-                        0,
-                        NEWEST_FIRST
-                    );
-                }
-            })
-            .then(function() {
-                return resetMessagePollTimer(conversationId);
-            });
+        resetState(body, conversationId, loggedInUserProfile);
+
+        var promise = $.Deferred().resolve({}).promise();
+        if (cache) {
+            // We've seen this conversation before so there is no need to
+            // send any network requests.
+            var newState = cache.state;
+            // Reset some loading states just in case they were left weirdly.
+            newState = StateManager.setLoadingMessages(newState, false);
+            newState = StateManager.setLoadingMembers(newState, false);
+            setMessagesOffset(cache.messagesOffset);
+            setLoadedAllMessages(cache.loadedAllMessages);
+            render(newState);
+        } else {
+            promise = loadNewConversation(
+                conversationId,
+                loggedInUserProfile,
+                LOAD_MESSAGE_LIMIT,
+                0,
+                NEWEST_FIRST
+            );
+        }
+
+        return promise.then(function() {
+            return resetMessagePollTimer(conversationId);
+        });
     };
 
     /**
@@ -1618,30 +1654,31 @@ function(
 
         // Always reset the state back to the initial state so that the
         // state manager and patcher can work correctly.
-        return resetState(body, conversation.id, loggedInUserProfile)
-            .then(function() {
-                if (cache) {
-                    // We've seen this conversation before so there is no need to
-                    // send any network requests.
-                    var newState = cache.state;
-                    // Reset some loading states just in case they were left weirdly.
-                    newState = StateManager.setLoadingMessages(newState, false);
-                    newState = StateManager.setLoadingMembers(newState, false);
-                    setMessagesOffset(cache.messagesOffset);
-                    setLoadedAllMessages(cache.loadedAllMessages);
-                    return render(newState);
-                } else {
-                    return loadExistingConversation(
-                        conversation,
-                        loggedInUserProfile,
-                        LOAD_MESSAGE_LIMIT,
-                        NEWEST_FIRST
-                    );
-                }
-            })
-            .then(function() {
-                return resetMessagePollTimer(conversation.id);
-            });
+        resetState(body, conversation.id, loggedInUserProfile);
+
+        var promise = $.Deferred().resolve({}).promise();
+        if (cache) {
+            // We've seen this conversation before so there is no need to
+            // send any network requests.
+            var newState = cache.state;
+            // Reset some loading states just in case they were left weirdly.
+            newState = StateManager.setLoadingMessages(newState, false);
+            newState = StateManager.setLoadingMembers(newState, false);
+            setMessagesOffset(cache.messagesOffset);
+            setLoadedAllMessages(cache.loadedAllMessages);
+            render(newState);
+        } else {
+            promise = loadExistingConversation(
+                conversation,
+                loggedInUserProfile,
+                LOAD_MESSAGE_LIMIT,
+                NEWEST_FIRST
+            );
+        }
+
+        return promise.then(function() {
+            return resetMessagePollTimer(conversation.id);
+        });
     };
 
     /**
@@ -1702,9 +1739,6 @@ function(
         }
 
         if (isNewConversation) {
-            // Reset all of the states back to the beginning if we're loading a new
-            // conversation.
-            isResetting = true;
             var renderPromise = null;
             var loggedInUserProfile = getLoggedInUserProfile(body);
             if (conversation) {
diff --git a/message/amd/src/message_drawer_view_conversation_constants.js b/message/amd/src/message_drawer_view_conversation_constants.js
index 00a3bbb1243b7..8dd66efac3b4d 100644
--- a/message/amd/src/message_drawer_view_conversation_constants.js
+++ b/message/amd/src/message_drawer_view_conversation_constants.js
@@ -110,6 +110,6 @@ define([], function() {
         CONVERSATION_TYPES: CONVERSATION_TYPES,
         NEWEST_MESSAGES_FIRST: true,
         LOAD_MESSAGE_LIMIT: 100,
-        INITIAL_NEW_MESSAGE_POLL_TIMEOUT: 1000
+        MILLISECONDS_IN_SEC: 1000
     };
 });
diff --git a/message/amd/src/message_drawer_view_conversation_patcher.js b/message/amd/src/message_drawer_view_conversation_patcher.js
index ffff869435b9e..3f97979f459be 100644
--- a/message/amd/src/message_drawer_view_conversation_patcher.js
+++ b/message/amd/src/message_drawer_view_conversation_patcher.js
@@ -854,6 +854,11 @@ function(
      * @return {Bool}
      */
     var requiresContactRequest = function(loggedInUserId, user) {
+        // If a user can message then no contact request is required.
+        if (user.canmessage) {
+            return false;
+        }
+
         var contactRequests = user.contactrequests.filter(function(request) {
             return request.userid == loggedInUserId || request.requesteduserid;
         });
@@ -1036,7 +1041,7 @@ function(
                         type: 'add-contact',
                         user: otherUser
                     };
-                } else if (!otherUser.canmessage || (otherUser.requirescontact && !otherUser.iscontact)) {
+                } else if (!otherUser.canmessage && (otherUser.requirescontact && !otherUser.iscontact)) {
                     return {type: 'unable-to-message'};
                 }
             }
diff --git a/message/amd/src/message_drawer_view_conversation_state_manager.js b/message/amd/src/message_drawer_view_conversation_state_manager.js
index 3f67cb7436ff7..5ed8eccbfda63 100644
--- a/message/amd/src/message_drawer_view_conversation_state_manager.js
+++ b/message/amd/src/message_drawer_view_conversation_state_manager.js
@@ -101,13 +101,26 @@ define(['jquery'], function($) {
      * @param  {Number} midnight Midnight time.
      * @param  {Number} loggedInUserId The logged in user id.
      * @param  {Number} id The conversation id.
+     * @param  {Number} messagePollMin The message poll start timeout in seconds.
+     * @param  {Number} messagePollMax The message poll max timeout limit in seconds.
+     * @param  {Number} messagePollAfterMax The message poll frequency in seconds to reset to after max limit is reached.
      * @return {Object} Initial state.
      */
-    var buildInitialState = function(midnight, loggedInUserId, id) {
+    var buildInitialState = function(
+        midnight,
+        loggedInUserId,
+        id,
+        messagePollMin,
+        messagePollMax,
+        messagePollAfterMax
+    ) {
         return {
             midnight: midnight,
             loggedInUserId: loggedInUserId,
             id: id,
+            messagePollMin: messagePollMin,
+            messagePollMax: messagePollMax,
+            messagePollAfterMax: messagePollAfterMax,
             name: null,
             subname: null,
             type: null,
diff --git a/message/classes/helper.php b/message/classes/helper.php
index aa061c2345071..f2ad3c60371aa 100644
--- a/message/classes/helper.php
+++ b/message/classes/helper.php
@@ -26,6 +26,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+require_once($CFG->dirroot . '/message/lib.php');
+
 /**
  * Helper class for the message area.
  *
@@ -685,9 +687,15 @@ public static function get_conversations_legacy_formatter(array $conversations)
      * @param bool $isdrawer Are we are rendering the drawer or is this on a full page?
      * @param int|null $sendtouser The ID of the user we want to send a message to
      * @param int|null $conversationid The ID of the conversation we want to load
+     * @param string|null $view The first view to load in the message widget
      * @return string The HTML.
      */
-    public static function render_messaging_widget(bool $isdrawer, int $sendtouser = null, int $conversationid = null) {
+    public static function render_messaging_widget(
+        bool $isdrawer,
+        int $sendtouser = null,
+        int $conversationid = null,
+        string $view = null
+    ) {
         global $USER, $CFG, $PAGE;
 
         // Early bail out conditions.
@@ -741,6 +749,12 @@ public static function render_messaging_widget(bool $isdrawer, int $sendtouser =
                 'id' => $USER->id,
                 'midnight' => usergetmidnight(time())
             ],
+            // The starting timeout value for message polling.
+            'messagepollmin' => $CFG->messagingminpoll ?? MESSAGE_DEFAULT_MIN_POLL_IN_SECONDS,
+            // The maximum value that message polling timeout can reach.
+            'messagepollmax' => $CFG->messagingmaxpoll ?? MESSAGE_DEFAULT_MAX_POLL_IN_SECONDS,
+            // The timeout to reset back to after the max polling time has been reached.
+            'messagepollaftermax' => $CFG->messagingtimeoutpoll ?? MESSAGE_DEFAULT_TIMEOUT_POLL_IN_SECONDS,
             'contacts' => [
                 'sectioncontacts' => [
                     'placeholders' => array_fill(0, $contactscount > 50 ? 50 : $contactscount, true)
@@ -757,18 +771,24 @@ public static function render_messaging_widget(bool $isdrawer, int $sendtouser =
                 'messageurl' => $messageurl,
                 'notification' => $notification
             ],
-            'sendtouser' => false,
-            'conversationid' => false,
             'isdrawer' => $isdrawer
         ];
 
-        if ($sendtouser) {
-            $templatecontext['sendtouser'] = $sendtouser;
+        if ($sendtouser || $conversationid) {
+            $route = [
+                'path' => 'view-conversation',
+                'params' => $conversationid ? [$conversationid] : [null, 'create', $sendtouser]
+            ];
+        } else if ($view === 'contactrequests') {
+            $route = [
+                'path' => 'view-contacts',
+                'params' => ['requests']
+            ];
+        } else {
+            $route = null;
         }
 
-        if ($conversationid) {
-            $templatecontext['conversationid'] = $conversationid;
-        }
+        $templatecontext['route'] = json_encode($route);
 
         return $renderer->render_from_template($template, $templatecontext);
     }
diff --git a/message/externallib.php b/message/externallib.php
index 9e61d2b087dec..f98184c4140c0 100644
--- a/message/externallib.php
+++ b/message/externallib.php
@@ -3613,11 +3613,6 @@ public static function mark_notification_read_parameters() {
     public static function mark_notification_read($notificationid, $timeread) {
         global $CFG, $DB, $USER;
 
-        // Check if private messaging between users is allowed.
-        if (empty($CFG->messaging)) {
-            throw new moodle_exception('disabled', 'message');
-        }
-
         // Warnings array, it can be empty at the end but is mandatory.
         $warnings = array();
 
diff --git a/message/index.php b/message/index.php
index ebc1f2776cbdf..1fcac5ab2b7ef 100644
--- a/message/index.php
+++ b/message/index.php
@@ -36,6 +36,7 @@
 
 // The id of the user we want to view messages from.
 $id = optional_param('id', 0, PARAM_INT);
+$view = optional_param('view', null, PARAM_ALPHANUM);
 // It's possible a user may come from a link where these parameters are specified.
 // We no longer support viewing another user's messaging area (that can be achieved
 // via the 'Log-in as' feature). The 'user2' value takes preference over 'id'.
@@ -90,5 +91,5 @@
         \core\output\notification::NOTIFY_WARNING);
     echo $OUTPUT->render($notify);
 }
-echo \core_message\helper::render_messaging_widget(false, $userid, $conversationid);
+echo \core_message\helper::render_messaging_widget(false, $userid, $conversationid, $view);
 echo $OUTPUT->footer();
diff --git a/message/lib.php b/message/lib.php
index 9493f9e1cb858..8884bc1da1b72 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -783,39 +783,6 @@ function core_message_user_preferences() {
     return $preferences;
 }
 
-/**
- * Renders the popup.
- *
- * @param renderer_base $renderer
- * @return string The HTML
- */
-function core_message_render_navbar_output(\renderer_base $renderer) {
-    global $USER, $CFG;
-
-    // Early bail out conditions.
-    if (!isloggedin() || isguestuser() || user_not_fully_set_up($USER) ||
-        get_user_preferences('auth_forcepasswordchange') ||
-        (!$USER->policyagreed && !is_siteadmin() &&
-            ($manager = new \core_privacy\local\sitepolicy\manager()) && $manager->is_defined())) {
-        return '';
-    }
-
-    $output = '';
-
-    // Add the messages popover.
-    if (!empty($CFG->messaging)) {
-        $unreadcount = \core_message\api::count_unread_conversations($USER);
-        $requestcount = \core_message\api::get_received_contact_requests_count($USER->id);
-        $context = [
-            'userid' => $USER->id,
-            'unreadcount' => $unreadcount + $requestcount
-        ];
-        $output .= $renderer->render_from_template('core_message/message_popover', $context);
-    }
-
-    return $output;
-}
-
 /**
  * Render the message drawer to be included in the top of the body of each page.
  *
diff --git a/message/output/airnotifier/lang/en/message_airnotifier.php b/message/output/airnotifier/lang/en/message_airnotifier.php
index 05a7337eac775..5b8750144cddd 100644
--- a/message/output/airnotifier/lang/en/message_airnotifier.php
+++ b/message/output/airnotifier/lang/en/message_airnotifier.php
@@ -58,7 +58,7 @@
 $string['privacy:metadata:username'] = 'The username of the user.';
 $string['privacy:metadata:usersubsystem'] = 'This plugin is connected to the user subsystem.';
 $string['privacy:subcontext'] = 'Message Airnotifier';
-$string['sitemustberegistered'] = 'In order to use the public Airnotifier instance you must register your site with Moodle.net';
+$string['sitemustberegistered'] = 'In order to use the public Airnotifier instance, your site must be registered with Moodle.';
 $string['showhide'] = 'Enable/disable the device.';
 $string['requestaccesskey'] = 'Request access key';
 $string['unknowndevice'] = 'Unknown device';
diff --git a/message/output/airnotifier/message_output_airnotifier.php b/message/output/airnotifier/message_output_airnotifier.php
index 5fb3c2e082a3b..004185a38da0b 100644
--- a/message/output/airnotifier/message_output_airnotifier.php
+++ b/message/output/airnotifier/message_output_airnotifier.php
@@ -117,6 +117,8 @@ public function send_message($eventdata) {
             $header = array('Accept: application/json', 'X-AN-APP-NAME: ' . $CFG->airnotifierappname,
                 'X-AN-APP-KEY: ' . $CFG->airnotifieraccesskey);
             $curl = new curl;
+            // Push notifications are supposed to be instant, do not wait to long blocking the execution.
+            $curl->setopt(array('CURLOPT_TIMEOUT' => 2, 'CURLOPT_CONNECTTIMEOUT' => 2));
             $curl->setHeader($header);
 
             $params = array(
diff --git a/message/output/email/db/upgrade.php b/message/output/email/db/upgrade.php
index b4fe03373fa23..2be294676f0ef 100644
--- a/message/output/email/db/upgrade.php
+++ b/message/output/email/db/upgrade.php
@@ -71,5 +71,8 @@ function xmldb_message_email_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2019032500, 'message', 'email');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/message/output/jabber/db/upgrade.php b/message/output/jabber/db/upgrade.php
index f27426cf4779d..85f174071b4ec 100644
--- a/message/output/jabber/db/upgrade.php
+++ b/message/output/jabber/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_message_jabber_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/message/output/popup/amd/build/notification_popover_controller.min.js b/message/output/popup/amd/build/notification_popover_controller.min.js
index 9dcc43c0162d2..b180ba9e9cd43 100644
--- a/message/output/popup/amd/build/notification_popover_controller.min.js
+++ b/message/output/popup/amd/build/notification_popover_controller.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/templates","core/str","core/url","core/notification","core/custom_interaction_events","core/popover_region_controller","message_popup/notification_repository","message_popup/notification_area_events"],function(a,b,c,d,e,f,g,h,i,j){var k={MARK_ALL_READ_BUTTON:'[data-action="mark-all-read"]',ALL_NOTIFICATIONS_CONTAINER:'[data-region="all-notifications"]',NOTIFICATION:'[data-region="notification-content-item-container"]',UNREAD_NOTIFICATION:'[data-region="notification-content-item-container"].unread',NOTIFICATION_LINK:'[data-action="content-item-link"]',EMPTY_MESSAGE:'[data-region="empty-message"]',COUNT_CONTAINER:'[data-region="count-container"]'},l=function(a){h.call(this,a),this.markAllReadButton=this.root.find(k.MARK_ALL_READ_BUTTON),this.unreadCount=0,this.userId=this.root.attr("data-userid"),this.container=this.root.find(k.ALL_NOTIFICATIONS_CONTAINER),this.limit=20,this.offset=0,this.loadedAll=!1,this.initialLoad=!1,this.unreadCount=this.root.find(k.COUNT_CONTAINER).html()};return l.prototype=Object.create(h.prototype),l.prototype.constructor=l,l.prototype.updateButtonAriaLabel=function(){this.isMenuOpen()?d.get_string("hidenotificationwindow","message").done(function(a){this.menuToggle.attr("aria-label",a)}.bind(this)):this.unreadCount?d.get_string("shownotificationwindowwithcount","message",this.unreadCount).done(function(a){this.menuToggle.attr("aria-label",a)}.bind(this)):d.get_string("shownotificationwindownonew","message").done(function(a){this.menuToggle.attr("aria-label",a)}.bind(this))},l.prototype.getContent=function(){return this.container},l.prototype.getOffset=function(){return this.offset},l.prototype.incrementOffset=function(){this.offset+=this.limit},l.prototype.hasDoneInitialLoad=function(){return this.initialLoad},l.prototype.hasLoadedAllContent=function(){return this.loadedAll},l.prototype.setLoadedAllContent=function(a){this.loadedAll=a},l.prototype.renderUnreadCount=function(){var a=this.root.find(k.COUNT_CONTAINER);this.unreadCount?(a.text(this.unreadCount),a.removeClass("hidden")):a.addClass("hidden")},l.prototype.hideUnreadCount=function(){this.root.find(k.COUNT_CONTAINER).addClass("hidden")},l.prototype.getNotificationElement=function(a){var b=this.root.find(k.NOTIFICATION+'[data-id="'+a+'"]');return 1==b.length?b:null},l.prototype.renderNotifications=function(b,d){var f=[];return a.each(b,function(a,b){var d=this.getOffset()-this.limit;b.viewmoreurl=e.relativeUrl("/message/output/popup/notifications.php",{notificationid:b.id,offset:d});var g={notificationid:b.id};b.contexturl&&(g.redirecturl=encodeURIComponent(b.contexturl)),b.contexturl=e.relativeUrl("message/output/popup/mark_notification_read.php",g);var h=c.render("message_popup/notification_content_item",b).then(function(a,b){return{html:a,js:b}});f.push(h)}.bind(this)),a.when.apply(a,f).then(function(){a.each(arguments,function(a,b){d.append(b.html),c.runTemplateJS(b.js)})})},l.prototype.loadMoreNotifications=function(){if(this.isLoading||this.hasLoadedAllContent())return a.Deferred().resolve();this.startLoading();var b={limit:this.limit,offset:this.getOffset(),useridto:this.userId},c=this.getContent();return i.query(b).then(function(a){var b=a.notifications;return this.unreadCount=a.unreadcount,this.setLoadedAllContent(!b.length||b.length<this.limit),this.initialLoad=!0,this.updateButtonAriaLabel(),!!b.length&&(this.incrementOffset(),this.renderNotifications(b,c))}.bind(this)).always(function(){this.stopLoading()}.bind(this))},l.prototype.markAllAsRead=function(){return this.markAllReadButton.addClass("loading"),i.markAllAsRead({useridto:this.userId}).then(function(){this.unreadCount=0,this.root.find(k.UNREAD_NOTIFICATION).removeClass("unread")}.bind(this)).always(function(){this.markAllReadButton.removeClass("loading")}.bind(this))},l.prototype.registerEventListeners=function(){g.define(this.root,[g.events.activate]),this.root.on(g.events.activate,k.MARK_ALL_READ_BUTTON,function(a,b){this.markAllAsRead(),a.stopPropagation(),b.originalEvent.preventDefault()}.bind(this)),this.root.on(g.events.activate,k.NOTIFICATION_LINK,function(b){var c=a(b.target).closest(k.NOTIFICATION);c.hasClass("unread")&&(this.unreadCount--,c.removeClass("unread")),b.stopPropagation()}.bind(this)),this.root.on(this.events().menuOpened,function(){this.hideUnreadCount(),this.updateButtonAriaLabel(),this.hasDoneInitialLoad()||this.loadMoreNotifications()}.bind(this)),this.root.on(this.events().menuClosed,function(){this.renderUnreadCount(),this.updateButtonAriaLabel()}.bind(this)),this.root.on(this.events().startLoading,function(){this.getContent().attr("aria-busy","true")}.bind(this)),this.root.on(this.events().stopLoading,function(){this.getContent().attr("aria-busy","false")}.bind(this)),this.getContentContainer().on(g.events.scrollBottom,function(){this.isLoading||this.hasLoadedAllContent()||this.loadMoreNotifications()}.bind(this)),g.define(this.getContentContainer(),[g.events.scrollLock]),a(document).on(j.notificationShown,function(a,b){if(!b.read){var c=this.getNotificationElement(b.id);c&&c.removeClass("unread"),this.unreadCount--,this.renderUnreadCount()}}.bind(this))},l});
\ No newline at end of file
+define(["jquery","core/ajax","core/templates","core/str","core/url","core/notification","core/custom_interaction_events","core/popover_region_controller","message_popup/notification_repository","message_popup/notification_area_events"],function(a,b,c,d,e,f,g,h,i,j){var k={MARK_ALL_READ_BUTTON:'[data-action="mark-all-read"]',ALL_NOTIFICATIONS_CONTAINER:'[data-region="all-notifications"]',NOTIFICATION:'[data-region="notification-content-item-container"]',UNREAD_NOTIFICATION:'[data-region="notification-content-item-container"].unread',NOTIFICATION_LINK:'[data-action="content-item-link"]',EMPTY_MESSAGE:'[data-region="empty-message"]',COUNT_CONTAINER:'[data-region="count-container"]'},l=function(a){h.call(this,a),this.markAllReadButton=this.root.find(k.MARK_ALL_READ_BUTTON),this.unreadCount=0,this.userId=this.root.attr("data-userid"),this.container=this.root.find(k.ALL_NOTIFICATIONS_CONTAINER),this.limit=20,this.offset=0,this.loadedAll=!1,this.initialLoad=!1,this.unreadCount=this.root.find(k.COUNT_CONTAINER).html()};return l.prototype=Object.create(h.prototype),l.prototype.constructor=l,l.prototype.updateButtonAriaLabel=function(){this.isMenuOpen()?d.get_string("hidenotificationwindow","message").done(function(a){this.menuToggle.attr("aria-label",a)}.bind(this)):this.unreadCount?d.get_string("shownotificationwindowwithcount","message",this.unreadCount).done(function(a){this.menuToggle.attr("aria-label",a)}.bind(this)):d.get_string("shownotificationwindownonew","message").done(function(a){this.menuToggle.attr("aria-label",a)}.bind(this))},l.prototype.getContent=function(){return this.container},l.prototype.getOffset=function(){return this.offset},l.prototype.incrementOffset=function(){this.offset+=this.limit},l.prototype.hasDoneInitialLoad=function(){return this.initialLoad},l.prototype.hasLoadedAllContent=function(){return this.loadedAll},l.prototype.setLoadedAllContent=function(a){this.loadedAll=a},l.prototype.renderUnreadCount=function(){var a=this.root.find(k.COUNT_CONTAINER);this.unreadCount?(a.text(this.unreadCount),a.removeClass("hidden")):a.addClass("hidden")},l.prototype.hideUnreadCount=function(){this.root.find(k.COUNT_CONTAINER).addClass("hidden")},l.prototype.getNotificationElement=function(a){var b=this.root.find(k.NOTIFICATION+'[data-id="'+a+'"]');return 1==b.length?b:null},l.prototype.renderNotifications=function(b,d){var f=[];return a.each(b,function(a,b){var d=this.getOffset()-this.limit;b.viewmoreurl=e.relativeUrl("/message/output/popup/notifications.php",{notificationid:b.id,offset:d});var g={notificationid:b.id};b.contexturl=e.relativeUrl("message/output/popup/mark_notification_read.php",g);var h=c.render("message_popup/notification_content_item",b).then(function(a,b){return{html:a,js:b}});f.push(h)}.bind(this)),a.when.apply(a,f).then(function(){a.each(arguments,function(a,b){d.append(b.html),c.runTemplateJS(b.js)})})},l.prototype.loadMoreNotifications=function(){if(this.isLoading||this.hasLoadedAllContent())return a.Deferred().resolve();this.startLoading();var b={limit:this.limit,offset:this.getOffset(),useridto:this.userId},c=this.getContent();return i.query(b).then(function(a){var b=a.notifications;return this.unreadCount=a.unreadcount,this.setLoadedAllContent(!b.length||b.length<this.limit),this.initialLoad=!0,this.updateButtonAriaLabel(),!!b.length&&(this.incrementOffset(),this.renderNotifications(b,c))}.bind(this)).always(function(){this.stopLoading()}.bind(this))},l.prototype.markAllAsRead=function(){return this.markAllReadButton.addClass("loading"),i.markAllAsRead({useridto:this.userId}).then(function(){this.unreadCount=0,this.root.find(k.UNREAD_NOTIFICATION).removeClass("unread")}.bind(this)).always(function(){this.markAllReadButton.removeClass("loading")}.bind(this))},l.prototype.registerEventListeners=function(){g.define(this.root,[g.events.activate]),this.root.on(g.events.activate,k.MARK_ALL_READ_BUTTON,function(a,b){this.markAllAsRead(),a.stopPropagation(),b.originalEvent.preventDefault()}.bind(this)),this.root.on(g.events.activate,k.NOTIFICATION_LINK,function(b){var c=a(b.target).closest(k.NOTIFICATION);c.hasClass("unread")&&(this.unreadCount--,c.removeClass("unread")),b.stopPropagation()}.bind(this)),this.root.on(this.events().menuOpened,function(){this.hideUnreadCount(),this.updateButtonAriaLabel(),this.hasDoneInitialLoad()||this.loadMoreNotifications()}.bind(this)),this.root.on(this.events().menuClosed,function(){this.renderUnreadCount(),this.updateButtonAriaLabel()}.bind(this)),this.root.on(this.events().startLoading,function(){this.getContent().attr("aria-busy","true")}.bind(this)),this.root.on(this.events().stopLoading,function(){this.getContent().attr("aria-busy","false")}.bind(this)),this.getContentContainer().on(g.events.scrollBottom,function(){this.isLoading||this.hasLoadedAllContent()||this.loadMoreNotifications()}.bind(this)),g.define(this.getContentContainer(),[g.events.scrollLock]),a(document).on(j.notificationShown,function(a,b){if(!b.read){var c=this.getNotificationElement(b.id);c&&c.removeClass("unread"),this.unreadCount--,this.renderUnreadCount()}}.bind(this))},l});
\ No newline at end of file
diff --git a/message/output/popup/amd/src/notification_popover_controller.js b/message/output/popup/amd/src/notification_popover_controller.js
index 8a6b04ff93435..c1e44e6eea42f 100644
--- a/message/output/popup/amd/src/notification_popover_controller.js
+++ b/message/output/popup/amd/src/notification_popover_controller.js
@@ -226,9 +226,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str', 'core/url',
             var notificationurlparams = {
                 notificationid: notification.id
             };
-            if (notification.contexturl) {
-                notificationurlparams.redirecturl = encodeURIComponent(notification.contexturl);
-            }
+
             notification.contexturl = URL.relativeUrl('message/output/popup/mark_notification_read.php', notificationurlparams);
 
             var promise = Templates.render('message_popup/notification_content_item', notification)
diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php
index 5c179e50bbc52..e659afbb1a22f 100644
--- a/message/output/popup/db/upgrade.php
+++ b/message/output/popup/db/upgrade.php
@@ -82,5 +82,8 @@ function xmldb_message_popup_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/message/output/popup/lib.php b/message/output/popup/lib.php
index fcfb3696de708..dd3964e59bc83 100644
--- a/message/output/popup/lib.php
+++ b/message/output/popup/lib.php
@@ -58,5 +58,16 @@ function message_popup_render_navbar_output(\renderer_base $renderer) {
         $output .= $renderer->render_from_template('message_popup/notification_popover', $context);
     }
 
+    // Add the messages popover.
+    if (!empty($CFG->messaging)) {
+        $unreadcount = \core_message\api::count_unread_conversations($USER);
+        $requestcount = \core_message\api::get_received_contact_requests_count($USER->id);
+        $context = [
+            'userid' => $USER->id,
+            'unreadcount' => $unreadcount + $requestcount
+        ];
+        $output .= $renderer->render_from_template('core_message/message_popover', $context);
+    }
+
     return $output;
 }
diff --git a/message/output/popup/mark_notification_read.php b/message/output/popup/mark_notification_read.php
index 04586781b2629..9a8515ae061e8 100644
--- a/message/output/popup/mark_notification_read.php
+++ b/message/output/popup/mark_notification_read.php
@@ -31,11 +31,13 @@
 }
 
 $notificationid = required_param('notificationid', PARAM_INT);
-$redirecturl = optional_param('redirecturl', '', PARAM_URL);
+
 $notification = $DB->get_record('notifications', array('id' => $notificationid));
 
 // If the redirect URL after filtering is empty, or it was never passed, then redirect to the notification page.
-if (empty($redirecturl)) {
+if (!empty($notification->contexturl)) {
+    $redirecturl = new moodle_url($notification->contexturl);
+} else {
     $redirecturl = new moodle_url('/message/output/popup/notifications.php', ['notificationid' => $notificationid]);
 }
 
@@ -45,4 +47,4 @@
 }
 
 \core_message\api::mark_notification_as_read($notification);
-redirect(new moodle_url($redirecturl));
+redirect($redirecturl);
diff --git a/message/pendingcontactrequests.php b/message/pendingcontactrequests.php
new file mode 100644
index 0000000000000..d0885ef5c54ab
--- /dev/null
+++ b/message/pendingcontactrequests.php
@@ -0,0 +1,34 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This is a placeholder file for a legacy implementation.
+ *
+ * @package    core
+ * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// Disable moodle specific debug messages since we're just redirecting.
+define('NO_DEBUG_DISPLAY', true);
+require('../config.php');
+
+require_login(null, false);
+
+// We have a bunch of old notifications (both internal and external, e.g. email) that
+// reference this URL which means we can't remove it so let's just redirect.
+redirect("{$CFG->wwwroot}/message/index.php?view=contactrequests");
+
diff --git a/message/templates/message_drawer_view_contacts_body.mustache b/message/templates/message_drawer_view_contacts_body.mustache
index 25ccf2f1b8945..e4fccddd6fc4a 100644
--- a/message/templates/message_drawer_view_contacts_body.mustache
+++ b/message/templates/message_drawer_view_contacts_body.mustache
@@ -64,7 +64,7 @@
                         aria-selected="false"
                     >
                         {{#str}} requests {{/str}}
-                        <span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}"
+                        <span class="badge badge-primary bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}"
                         data-region="contact-request-count"
                         aria-label="{{#str}} pendingcontactrequests, core_message, {{contactrequestcount}} {{/str}}">
                             {{contactrequestcount}}
diff --git a/message/templates/message_drawer_view_conversation_body.mustache b/message/templates/message_drawer_view_conversation_body.mustache
index 463f89a0a6868..8f87320fe366d 100644
--- a/message/templates/message_drawer_view_conversation_body.mustache
+++ b/message/templates/message_drawer_view_conversation_body.mustache
@@ -40,6 +40,9 @@
     data-region="view-conversation"
     data-user-id="{{loggedinuser.id}}"
     data-midnight="{{loggedinuser.midnight}}"
+    data-message-poll-min="{{messagepollmin}}"
+    data-message-poll-max="{{messagepollmax}}"
+    data-message-poll-after-max="{{messagepollaftermax}}"
     style="overflow-y: auto; overflow-x: hidden"
 >
     <div class="position-relative h-100" data-region="content-container" style="overflow-y: auto; overflow-x: hidden">
diff --git a/message/templates/message_drawer_view_overview_header.mustache b/message/templates/message_drawer_view_overview_header.mustache
index 69c30fedb14ac..b613a338d105b 100644
--- a/message/templates/message_drawer_view_overview_header.mustache
+++ b/message/templates/message_drawer_view_overview_header.mustache
@@ -37,7 +37,7 @@
     <div class="d-flex align-items-center">
         <div class="input-group">
             <div class="input-group-prepend">
-                <span class="input-group-text pr-0 bg-white">
+                <span class="input-group-text p-2 bg-white">
                     {{#pix}} a/search, core {{/pix}}
                 </span>
             </div>
@@ -65,7 +65,7 @@
         <a href="#" data-route="view-contacts" role="button">
             {{#pix}} i/user, core {{/pix}}
             {{#str}} contacts, core_message {{/str}}
-            <span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}"
+            <span class="badge badge-primary bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}"
             data-region="contact-request-count"
             aria-label="{{#str}} pendingcontactrequests, core_message, {{contactrequestcount}} {{/str}}">
                 {{contactrequestcount}}
diff --git a/message/templates/message_index.mustache b/message/templates/message_index.mustache
index 52fc66cae101a..65c44fc62886c 100644
--- a/message/templates/message_index.mustache
+++ b/message/templates/message_index.mustache
@@ -79,6 +79,6 @@
 {{#js}}
     require(['jquery', 'core_message/message_drawer'], function($, MessageDrawer) {
     var root = $('#message-index-{{uniqid}}');
-    MessageDrawer.init(root, '{{uniqid}}', true, {{sendtouser}}, {{conversationid}});
+    MessageDrawer.init(root, '{{uniqid}}', true, {{{route}}});
     });
 {{/js}}
\ No newline at end of file
diff --git a/message/templates/message_popover.mustache b/message/templates/message_popover.mustache
index 72e541a1da40a..8f63132cfd757 100644
--- a/message/templates/message_popover.mustache
+++ b/message/templates/message_popover.mustache
@@ -35,7 +35,7 @@
     }
 
 }}
-<div class="float-right popover-region collapsed">
+<div class="popover-region collapsed" data-region="popover-region-messages">
     <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#"
             role="button">
         {{#pix}} t/message, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}
diff --git a/message/tests/behat/behat_message.php b/message/tests/behat/behat_message.php
index 973739bd161b7..28731d904b639 100644
--- a/message/tests/behat/behat_message.php
+++ b/message/tests/behat/behat_message.php
@@ -37,6 +37,69 @@
  */
 class behat_message extends behat_base {
 
+    /**
+     * Return the list of partial named selectors.
+     *
+     * @return array
+     */
+    public static function get_partial_named_selectors(): array {
+        return [
+            new behat_component_named_selector('Message', [".//*[@data-conversation-id]//img[%altMatch%]/.."]),
+            new behat_component_named_selector('Message conversation', [
+                <<<XPATH
+    .//*[@data-region='message-drawer' and contains(., %locator%)]//div[@data-region='content-message-container']
+XPATH
+            ], false),
+            new behat_component_named_selector('Message header', [
+                <<<XPATH
+    .//*[@data-region='message-drawer']//div[@data-region='header-content' and contains(., %locator%)]
+XPATH
+            ]),
+            new behat_component_named_selector('Message member', [
+                <<<XPATH
+    .//*[@data-region='message-drawer']//div[@data-region='group-info-content-container']
+    //div[@class='list-group' and not(contains(@class, 'hidden'))]//*[%core_message/textMatch%]
+XPATH
+                , <<<XPATH
+    .//*[@data-region='message-drawer']//div[@data-region='group-info-content-container']
+    //div[@data-region='empty-message-container' and not(contains(@class, 'hidden')) and contains(., %locator%)]
+XPATH
+            ], false),
+            new behat_component_named_selector('Message tab', [
+                <<<XPATH
+    .//*[@data-region='message-drawer']//button[@data-toggle='collapse' and contains(string(), %locator%)]
+XPATH
+            ], false),
+            new behat_component_named_selector('Message list area', [
+                <<<XPATH
+    .//*[@data-region='message-drawer']//*[contains(@data-region, concat('view-overview-', %locator%))]
+XPATH
+            ], false),
+            new behat_component_named_selector('Message content', [
+                <<<XPATH
+    .//*[@data-region='message-drawer']//*[@data-region='message' and @data-message-id and contains(., %locator%)]
+XPATH
+            ], false),
+        ];
+    }
+
+    /**
+     * Return a list of the Mink named replacements for the component.
+     *
+     * Named replacements allow you to define parts of an xpath that can be reused multiple times, or in multiple
+     * xpaths.
+     *
+     * This method should return a list of {@link behat_component_named_replacement} and the docs on that class explain
+     * how it works.
+     *
+     * @return behat_component_named_replacement[]
+     */
+    public static function get_named_replacements(): array {
+        return [
+            new behat_component_named_replacement('textMatch', 'text()[contains(., %locator%)]'),
+        ];
+    }
+
     /**
      * Open the messaging UI.
      *
@@ -57,7 +120,7 @@ public function i_open_messaging() {
     public function i_open_the_conversations_list(string $tab) {
         $this->execute('behat_general::i_click_on', [
             $this->escape($tab),
-            'group_message_tab'
+            'core_message > Message tab'
         ]);
     }
 
@@ -78,7 +141,7 @@ public function i_open_messaging_information() {
      */
     public function i_view_contact_in_messages($userfullname) {
         // Visit home page and follow messages.
-        $this->i_select_user_in_messaging($userfullname);
+        $this->execute('behat_message::i_select_user_in_messaging', [$userfullname]);
 
         $this->execute('behat_general::i_click_on_in_the',
             array(
@@ -107,9 +170,9 @@ public function i_view_contact_in_messages($userfullname) {
      * @param string $userfullname
      */
     public function i_select_user_in_messaging($userfullname) {
-        $this->i_open_messaging();
+        $this->execute('behat_message::i_open_messaging', []);
 
-        $this->i_search_for_string_in_messaging($userfullname);
+        $this->execute('behat_message::i_search_for_string_in_messaging', [$userfullname]);
 
         // Need to limit the click to the search results because the 'view-contact-profile' elements
         // can occur in two separate divs on the page.
@@ -154,7 +217,7 @@ public function i_search_for_string_in_messaging($string) {
      * @param string $userfullname
      */
     public function i_send_message_to_user($messagecontent, $userfullname) {
-        $this->i_select_user_in_messaging($userfullname);
+        $this->execute('behat_message::i_select_user_in_messaging', [$userfullname]);
 
         $this->execute('behat_forms::i_set_the_field_with_xpath_to',
             array("//textarea[@data-region='send-message-txt']", $this->escape($messagecontent))
@@ -213,7 +276,7 @@ public function i_select_conversation_in_messaging($conversationname) {
         $this->execute('behat_general::i_click_on',
             array(
                 $this->escape($conversationname),
-                'group_message',
+                'core_message > Message',
             )
         );
     }
diff --git a/message/tests/behat/capability_message_any_user.feature b/message/tests/behat/capability_message_any_user.feature
new file mode 100644
index 0000000000000..d2b17f1535f7c
--- /dev/null
+++ b/message/tests/behat/capability_message_any_user.feature
@@ -0,0 +1,42 @@
+@core @core_message @javascript
+Feature: Capability test for 'moodle/site:messageanyuser'
+  In order to test that the 'moodle/site:messageanyuser' works as expected
+  As a user with or without the capability 'moodle/site:messageanyuser'
+  I should either be able to message anyone regardless of their messaging preferences, or not
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+      | student1 | Student   | 1        | student1@example.com |
+      | student2 | Student   | 2        | student1@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role    |
+      | teacher1 | C1     | teacher |
+      | student1 | C1     | student |
+      | student2 | C1     | student |
+    And the following config values are set as admin:
+      | messaging         | 1 |
+      | messagingallusers | 1 |
+    And I log in as "student1"
+    And I open messaging
+    And I open messaging settings preferences
+    And I click on "//label[text()[contains(.,'My contacts only')]]" "xpath_element"
+    And I log out
+
+  Scenario: Allow a message to be sent as the user has the correct capabilities
+    Given I log in as "teacher1"
+    And I open messaging
+    When I send "Hi!" message to "Student 1" user
+    Then I should see "Hi!" in the "//div[@data-region='message-drawer']//div[@data-region='content-message-container']" "xpath_element"
+
+  Scenario: Do not allow a message to be sent as the user does not have the correct capabilities
+    Given I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I follow "Participants"
+    And I follow "Student 1"
+    When I click on "Message" "link" in the ".header-button-group" "css_element"
+    Then I should see "Student 1 is not in your contacts"
diff --git a/message/tests/behat/delete_messages.feature b/message/tests/behat/delete_messages.feature
new file mode 100644
index 0000000000000..1504d8ebb8938
--- /dev/null
+++ b/message/tests/behat/delete_messages.feature
@@ -0,0 +1,269 @@
+@core @core_message @javascript
+Feature: Delete messages from conversations
+  In order to manage a course group in a course
+  As a user
+  I need to be able to delete messages from conversations
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | category | groupmode |
+      | Course 1 | C1        | 0        | 1         |
+    And the following "users" exist:
+      | username | firstname | lastname | email                |
+      | student1 | Student   | 1        | student1@example.com |
+      | student2 | Student   | 2        | student2@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role |
+      | student1 | C1     | student |
+      | student2 | C1     | student |
+    And the following "groups" exist:
+      | name    | course | idnumber | enablemessaging |
+      | Group 1 | C1     | G1       | 1               |
+    And the following "group members" exist:
+      | user     | group |
+      | student1 | G1 |
+      | student2 | G1 |
+    And the following "group messages" exist:
+      | user     | group  | message                   |
+      | student1 | G1     | Hi!                       |
+      | student2 | G1     | How are you?              |
+      | student1 | G1     | Can somebody help me?     |
+    And the following "private messages" exist:
+      | user     | contact  | message       |
+      | student1 | student2 | Hi!           |
+      | student2 | student1 | Hello!        |
+      | student1 | student2 | Are you free? |
+    And the following config values are set as admin:
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
+
+  Scenario: Delete a message sent by the user from a group conversation
+    Given I log in as "student1"
+    And I open messaging
+    And "Group 1" "core_message > Message" should exist
+    And I select "Group 1" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I click on "How are you?" "core_message > Message content"
+    And I click on "Can somebody help me?" "core_message > Message content"
+    And I should see "3" in the "[data-region='message-selected-court']" "css_element"
+#   Clicking to unselect
+    And I click on "How are you?" "core_message > Message content"
+    And I click on "Can somebody help me?" "core_message > Message content"
+    And I should see "1" in the "[data-region='message-selected-court']" "css_element"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Deleting, so messages should not be there
+    And I should see "Delete"
+    And I click on "//button[@data-action='confirm-delete-selected-messages']" "xpath_element"
+    Then I should not see "Delete"
+    And I should not see "Hi!"
+    And I should see "##today##j F##" in the "Group 1" "core_message > Message conversation"
+    And I should see "How are you?" in the "Group 1" "core_message > Message conversation"
+    And I should see "Can somebody help me?" in the "Group 1" "core_message > Message conversation"
+    And I should not see "Messages selected"
+
+  Scenario: Delete two messages from a group conversation; one sent by another user.
+    Given I log in as "student1"
+    And I open messaging
+    And "Group 1" "core_message > Message" should exist
+    And I select "Group 1" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I should see "1" in the "[data-region='message-selected-court']" "css_element"
+    And I click on "How are you?" "core_message > Message content"
+    And I should see "2" in the "[data-region='message-selected-court']" "css_element"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Deleting, so messages should not be there
+    And I should see "Delete"
+    And I click on "//button[@data-action='confirm-delete-selected-messages']" "xpath_element"
+    Then I should not see "Delete"
+    And I should not see "Hi!"
+    And I should see "##today##j F##" in the "Group 1" "core_message > Message conversation"
+    And I should not see "How are you?" in the "Group 1" "core_message > Message conversation"
+    And I should see "Can somebody help me?" in the "Group 1" "core_message > Message conversation"
+    And I should not see "Messages selected"
+#   Check messages were not deleted for other users
+    And I log out
+    And I log in as "student2"
+    And I open messaging
+    And I select "Group 1" conversation in messaging
+    And I should see "Hi!"
+    And I should see "How are you?"
+    And I should see "Can somebody help me?"
+
+  Scenario: Cancel deleting two messages from a group conversation
+    Given I log in as "student1"
+    And I open messaging
+    And "Group 1" "core_message > Message" should exist
+    And I select "Group 1" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I click on "How are you?" "core_message > Message content"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Canceling deletion, so messages should be there
+    And I should see "Cancel"
+    And I click on "//button[@data-action='cancel-confirm']" "xpath_element"
+    Then I should not see "Cancel"
+    And I should see "Hi!"
+    And I should see "How are you?" in the "Group 1" "core_message > Message conversation"
+    And I should see "2" in the "[data-region='message-selected-court']" "css_element"
+
+  Scenario: Delete a message sent by the user from a private conversation
+    Given I log in as "student1"
+    And I open messaging
+    And I should see "Private"
+    And I open the "Private" conversations list
+    And I should see "Student 2"
+    And I select "Student 2" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I should see "1" in the "[data-region='message-selected-court']" "css_element"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Deleting, so messages should not be there
+    And I should see "Delete"
+    And I click on "//button[@data-action='confirm-delete-selected-messages']" "xpath_element"
+    Then I should not see "Delete"
+    And I should not see "Hi!"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
+    And I should see "Hello!" in the "Student 2" "core_message > Message conversation"
+    And I should see "Are you free?" in the "Student 2" "core_message > Message conversation"
+    And I should not see "Messages selected"
+
+  Scenario: Delete two messages from a private conversation; one sent by another user
+    Given I log in as "student1"
+    And I open messaging
+    And I should see "Private"
+    And I open the "Private" conversations list
+    And I should see "Student 2"
+    And I select "Student 2" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I should see "1" in the "[data-region='message-selected-court']" "css_element"
+    And I click on "Hello!" "core_message > Message content"
+    And I should see "2" in the "[data-region='message-selected-court']" "css_element"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Deleting, so messages should not be there
+    And I should see "Delete"
+    And I click on "//button[@data-action='confirm-delete-selected-messages']" "xpath_element"
+    Then I should not see "Delete"
+    And I should not see "Hi!"
+    And I should not see "Hello!" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
+    And I should see "Are you free?" in the "Student 2" "core_message > Message conversation"
+    And I should not see "Messages selected"
+#   Check messages were not deleted for the other user
+    And I log out
+    And I log in as "student2"
+    And I open messaging
+    And I open the "Private" conversations list
+    And I select "Student 1" conversation in messaging
+    And I should see "Hi!"
+    And I should see "Hello!"
+    And I should see "Are you free?"
+
+  Scenario: Cancel deleting two messages from a private conversation
+    Given I log in as "student1"
+    And I open messaging
+    And I should see "Private"
+    And I open the "Private" conversations list
+    And I should see "Student 2"
+    And I select "Student 2" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I click on "Hello!" "core_message > Message content"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Canceling deletion, so messages should be there
+    And I should see "Cancel"
+    And I click on "//button[@data-action='cancel-confirm']" "xpath_element"
+    Then I should not see "Cancel"
+    And I should see "Hi!"
+    And I should see "Hello!" in the "Student 2" "core_message > Message conversation"
+    And I should see "2" in the "[data-region='message-selected-court']" "css_element"
+
+  Scenario: Delete a message sent by the user from a favorite conversation
+    Given the following "favourite conversations" exist:
+      | user     | contact  |
+      | student1 | student2 |
+    And I log in as "student1"
+    And I open messaging
+    And I should see "Student 2"
+    And I select "Student 2" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I should see "1" in the "[data-region='message-selected-court']" "css_element"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Deleting, so messages should not be there
+    And I should see "Delete"
+    And I click on "//button[@data-action='confirm-delete-selected-messages']" "xpath_element"
+    Then I should not see "Delete"
+    And I should not see "Hi!"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
+    And I should see "Hello!" in the "Student 2" "core_message > Message conversation"
+    And I should not see "Messages selected"
+
+  Scenario: Delete two messages from a favourite conversation; one sent by another user
+    Given the following "favourite conversations" exist:
+      | user     | contact  |
+      | student1 | student2 |
+    And I log in as "student1"
+    And I open messaging
+    And I should see "Student 2"
+    And I select "Student 2" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I should see "1" in the "[data-region='message-selected-court']" "css_element"
+    And I click on "Hello!" "core_message > Message content"
+    And I should see "2" in the "[data-region='message-selected-court']" "css_element"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Deleting, so messages should not be there
+    And I should see "Delete"
+    And I click on "//button[@data-action='confirm-delete-selected-messages']" "xpath_element"
+    Then I should not see "Delete"
+    And I should not see "Hi!"
+    And I should not see "Hello!" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
+    And I should see "Are you free?" in the "Student 2" "core_message > Message conversation"
+    And I should not see "Messages selected"
+
+  Scenario: Cancel deleting two messages from a favourite conversation
+    Given the following "favourite conversations" exist:
+      | user     | contact  |
+      | student1 | student2 |
+    And I log in as "student1"
+    And I open messaging
+    And I should see "Student 2"
+    And I select "Student 2" conversation in messaging
+    And I click on "Hi!" "core_message > Message content"
+    And I click on "Hello!" "core_message > Message content"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+#   Canceling deletion, so messages should be there
+    And I should see "Cancel"
+    And I click on "//button[@data-action='cancel-confirm']" "xpath_element"
+    Then I should not see "Cancel"
+    And I should see "Hi!"
+    And I should see "Hello!" in the "Student 2" "core_message > Message conversation"
+    And I should see "2" in the "[data-region='message-selected-court']" "css_element"
+
+  Scenario: Check an empty favourite conversation is still favourite
+    Given the following "favourite conversations" exist:
+      | user     | contact  |
+      | student1 | student2 |
+    And I log in as "student1"
+    And I open messaging
+    And I should see "Student 2"
+    And I select "Student 2" conversation in the "favourites" conversations list
+    And I click on "Hi!" "core_message > Message content"
+    And I click on "Hello!" "core_message > Message content"
+    And I click on "Are you free?" "core_message > Message content"
+    And "Delete selected messages" "button" should exist
+    When I click on "Delete selected messages" "button"
+    And I should see "Delete"
+    And I click on "//button[@data-action='confirm-delete-selected-messages']" "xpath_element"
+    And I go back in "view-conversation" message drawer
+    Then I should not see "Student 2" in the "//*[@data-region='message-drawer']//div[@data-region='view-overview-favourites']" "xpath_element"
+    And I send "Hi!" message to "Student 2" user
+    And I go back in "view-conversation" message drawer
+    And I go back in "view-search" message drawer
+    And I open the "Starred" conversations list
+    And I should see "Student 2" in the "//*[@data-region='message-drawer']//div[@data-region='view-overview-favourites']" "xpath_element"
diff --git a/message/tests/behat/favourite_conversations.feature b/message/tests/behat/favourite_conversations.feature
index 4f8b25cda1ef7..51ca228516b19 100644
--- a/message/tests/behat/favourite_conversations.feature
+++ b/message/tests/behat/favourite_conversations.feature
@@ -24,41 +24,42 @@ Feature: Star and unstar conversations
       | student1 | G1 |
       | student2 | G1 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Star a group conversation
     Given I log in as "student1"
     Then I open messaging
     And I open the "Group" conversations list
-    And "Group 1" "group_message" should exist
+    And "Group 1" "core_message > Message" should exist
     And I select "Group 1" conversation in messaging
     And I open contact menu
     And I click on "Star" "link" in the "//div[@data-region='header-container']" "xpath_element"
     And I go back in "view-conversation" message drawer
     And I open the "Starred" conversations list
-    And I should see "Group 1" in the "favourites" "group_message_list_area"
+    And I should see "Group 1" in the "favourites" "core_message > Message list area"
     And I open the "Group" conversations list
-    And I should not see "Group 1" in the "group-messages" "group_message_list_area"
+    And I should not see "Group 1" in the "group-messages" "core_message > Message list area"
 
   Scenario: Unstar a group conversation
     Given I log in as "student1"
     Then I open messaging
     And I open the "Group" conversations list
-    And "Group 1" "group_message" should exist
+    And "Group 1" "core_message > Message" should exist
     And I select "Group 1" conversation in messaging
     And I open contact menu
     And I click on "Star" "link" in the "//div[@data-region='header-container']" "xpath_element"
     And I go back in "view-conversation" message drawer
     And I open the "Starred" conversations list
-    And I should see "Group 1" in the "favourites" "group_message_list_area"
+    And I should see "Group 1" in the "favourites" "core_message > Message list area"
     And I select "Group 1" conversation in messaging
     And I open contact menu
     And I click on "Unstar" "link" in the "//div[@data-region='header-container']" "xpath_element"
     And I go back in "view-conversation" message drawer
     And I open the "Starred" conversations list
-    And I should not see "Group 1" in the "favourites" "group_message_list_area"
+    And I should not see "Group 1" in the "favourites" "core_message > Message list area"
     And I open the "Group" conversations list
-    And I should see "Group 1" in the "group-messages" "group_message_list_area"
+    And I should see "Group 1" in the "group-messages" "core_message > Message list area"
 
   Scenario: Star a private conversation
     Given the following "private messages" exist:
@@ -67,15 +68,15 @@ Feature: Star and unstar conversations
     Then I log in as "student1"
     And I open messaging
     And I open the "Private" conversations list
-    And "Student 2" "group_message" should exist
+    And "Student 2" "core_message > Message" should exist
     And I select "Student 2" conversation in messaging
     And I open contact menu
     And I click on "Star" "link" in the "//div[@data-region='header-container']" "xpath_element"
     And I go back in "view-conversation" message drawer
     And I open the "Starred" conversations list
-    And I should see "Student 2" in the "favourites" "group_message_list_area"
+    And I should see "Student 2" in the "favourites" "core_message > Message list area"
     And I open the "Private" conversations list
-    And I should not see "Student 2" in the "messages" "group_message_list_area"
+    And I should not see "Student 2" in the "messages" "core_message > Message list area"
 
   Scenario: Unstar a private conversation
     Given the following "private messages" exist:
@@ -86,12 +87,12 @@ Feature: Star and unstar conversations
       | student1 | student2 |
     Then I log in as "student1"
     And I open messaging
-    And I should see "Student 2" in the "favourites" "group_message_list_area"
+    And I should see "Student 2" in the "favourites" "core_message > Message list area"
     And I select "Student 2" conversation in messaging
     And I open contact menu
     And I click on "Unstar" "link" in the "//div[@data-region='header-container']" "xpath_element"
     And I go back in "view-conversation" message drawer
     And I open the "Starred" conversations list
-    And I should not see "Group 1" in the "favourites" "group_message_list_area"
+    And I should not see "Group 1" in the "favourites" "core_message > Message list area"
     And I open the "Private" conversations list
-    And I should see "Student 2" in the "messages" "group_message_list_area"
\ No newline at end of file
+    And I should see "Student 2" in the "messages" "core_message > Message list area"
diff --git a/message/tests/behat/group_conversation.feature b/message/tests/behat/group_conversation.feature
index 105164e792356..bde9a02d87d61 100644
--- a/message/tests/behat/group_conversation.feature
+++ b/message/tests/behat/group_conversation.feature
@@ -39,31 +39,34 @@ Feature: Create conversations for course's groups
       | teacher1 | G2 |
       | teacher1 | G3 |
       | student0 | G3 |
+    And the following config values are set as admin:
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Group conversations are restricted to members
     Given I log in as "teacher1"
     Then I open messaging
     And I open the "Group" conversations list
-    And "Group 1" "group_message" should exist
-    And "Group 2" "group_message" should exist
-    And "Group 3" "group_message" should not exist
+    And "Group 1" "core_message > Message" should exist
+    And "Group 2" "core_message > Message" should exist
+    And "Group 3" "core_message > Message" should not exist
     And I log out
     And I log in as "student1"
     And I open messaging
     And I open the "Group" conversations list
-    And "Group 1" "group_message" should exist
-    And "Group 2" "group_message" should not exist
-    And "Group 3" "group_message" should not exist
+    And "Group 1" "core_message > Message" should exist
+    And "Group 2" "core_message > Message" should not exist
+    And "Group 3" "core_message > Message" should not exist
 
   Scenario: View group conversation's participants numbers
     Given I log in as "teacher1"
     Then I open messaging
     And I open the "Group" conversations list
     And I select "Group 1" conversation in messaging
-    And I should see "5 participants" in the "Group 1" "group_message_header"
+    And I should see "5 participants" in the "Group 1" "core_message > Message header"
     And I go back in "view-conversation" message drawer
     And I select "Group 2" conversation in messaging
-    And I should see "1 participants" in the "Group 2" "group_message_header"
+    And I should see "1 participants" in the "Group 2" "core_message > Message header"
 
   Scenario: View group conversation's participants list
     Given I log in as "teacher1"
@@ -72,20 +75,20 @@ Feature: Create conversations for course's groups
     # Check Group 1 participants list.
     And I select "Group 1" conversation in messaging
     And I open messaging information
-    And "Teacher 1" "group_message_member" should not exist
-    And "Student 0" "group_message_member" should exist
-    And "Student 1" "group_message_member" should exist
-    And "Student 2" "group_message_member" should exist
-    And "Student 3" "group_message_member" should exist
-    And "Student 4" "group_message_member" should not exist
+    And "Teacher 1" "core_message > Message member" should not exist
+    And "Student 0" "core_message > Message member" should exist
+    And "Student 1" "core_message > Message member" should exist
+    And "Student 2" "core_message > Message member" should exist
+    And "Student 3" "core_message > Message member" should exist
+    And "Student 4" "core_message > Message member" should not exist
     And I go back in "group-info-content-container" message drawer
     And I go back in "view-conversation" message drawer
     # Check Group 2 participants list.
     And I select "Group 2" conversation in messaging
     And I open messaging information
-    And "Teacher 1" "group_message_member" should not exist
-    And "No participants" "group_message_member" should exist
-    And "Student 4" "group_message_member" should not exist
+    And "Teacher 1" "core_message > Message member" should not exist
+    And "No participants" "core_message > Message member" should exist
+    And "Student 4" "core_message > Message member" should not exist
 
   Scenario: Check group conversation members are synced when a new group member is added
     Given I log in as "teacher1"
@@ -96,13 +99,13 @@ Feature: Create conversations for course's groups
     And I open messaging
     And I open the "Group" conversations list
     And I select "Group 1" conversation in messaging
-    And I should see "6 participants" in the "Group 1" "group_message_header"
+    And I should see "6 participants" in the "Group 1" "core_message > Message header"
     And I open messaging information
-    And "Student 4" "group_message_member" should exist
+    And "Student 4" "core_message > Message member" should exist
     And I go back in "group-info-content-container" message drawer
     And I go back in "view-conversation" message drawer
     And I select "Group 2" conversation in messaging
-    And I should see "2 participants" in the "Group 2" "group_message_header"
+    And I should see "2 participants" in the "Group 2" "core_message > Message header"
     And I open messaging information
-    And "No participants" "group_message_member" should not exist
-    And "Student 4" "group_message_member" should exist
+    And "No participants" "core_message > Message member" should not exist
+    And "Student 4" "core_message > Message member" should exist
diff --git a/message/tests/behat/message_admin_settings.feature b/message/tests/behat/message_admin_settings.feature
index e482454439e8b..b7ae4849b48b8 100644
--- a/message/tests/behat/message_admin_settings.feature
+++ b/message/tests/behat/message_admin_settings.feature
@@ -8,6 +8,9 @@ Feature: Message admin settings
     Given the following "users" exist:
       | username | firstname | lastname | email |
       | user1 | User | One | one@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category | groupmode |
+      | Course 1 | C1        | 0        | 1         |
 
   Scenario: enable site messaging
     Given the following config values are set as admin:
@@ -18,6 +21,9 @@ Feature: Message admin settings
     And I should see "User One"
     And I follow "User One"
     And "Add to contacts" "link" should exist
+    And I am on "Course 1" course homepage
+    And I navigate to course participants
+    And the "With selected users..." select box should contain "Send a message"
 
   Scenario: disable site messaging
     Given the following config values are set as admin:
@@ -28,3 +34,6 @@ Feature: Message admin settings
     And I should see "User One"
     And I follow "User One"
     And "Add to contacts" "link" should not exist
+    And I am on "Course 1" course homepage
+    And I navigate to course participants
+    And the "With selected users..." select box should not contain "Send a message"
diff --git a/message/tests/behat/message_delete_conversation.feature b/message/tests/behat/message_delete_conversation.feature
index 02bfe52c452fc..5d7d65a31dea5 100644
--- a/message/tests/behat/message_delete_conversation.feature
+++ b/message/tests/behat/message_delete_conversation.feature
@@ -19,6 +19,7 @@ Feature: Message delete conversations
     And the following config values are set as admin:
       | messaging         | 1 |
       | messagingallusers | 1 |
+      | messagingminpoll  | 1 |
     And the following "private messages" exist:
       | user     | contact  | message               |
       | student1 | student2 | Hi!                   |
@@ -34,17 +35,17 @@ Feature: Message delete conversations
     And I should see "Delete"
     And I click on "//button[@data-action='confirm-delete-conversation']" "xpath_element"
     And I should not see "Delete"
-    And I should not see "Hi!" in the "Student 1" "group_message_conversation"
-    And I should not see "What do you need?" in the "Student 1" "group_message_conversation"
-    And I should not see "##today##j F##" in the "Student 1" "group_message_conversation"
+    And I should not see "Hi!" in the "Student 1" "core_message > Message conversation"
+    And I should not see "What do you need?" in the "Student 1" "core_message > Message conversation"
+    And I should not see "##today##j F##" in the "Student 1" "core_message > Message conversation"
 #   Check user is deleting private conversation only for them
     And I log out
     And I log in as "student1"
     And I open messaging
     And I select "Student 2" conversation in the "messages" conversations list
-    And I should see "Hi!" in the "Student 2" "group_message_conversation"
-    And I should see "What do you need?" in the "Student 2" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 2" "group_message_conversation"
+    And I should see "Hi!" in the "Student 2" "core_message > Message conversation"
+    And I should see "What do you need?" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
 
   Scenario: Cancel deleting a private conversation
     Given I log in as "student1"
@@ -56,8 +57,8 @@ Feature: Message delete conversations
     And I should see "Cancel"
     And I click on "//button[@data-action='cancel-confirm']" "xpath_element"
     And I should not see "Cancel"
-    And I should see "Hi!" in the "Student 2" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 2" "group_message_conversation"
+    And I should see "Hi!" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
 
   Scenario: Delete a starred conversation
     Given the following "favourite conversations" exist:
@@ -72,17 +73,17 @@ Feature: Message delete conversations
     And I should see "Delete"
     And I click on "//button[@data-action='confirm-delete-conversation']" "xpath_element"
     And I should not see "Delete"
-    And I should not see "Hi!" in the "Student 2" "group_message_conversation"
-    And I should not see "What do you need?" in the "Student 2" "group_message_conversation"
-    And I should not see "##today##j F##" in the "Student 2" "group_message_conversation"
+    And I should not see "Hi!" in the "Student 2" "core_message > Message conversation"
+    And I should not see "What do you need?" in the "Student 2" "core_message > Message conversation"
+    And I should not see "##today##j F##" in the "Student 2" "core_message > Message conversation"
 #   Check user is deleting private conversation only for them
     And I log out
     And I log in as "student2"
     And I open messaging
     And I select "Student 1" conversation in the "messages" conversations list
-    And I should see "Hi!" in the "Student 1" "group_message_conversation"
-    And I should see "What do you need?" in the "Student 1" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 1" "group_message_conversation"
+    And I should see "Hi!" in the "Student 1" "core_message > Message conversation"
+    And I should see "What do you need?" in the "Student 1" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 1" "core_message > Message conversation"
 
   Scenario: Cancel deleting a starred conversation
     Given the following "favourite conversations" exist:
@@ -91,16 +92,16 @@ Feature: Message delete conversations
     When I log in as "student1"
     And I open messaging
     And I select "Student 2" conversation in the "favourites" conversations list
-    Then I should see "Hi!" in the "Student 2" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 2" "group_message_conversation"
+    Then I should see "Hi!" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
     And I open contact menu
     And I click on "Delete conversation" "link" in the "//div[@data-region='header-container']" "xpath_element"
 #   Cancel deletion, so conversation should be there
     And I should see "Cancel"
     And I click on "//button[@data-action='cancel-confirm']" "xpath_element"
     And I should not see "Cancel"
-    And I should see "Hi!" in the "Student 2" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 2" "group_message_conversation"
+    And I should see "Hi!" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
 
   Scenario: Check a deleted starred conversation is still starred
     Given the following "favourite conversations" exist:
@@ -114,10 +115,10 @@ Feature: Message delete conversations
     Then I should see "Delete"
     And I click on "//button[@data-action='confirm-delete-conversation']" "xpath_element"
     And I should not see "Delete"
-    And I should not see "Hi!" in the "Student 2" "group_message_conversation"
+    And I should not see "Hi!" in the "Student 2" "core_message > Message conversation"
     And I go back in "view-conversation" message drawer
-    And I should not see "Student 2" in the "favourites" "group_message_list_area"
+    And I should not see "Student 2" in the "favourites" "core_message > Message list area"
     And I send "Hi!" message to "Student 2" user
     And I go back in "view-conversation" message drawer
     And I go back in "view-search" message drawer
-    And I should see "Student 2" in the "favourites" "group_message_list_area"
+    And I should see "Student 2" in the "favourites" "core_message > Message list area"
diff --git a/message/tests/behat/message_drawer_manage_contacts.feature b/message/tests/behat/message_drawer_manage_contacts.feature
index 4c57223ac820a..cd8cf1aef0f85 100644
--- a/message/tests/behat/message_drawer_manage_contacts.feature
+++ b/message/tests/behat/message_drawer_manage_contacts.feature
@@ -24,8 +24,9 @@ Feature: Manage contacts
       | user     | contact |
       | student1 | student2 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging         | 1 |
       | messagingallusers | 1 |
+      | messagingminpoll  | 1 |
 
   Scenario: Send a 'contact request' to someone to add a contact
     Given I log in as "student1"
@@ -43,7 +44,7 @@ Feature: Manage contacts
     And I should see "Contact request sent"
     And I log out
     And I log in as "student4"
-    Then I should see "2" in the "//*[@data-region='count-container']" "xpath_element"
+    Then I should see "2" in the "//div[@data-region='popover-region-messages']//*[@data-region='count-container']" "xpath_element"
     And I open messaging
     And I click on "Contacts" "link"
     Then I should see "2" in the "//div[@data-region='view-contacts']//*[@data-region='contact-request-count']" "xpath_element"
@@ -68,7 +69,7 @@ Feature: Manage contacts
     And I should see "Contact request sent"
     And I log out
     And I log in as "student3"
-    Then I should see "1" in the "//*[@data-region='count-container']" "xpath_element"
+    Then I should see "1" in the "//div[@data-region='popover-region-messages']//*[@data-region='count-container']" "xpath_element"
     And I open messaging
     And I click on "Contacts" "link"
     Then I should see "1" in the "//div[@data-region='view-contacts']//*[@data-region='contact-request-count']" "xpath_element"
diff --git a/message/tests/behat/message_manage_notification_preferences.feature b/message/tests/behat/message_manage_notification_preferences.feature
new file mode 100644
index 0000000000000..0978a6eafd1b8
--- /dev/null
+++ b/message/tests/behat/message_manage_notification_preferences.feature
@@ -0,0 +1,93 @@
+@core @core_message @javascript
+Feature: Manage notification preferences - Email
+  In order to be notified of messages
+  As a user
+  I need to be able to update my messaging notification preferences
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | student1 | Student   | 1        | student1@example.com |
+    And the following config values are set as admin:
+      | messaging | 1 |
+
+  Scenario: Disable email notifications for everybody
+    Given I log in as "admin"
+    When I navigate to "Messaging > Notification settings" in site administration
+    And I set the field "email" to "0"
+    And I press "Save changes"
+    And I log out
+    And I log in as "student1"
+    And I open messaging
+    And I open messaging settings preferences
+    Then I should not see "Notification preferences"
+    And I should not see "Email"
+
+  Scenario: Enable email notifications
+#   Disable email default value
+    Given the following "user preferences" exist:
+      | user      | preference                                        | value |
+      | student1  | message_provider_moodle_instantmessage_loggedin   | none  |
+      | student1  | message_provider_moodle_instantmessage_loggedoff  | none  |
+    When I log in as "admin"
+    And I navigate to "Messaging > Notification settings" in site administration
+    And I set the field "email" to "1"
+    And I press "Save changes"
+    And I log out
+    And I log in as "student1"
+    And I open messaging
+    And I open messaging settings preferences
+    Then I should see "Notification preferences"
+    And I should see "Email"
+    And the field "Email" matches value "0"
+    And I set the field "Email" to "1"
+    And I follow "Preferences" in the user menu
+    And I click on "Message preferences" "link"
+    And the field "Email" matches value "1"
+
+  Scenario: Disable email notifications
+    Given I log in as "admin"
+    When I navigate to "Messaging > Notification settings" in site administration
+    And I set the field "email" to "1"
+    And I press "Save changes"
+    And I log out
+    And I log in as "student1"
+    And I open messaging
+    And I open messaging settings preferences
+    Then I should see "Notification preferences"
+    And I should see "Email"
+    And the field "Email" matches value "1"
+    And I set the field "Email" to "0"
+    And I follow "Preferences" in the user menu
+    And I click on "Message preferences" "link"
+    And the field "Email" matches value "0"
+
+  Scenario: Config jabber
+    Given the following config values are set as admin:
+      | jabberhost | jabber.org |
+      | jabberusername | moodlemessageservice |
+      | jabberpassword | password |
+    When I log in as "admin"
+    And I navigate to "Messaging > Notification settings" in site administration
+    And I set the field "jabber" to "1"
+    And I press "Save changes"
+    And I click on "Settings" "link" in the "Jabber" "table_row"
+    And I navigate to "Messaging > Notification settings" in site administration
+    And I press "Save changes"
+    And I log out
+    And I log in as "student1"
+    And I open messaging
+    And I open messaging settings preferences
+    Then I should not see "Notification preferences"
+    And I should not see "Jabber"
+    And I open the notification popover
+    And I follow "Notification preferences"
+    And I click on "Jabber" "link"
+    And I should see "Jabber ID"
+    And I set the field "jabber_jabberid" to "student1@jabber.org"
+    And I click on "Save changes" "button" in the ".modal-dialog" "css_element"
+    And I am on homepage
+    And I open messaging
+    And I open messaging settings preferences
+    And I should see "Notification preferences"
+    And I should see "Jabber"
\ No newline at end of file
diff --git a/message/tests/behat/message_manage_preferences.feature b/message/tests/behat/message_manage_preferences.feature
index f8c304abe4076..65c013e92bbb6 100644
--- a/message/tests/behat/message_manage_preferences.feature
+++ b/message/tests/behat/message_manage_preferences.feature
@@ -33,8 +33,9 @@ Feature: Manage preferences
       | user     | contact |
       | student1 | student2 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging         | 1 |
       | messagingallusers | 1 |
+      | messagingminpoll  | 1 |
 
   # Recipient has 'My contacts only' set.
   Scenario: Allow sending a message when you are a contact
diff --git a/message/tests/behat/message_send_messages.feature b/message/tests/behat/message_send_messages.feature
index 1596073932f20..519cee1649c33 100644
--- a/message/tests/behat/message_send_messages.feature
+++ b/message/tests/behat/message_send_messages.feature
@@ -24,29 +24,30 @@ Feature: Message send messages
       | student1 | G1 |
       | student2 | G1 |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Send a message to a group conversation
     Given I log in as "student1"
     And I open messaging
     And I open the "Group" conversations list
-    And "Group 1" "group_message" should exist
+    And "Group 1" "core_message > Message" should exist
     And I select "Group 1" conversation in messaging
     When I send "Hi!" message in the message area
-    Then I should see "Hi!" in the "Group 1" "group_message_conversation"
-    And I should see "##today##j F##" in the "Group 1" "group_message_conversation"
+    Then I should see "Hi!" in the "Group 1" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Group 1" "core_message > Message conversation"
     And I log out
     And I log in as "student2"
     And I open messaging
-    And "Group 1" "group_message" should exist
+    And "Group 1" "core_message > Message" should exist
     And I select "Group 1" conversation in messaging
-    And I should see "Hi!" in the "Group 1" "group_message_conversation"
+    And I should see "Hi!" in the "Group 1" "core_message > Message conversation"
 
   Scenario: Send a message to a starred conversation
     Given I log in as "student1"
     When I open messaging
     And I open the "Group" conversations list
-    Then "Group 1" "group_message" should exist
+    Then "Group 1" "core_message > Message" should exist
     And I select "Group 1" conversation in the "group-messages" conversations list
     And I open contact menu
     And I click on "Star" "link" in the "//div[@data-region='header-container']" "xpath_element"
@@ -55,11 +56,11 @@ Feature: Message send messages
     And I should see "Group 1"
     And I select "Group 1" conversation in the "favourites" conversations list
     And I send "Hi!" message in the message area
-    And I should see "Hi!" in the "Group 1" "group_message_conversation"
-    And I should see "##today##j F##" in the "Group 1" "group_message_conversation"
+    And I should see "Hi!" in the "Group 1" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Group 1" "core_message > Message conversation"
     And I go back in "view-conversation" message drawer
     And I open the "Group" conversations list
-    And I should not see "Group 1" in the "Group" "group_message_tab"
+    And I should not see "Group 1" in the "Group" "core_message > Message tab"
 
   Scenario: Send a message to a private conversation via contact tab
     Given the following "message contacts" exist:
@@ -70,17 +71,17 @@ Feature: Message send messages
     And I click on "Contacts" "link"
     And I click on "Student 2" "link" in the "//*[@data-section='contacts']" "xpath_element"
     When I send "Hi!" message in the message area
-    Then I should see "Hi!" in the "Student 2" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 2" "group_message_conversation"
+    Then I should see "Hi!" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
 
   Scenario: Try to send a message to a private conversation is not contact but you are allowed to send a message
     Given I log in as "student1"
     And I open messaging
     When I send "Hi!" message to "Student 2" user
-    Then I should see "Hi!" in the "Student 2" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 2" "group_message_conversation"
+    Then I should see "Hi!" in the "Student 2" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 2" "core_message > Message conversation"
     And I log out
     And I log in as "student2"
     And I open messaging
     And I select "Student 1" conversation in messaging
-    And I should see "Hi!" in the "Student 1" "group_message_conversation"
\ No newline at end of file
+    And I should see "Hi!" in the "Student 1" "core_message > Message conversation"
diff --git a/message/tests/behat/mute_conversations.feature b/message/tests/behat/mute_conversations.feature
new file mode 100644
index 0000000000000..ca30488036da1
--- /dev/null
+++ b/message/tests/behat/mute_conversations.feature
@@ -0,0 +1,94 @@
+@core @core_message @javascript
+Feature: Mute and unmute conversations
+  In order to manage my conversations
+  As a user
+  I need to be able to mute and unmute conversations
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | category | groupmode |
+      | Course 1 | C1        | 0        | 1         |
+    And the following "users" exist:
+      | username | firstname | lastname | email                |
+      | student1 | Student   | 1        | student1@example.com |
+      | student2 | Student   | 2        | student2@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role |
+      | student1 | C1     | student |
+      | student2 | C1     | student |
+    And the following "groups" exist:
+      | name    | course | idnumber | enablemessaging |
+      | Group 1 | C1     | G1       | 1               |
+    And the following "group members" exist:
+      | user     | group | course |
+      | student1 | G1    | C1     |
+      | student2 | G1    | C1     |
+    And the following config values are set as admin:
+      | messaging | 1 |
+    And the following "private messages" exist:
+      | user     | contact  | message |
+      | student1 | student2 | Hi!     |
+
+  Scenario: Mute a group conversation
+    Given I log in as "student1"
+    When I open messaging
+    And I open the "Group" conversations list
+    Then "Group 1" "core_message > Message" should exist
+    And "muted" "icon_container" in the "Group 1" "core_message > Message" should not be visible
+    And I select "Group 1" conversation in messaging
+    And "muted" "icon_container" in the "Group 1" "core_message > Message header" should not be visible
+    And I open contact menu
+    And I click on "Mute" "link" in the "[data-region='header-container']" "css_element"
+    And "muted" "icon_container" in the "Group 1" "core_message > Message header" should be visible
+    And I go back in "view-conversation" message drawer
+    And "muted" "icon_container" in the "Group 1" "core_message > Message" should be visible
+
+  Scenario: Mute a private conversation
+    When I log in as "student1"
+    And I open messaging
+    Then I should see "Private"
+    And I open the "Private" conversations list
+    And I should see "Student 2"
+    And "muted" "icon_container" in the "Student 2" "core_message > Message" should not be visible
+    And I select "Student 2" conversation in messaging
+    And "muted" "icon_container" in the "[data-action='view-contact']" "css_element" should not be visible
+    And I open contact menu
+    And I click on "Mute" "link" in the "[data-region='header-container']" "css_element"
+    And "muted" "icon_container" in the "[data-action='view-contact']" "css_element" should be visible
+    And I go back in "view-conversation" message drawer
+    And "muted" "icon_container" in the "Student 2" "core_message > Message" should be visible
+
+  Scenario: Unmute a group conversation
+    Given the following "muted group conversations" exist:
+      | user     | group | course |
+      | student1 | G1    | C1     |
+    When I log in as "student1"
+    And I open messaging
+    And I open the "Group" conversations list
+    Then "Group 1" "core_message > Message" should exist
+    And "muted" "icon_container" in the "Group 1" "core_message > Message" should be visible
+    And I select "Group 1" conversation in messaging
+    And "muted" "icon_container" in the "Group 1" "core_message > Message header" should be visible
+    And I open contact menu
+    And I click on "Unmute" "link" in the "[data-region='header-container']" "css_element"
+    And "muted" "icon_container" in the "Group 1" "core_message > Message header" should not be visible
+    And I go back in "view-conversation" message drawer
+    And "muted" "icon_container" in the "Group 1" "core_message > Message" should not be visible
+
+  Scenario: Unmute a private conversation
+    Given the following "muted private conversations" exist:
+      | user     | contact  |
+      | student1 | student2 |
+    When I log in as "student1"
+    And I open messaging
+    Then I should see "Private"
+    And I open the "Private" conversations list
+    And I should see "Student 2"
+    And "muted" "icon_container" in the "Student 2" "core_message > Message" should be visible
+    And I select "Student 2" conversation in messaging
+    And "muted" "icon_container" in the "[data-action='view-contact']" "css_element" should be visible
+    And I open contact menu
+    And I click on "Unmute" "link" in the "[data-region='header-container']" "css_element"
+    And "muted" "icon_container" in the "[data-action='view-contact']" "css_element" should not be visible
+    And I go back in "view-conversation" message drawer
+    And "muted" "icon_container" in the "Student 2" "core_message > Message" should not be visible
diff --git a/message/tests/behat/self_conversation.feature b/message/tests/behat/self_conversation.feature
index 14f6a543909c2..ea7a669cce4aa 100644
--- a/message/tests/behat/self_conversation.feature
+++ b/message/tests/behat/self_conversation.feature
@@ -9,52 +9,53 @@ Feature: Self conversation
       | username | firstname | lastname | email                |
       | student1 | Student   | 1        | student1@example.com |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Self conversation exists
     Given I log in as "student1"
     When I open messaging
-    Then "Student 1" "group_message" should exist
+    Then "Student 1" "core_message > Message" should exist
     And I select "Student" conversation in messaging
     And I should see "Personal space"
 
   Scenario: Self conversation can be unstarred
     Given I log in as "student1"
     When I open messaging
-    Then "Student 1" "group_message" should exist
+    Then "Student 1" "core_message > Message" should exist
     And I select "Student" conversation in messaging
     And I open contact menu
-    And I click on "Unstar" "link" in the "Student 1" "group_message_header"
+    And I click on "Unstar" "link" in the "Student 1" "core_message > Message header"
     And I go back in "view-conversation" message drawer
     And I open the "Starred" conversations list
-    And I should not see "Student 1" in the "favourites" "group_message_list_area"
+    And I should not see "Student 1" in the "favourites" "core_message > Message list area"
     And I open the "Private" conversations list
-    And I should see "Student 1" in the "messages" "group_message_list_area"
+    And I should see "Student 1" in the "messages" "core_message > Message list area"
 
   Scenario: Self conversation can be deleted
     Given I log in as "student1"
     When I open messaging
-    Then "Student 1" "group_message" should exist
+    Then "Student 1" "core_message > Message" should exist
     And I select "Student 1" conversation in messaging
     And I open contact menu
-    And I click on "Delete conversation" "link" in the "Student 1" "group_message_header"
+    And I click on "Delete conversation" "link" in the "Student 1" "core_message > Message header"
     And I should see "Delete"
     And I click on "//button[@data-action='confirm-delete-conversation']" "xpath_element"
     And I should not see "Delete"
     And I go back in "view-conversation" message drawer
     And I open the "Starred" conversations list
-    And I should not see "Student 1" in the "favourites" "group_message_list_area"
+    And I should not see "Student 1" in the "favourites" "core_message > Message list area"
     And I open the "Private" conversations list
-    And I should not see "Student 1" in the "messages" "group_message_list_area"
+    And I should not see "Student 1" in the "messages" "core_message > Message list area"
 
   Scenario: Send a message to a self-conversation via message drawer
     Given I log in as "student1"
     When I open messaging
-    Then "Student 1" "group_message" should exist
+    Then "Student 1" "core_message > Message" should exist
     And I select "Student 1" conversation in messaging
     And I send "Hi!" message in the message area
-    And I should see "Hi!" in the "Student 1" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 1" "group_message_conversation"
+    And I should see "Hi!" in the "Student 1" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 1" "core_message > Message conversation"
 
   Scenario: Send a message to a self-conversation via user profile
     Given I log in as "student1"
@@ -62,5 +63,5 @@ Feature: Self conversation
     Then I should see "Message"
     And I click on "Message" "icon"
     And I send "Hi!" message in the message area
-    And I should see "Hi!" in the "Student 1" "group_message_conversation"
-    And I should see "##today##j F##" in the "Student 1" "group_message_conversation"
+    And I should see "Hi!" in the "Student 1" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "Student 1" "core_message > Message conversation"
diff --git a/message/tests/behat/unread_messages.feature b/message/tests/behat/unread_messages.feature
index 07b47f5a87e3c..bf6095e12adc8 100644
--- a/message/tests/behat/unread_messages.feature
+++ b/message/tests/behat/unread_messages.feature
@@ -24,29 +24,30 @@ Feature: Unread messages
       | student1 | NG |
       | student2 | NG |
     And the following config values are set as admin:
-      | messaging | 1 |
+      | messaging        | 1 |
+      | messagingminpoll | 1 |
 
   Scenario: Unread messages for group conversation
     Given I log in as "student1"
     When I open messaging
     And I open the "Group" conversations list
-    Then "New group" "group_message" should exist
+    Then "New group" "core_message > Message" should exist
     And I select "New group" conversation in messaging
     And I send "Hi!" message in the message area
-    And I should see "Hi!" in the "New group" "group_message_conversation"
-    And I should see "##today##j F##" in the "New group" "group_message_conversation"
+    And I should see "Hi!" in the "New group" "core_message > Message conversation"
+    And I should see "##today##j F##" in the "New group" "core_message > Message conversation"
     And I log out
     And I log in as "student2"
     And I should see "1" in the "//*[@title='Toggle messaging drawer']/../*[@data-region='count-container']" "xpath_element"
     And I open messaging
-    And I should see "1" in the "Group" "group_message_tab"
-    And "New group" "group_message" should exist
-    And I should see "1" in the "New group" "group_message"
+    And I should see "1" in the "Group" "core_message > Message tab"
+    And "New group" "core_message > Message" should exist
+    And I should see "1" in the "New group" "core_message > Message"
     And I select "New group" conversation in messaging
-    And I should see "Hi!" in the "New group" "group_message_conversation"
+    And I should see "Hi!" in the "New group" "core_message > Message conversation"
     And I should not see "1" in the "//*[@title='Toggle messaging drawer']/../*[@data-region='count-container']" "xpath_element"
-    And I should not see "1" in the "Group" "group_message_tab"
-    And I should not see "1" in the "New group" "group_message"
+    And I should not see "1" in the "Group" "core_message > Message tab"
+    And I should not see "1" in the "New group" "core_message > Message"
 
   Scenario: Unread messages for private conversation
     Given the following "private messages" exist:
@@ -56,14 +57,14 @@ Feature: Unread messages
     When I log in as "student1"
     Then I should see "1" in the "//*[@title='Toggle messaging drawer']/../*[@data-region='count-container']" "xpath_element"
     And I open messaging
-    And I should see "1" in the "Private" "group_message_tab"
-    And "Student 2" "group_message" should exist
-    And I should see "1" in the "Student 2" "group_message"
+    And I should see "1" in the "Private" "core_message > Message tab"
+    And "Student 2" "core_message > Message" should exist
+    And I should see "1" in the "Student 2" "core_message > Message"
     And I select "Student 2" conversation in messaging
-    And I should see "Hi!" in the "Student 2" "group_message_conversation"
+    And I should see "Hi!" in the "Student 2" "core_message > Message conversation"
     And I should not see "1" in the "//*[@title='Toggle messaging drawer']/../*[@data-region='count-container']" "xpath_element"
-    And I should not see "1" in the "Private" "group_message_tab"
-    And I should not see "1" in the "Student 2" "group_message"
+    And I should not see "1" in the "Private" "core_message > Message tab"
+    And I should not see "1" in the "Student 2" "core_message > Message"
 
   Scenario: Unread messages for starred conversation
     Given the following "private messages" exist:
@@ -76,11 +77,11 @@ Feature: Unread messages
     When I log in as "student1"
     Then I should see "1" in the "//*[@title='Toggle messaging drawer']/../*[@data-region='count-container']" "xpath_element"
     And I open messaging
-    And I should see "1" in the "Starred" "group_message_tab"
-    And "Student 2" "group_message" should exist
-    And I should see "1" in the "Student 2" "group_message"
+    And I should see "1" in the "Starred" "core_message > Message tab"
+    And "Student 2" "core_message > Message" should exist
+    And I should see "1" in the "Student 2" "core_message > Message"
     And I select "Student 2" conversation in messaging
-    And I should see "Hi!" in the "Student 2" "group_message_conversation"
+    And I should see "Hi!" in the "Student 2" "core_message > Message conversation"
     And I should not see "1" in the "//*[@title='Toggle messaging drawer']/../*[@data-region='count-container']" "xpath_element"
-    And I should not see "1" in the "Starred" "group_message_tab"
-    And I should not see "1" in the "Student 2" "group_message"
+    And I should not see "1" in the "Starred" "core_message > Message tab"
+    And I should not see "1" in the "Student 2" "core_message > Message"
diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php
index 18a0391a7486a..254c12601d440 100644
--- a/mod/assign/db/upgrade.php
+++ b/mod/assign/db/upgrade.php
@@ -155,5 +155,8 @@ function xmldb_assign_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018120500, 'assign');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/externallib.php b/mod/assign/externallib.php
index 7bb0361c2cb1e..36048007e3b0c 100644
--- a/mod/assign/externallib.php
+++ b/mod/assign/externallib.php
@@ -432,7 +432,7 @@ public static function get_assignments($courseids = array(), $capabilities = arr
                         'id' => $module->assignmentid,
                         'cmid' => $module->id,
                         'course' => $module->course,
-                        'name' => $module->name,
+                        'name' => external_format_string($module->name, $context),
                         'nosubmissions' => $module->nosubmissions,
                         'submissiondrafts' => $module->submissiondrafts,
                         'sendnotifications' => $module->sendnotifications,
@@ -462,9 +462,10 @@ public static function get_assignments($courseids = array(), $capabilities = arr
 
                     // Return or not intro and file attachments depending on the plugin settings.
                     if ($assign->show_intro()) {
-
-                        list($assignment['intro'], $assignment['introformat']) = external_format_text($module->intro,
-                            $module->introformat, $context->id, 'mod_assign', 'intro', null);
+                        $options = array('noclean' => true);
+                        list($assignment['intro'], $assignment['introformat']) =
+                            external_format_text($module->intro, $module->introformat, $context->id, 'mod_assign', 'intro', null,
+                                $options);
                         $assignment['introfiles'] = external_util::get_area_files($context->id, 'mod_assign', 'intro', false,
                                                                                     false);
 
@@ -527,7 +528,7 @@ private static function get_assignments_assignment_structure() {
                 'id' => new external_value(PARAM_INT, 'assignment id'),
                 'cmid' => new external_value(PARAM_INT, 'course module id'),
                 'course' => new external_value(PARAM_INT, 'course id'),
-                'name' => new external_value(PARAM_TEXT, 'assignment name'),
+                'name' => new external_value(PARAM_RAW, 'assignment name'),
                 'nosubmissions' => new external_value(PARAM_INT, 'no submissions'),
                 'submissiondrafts' => new external_value(PARAM_INT, 'submissions drafts'),
                 'sendnotifications' => new external_value(PARAM_INT, 'send notifications'),
@@ -2350,6 +2351,8 @@ public static function get_submission_status($assignid, $userid = 0, $groupid =
             throw new required_capability_exception($context, 'mod/assign:viewgrades', 'nopermission', '');
         }
 
+        $assign->update_effective_access($user->id);
+
         $gradingsummary = $lastattempt = $feedback = $previousattempts = null;
 
         // Get the renderable since it contais all the info we need.
diff --git a/mod/assign/feedback/comments/db/upgrade.php b/mod/assign/feedback/comments/db/upgrade.php
index ae87b98ad30f1..2ef8e87b427f9 100644
--- a/mod/assign/feedback/comments/db/upgrade.php
+++ b/mod/assign/feedback/comments/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignfeedback_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/editpdf/ajax.php b/mod/assign/feedback/editpdf/ajax.php
index c940e873af6f8..fd9cd4cac0618 100644
--- a/mod/assign/feedback/editpdf/ajax.php
+++ b/mod/assign/feedback/editpdf/ajax.php
@@ -83,8 +83,11 @@
 
     if (in_array($response->status, $readystatuslist)) {
         $combineddocument = document_services::get_combined_pdf_for_attempt($assignment, $userid, $attemptnumber);
-        $response->pagecount = $combineddocument->get_page_count();
-    } else if (in_array($response->status, $completestatuslist)) {
+        $response->status = $combineddocument->get_status();
+        $response->filecount = $combineddocument->get_document_count();
+    }
+
+    if (in_array($response->status, $completestatuslist)) {
         $pages = document_services::get_page_images_for_attempt($assignment,
                                                                 $userid,
                                                                 $attemptnumber,
diff --git a/mod/assign/feedback/editpdf/db/upgrade.php b/mod/assign/feedback/editpdf/db/upgrade.php
index ef219b66d8c88..0e0a90bfd3165 100644
--- a/mod/assign/feedback/editpdf/db/upgrade.php
+++ b/mod/assign/feedback/editpdf/db/upgrade.php
@@ -123,5 +123,8 @@ function xmldb_assignfeedback_editpdf_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2019010800, 'assignfeedback', 'editpdf');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php b/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
index 94ec1b0efe76d..c9cdc6f6f7d04 100644
--- a/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
+++ b/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
@@ -50,9 +50,9 @@
 $string['errorgenerateimage'] = 'Error generating image with ghostscript, debugging info: {$a}';
 $string['errorpdfpage'] = 'There was an error while generating this page.';
 $string['editpdf'] = 'Annotate PDF';
-$string['editpdf_help'] = 'Annotate students submissions directly in the browser and produce an edited downloadable PDF.';
+$string['editpdf_help'] = 'Annotate student submissions directly in the browser and produce an edited downloadable PDF.';
 $string['enabled'] = 'Annotate PDF';
-$string['enabled_help'] = 'If enabled, the teacher will be able to create annotated PDF files when marking the assignments. This allows the teacher to add comments, drawing and stamps directly on top of the students work. The annotating is done in the browser and no extra software is required.';
+$string['enabled_help'] = 'If enabled, the teacher will be able to create annotated PDF files when marking assignment submissions. This allows the teacher to add comments, drawing and stamps directly on top of the student\'s work. The annotating is done in the browser and no extra software is required.';
 $string['expcolcomments'] = 'Expand/collapse all comments';
 $string['filter'] = 'Filter comments...';
 $string['generatefeedback'] = 'Generate feedback PDF';
diff --git a/mod/assign/feedback/editpdf/styles.css b/mod/assign/feedback/editpdf/styles.css
index 48d87f819be92..2a737242815b4 100644
--- a/mod/assign/feedback/editpdf/styles.css
+++ b/mod/assign/feedback/editpdf/styles.css
@@ -230,7 +230,6 @@
     margin-right: 0;
     margin-top: 0;
     border-radius: 4px;
-    width: 200px;
 }
 
 .moodle-dialogue-base .moodle-dialogue.assignfeedback_editpdf_dropdown .moodle-dialogue-bd {
@@ -274,7 +273,6 @@ ul.assignfeedback_editpdf_search {
 
 ul.assignfeedback_editpdf_menu {
     margin: 0;
-    min-width: 200px;
     max-height: 40vh;
     overflow-y: auto;
     overflow-x: hidden;
@@ -345,7 +343,15 @@ ul.assignfeedback_editpdf_menu {
 
 .assignfeedback_editpdf_widget .commentdrawable {
     display: flex;
-    z-index: 1;
+    z-index: 52;
+    height: 0;
+}
+.assignfeedback_editpdf_widget .annotation {
+    z-index: 51;
+}
+
+.assignfeedback_editpdf_widget .deleteannotationbutton {
+    z-index: 51;
 }
 
 .assignfeedback_editpdf_widget .commentdrawable label {
@@ -358,6 +364,7 @@ ul.assignfeedback_editpdf_menu {
 
 .assignfeedback_editpdf_widget .commentdrawable.commentcollapsed {
     z-index: auto;
+    width: 24px;
 }
 
 .assignfeedback_editpdf_widget .commentdrawable.commentcollapsed textarea,
diff --git a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
index ee82675f460f6..14ce3579b69fd 100644
--- a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
+++ b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
@@ -732,7 +732,6 @@ Y.extend(ANNOTATION, Y.Base, {
 
             drawingregion.append(deletelink);
             deletelink.setData('annotation', this);
-            deletelink.setStyle('zIndex', '200');
 
             deletelink.on('click', this.remove, this);
             deletelink.on('key', this.remove, 'space,enter', this);
@@ -1570,24 +1569,24 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
      */
     draw: function() {
         var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
-            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
+            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
             node,
             position;
 
         position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
         node = Y.Node.create('<div/>');
-        // If these are absolutely positioned, they escape their scroll container.
+        node.addClass('annotation');
+        node.addClass('stamp');
         node.setStyles({
-            'position': 'relative',
+            'position': 'absolute',
             'display': 'inline-block',
             'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
             'width': (this.endx - this.x),
             'height': (this.endy - this.y),
-            'backgroundSize': '100% 100%',
-            'zIndex': 50
+            'backgroundSize': '100% 100%'
         });
 
-        drawingregion.append(node);
+        drawingcanvas.append(node);
         node.setX(position.x);
         node.setY(position.y);
         drawable.store_position(node, position.x, position.y);
@@ -1624,14 +1623,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
         position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(bounds.x, bounds.y));
 
         node = Y.Node.create('<div/>');
+        node.addClass('annotation');
+        node.addClass('stamp');
         node.setStyles({
             'position': 'absolute',
             'display': 'inline-block',
             'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
             'width': bounds.width,
             'height': bounds.height,
-            'backgroundSize': '100% 100%',
-            'zIndex': 50
+            'backgroundSize': '100% 100%'
         });
 
         drawingregion.append(node);
@@ -2544,7 +2544,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
     this.draw = function(focus) {
         var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
             node,
-            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
+            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
             container,
             label,
             marker,
@@ -2587,8 +2587,8 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
             color: COMMENTTEXTCOLOUR
         });
 
-        drawingregion.append(container);
-        container.setStyle('position', 'relative');
+        drawingcanvas.append(container);
+        container.setStyle('position', 'absolute');
         container.setX(position.x);
         container.setY(position.y);
         drawable.store_position(container, position.x, position.y);
@@ -3664,7 +3664,7 @@ EDITOR.prototype = {
      * @method open_in_panel
      */
     open_in_panel: function(panel) {
-        var drawingcanvas, drawingregion;
+        var drawingcanvas;
 
         this.panel = panel;
         panel.append(this.get('body'));
@@ -3675,9 +3675,6 @@ EDITOR.prototype = {
         drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
         this.graphic = new Y.Graphic({render: drawingcanvas});
 
-        drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
-        drawingregion.on('scroll', this.move_canvas, this);
-
         if (!this.get('readonly')) {
             drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
             drawingcanvas.on('gesturemove', this.edit_move, null, this);
@@ -3694,7 +3691,7 @@ EDITOR.prototype = {
      * @method link_handler
      */
     link_handler: function(e) {
-        var drawingcanvas, drawingregion;
+        var drawingcanvas;
         var resize = true;
         e.preventDefault();
 
@@ -3717,9 +3714,6 @@ EDITOR.prototype = {
             drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
             this.graphic = new Y.Graphic({render: drawingcanvas});
 
-            drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
-            drawingregion.on('scroll', this.move_canvas, this);
-
             if (!this.get('readonly')) {
                 drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
                 drawingcanvas.on('gesturemove', this.edit_move, null, this);
diff --git a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
index 7a85b4555f58d..6b855e852e357 100644
--- a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
+++ b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
@@ -1,10 +1,10 @@
-YUI.add("moodle-assignfeedback_editpdf-editor",function(e,t){var n=M.cfg.wwwroot+"/mod/assign/feedback/editpdf/ajax.php",r=M.cfg.wwwroot+"/mod/assign/feedback/editpdf/ajax_progress.php",i={DIALOGUE:"assignfeedback_editpdf_widget"},s={PREVIOUSBUTTON:".navigate-previous-button",NEXTBUTTON:" .navigate-next-button",SEARCHCOMMENTSBUTTON:".searchcommentsbutton",EXPCOLCOMMENTSBUTTON:".expcolcommentsbutton",SEARCHFILTER:".assignfeedback_editpdf_commentsearch input",SEARCHCOMMENTSLIST:".assignfeedback_editpdf_commentsearch ul",PAGESELECT:".navigate-page-select",LOADINGICON:".loading",PROGRESSBARCONTAINER:".progress-info.progress-striped",DRAWINGREGION:".drawingregion",DRAWINGCANVAS:".drawingcanvas",SAVE:".savebutton",COMMENTCOLOURBUTTON:".commentcolourbutton",COMMENTMENU:".commentdrawable a",ANNOTATIONCOLOURBUTTON:".annotationcolourbutton",DELETEANNOTATIONBUTTON:".deleteannotationbutton",WARNINGMESSAGECONTAINER:".warningmessages",ICONMESSAGECONTAINER:".infoicon",UNSAVEDCHANGESDIV:".assignfeedback_editpdf_warningmessages",UNSAVEDCHANGESINPUT:'input[name="assignfeedback_editpdf_haschanges"]',STAMPSBUTTON:".currentstampbutton",USERINFOREGION:'[data-region="user-info"]',ROTATELEFTBUTTON:".rotateleftbutton",ROTATERIGHTBUTTON:".rotaterightbutton",DIALOGUE:"."+i.DIALOGUE},o="rgba(200, 200, 255, 0.9)",u="rgba(200, 200, 255, 0.5)",a="rgb(51, 51, 51)",f={white:"rgb(255,255,255)",yellow:"rgb(255,236,174)",red:"rgb(249,181,179)",green:"rgb(214,234,178)",blue:"rgb(203,217,237)",clear:"rgba(255,255,255, 0)"},l={white:"rgb(255,255,255)",yellow:"rgb(255,207,53)",red:"rgb(239,69,64)",green:"rgb(152,202,62)",blue:"rgb(125,159,211)",black:"rgb(51,51,51)"},c=300,h={comment:".commentbutton",pen:".penbutton",line:".linebutton",rectangle:".rectanglebutton",oval:".ovalbutton",stamp:".stampbutton",select:".selectbutton",drag:".dragbutton",highlight:".highlightbutton"},p=4,d=function(e,t){this.x=parseInt(e,10),this.y=parseInt(t,10),this.clip=function(e){return this.x<e.x&&(this.x=e.x),this.x>e.x+e.width&&(this.x=e.x+e.width),this.y<e.y&&(this.y=e.y),this.y>e.y+e.height&&(this.y=e.y+e.height),this}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.point=d;var v=function(e,t,n,r){this.x=e,this.y=t,this.width=n,this.height=r,this.bound=function(e){var t=0,n=0,r=0,i=0,s=0,o;for(s=0;s<e.length;s++){o=e[s];if(o.x<t||s===0)t=o.x;if(o.x>n||s===0)n=o.x;if(o.y<r||s===0)r=o.y;if(o.y>i||s===0)i=o.y}return this.x=t,this.y=r,this.width=n-t,this.height=i-r,this},this.has_min_width=function(){return this.width>=5},this.has_min_height=function(){return this.height>=5},this.set_min_width=function(){this.width=5},this.set_min_height=function(){this.height=5}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.rect=v;var m=function(){this.start=!1,this.end=!1,this.starttime=0,this.annotationstart=!1,this.tool="drag",this.commentcolour="yellow",this.annotationcolour="red",this.stamp="",this.path=[]};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.edit=m;var g=function(e){this.editor=e,this.shapes=[],this.nodes=[],this.erase=function(){if(this.shapes)while(this.shapes.length>0)this.editor.graphic.removeShape(this.shapes.pop());if(this.nodes)while(this.nodes.length>0)this.nodes.pop().remove()},this.scroll_update=function(e,t){var n,r,i;for(n=0;n<this.nodes.length;n++)r=this.nodes[n].getData("x"),i=this.nodes[n].getData("y"),r!==undefined&&i!==undefined&&(this.nodes[n].setX(parseInt(r,10)-e),this.nodes[n].setY(parseInt(i,10)-t))},this.store_position=function(e,t,n){var r,i,o;r=this.editor.get_dialogue_element(s.DRAWINGREGION),i=parseInt(r.get("scrollLeft"),10),o=parseInt(r.get("scrollTop"),10),e.setData("x",t+i),e.setData("y",n+o)}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.drawable=g;var y=function(e){y.superclass.constructor.apply(this,[e])};y.NAME="annotation",y.ATTRS={},e.extend(y,e.Base,{editor:null,gradeid:0,pageno:0,x:0,y:0,endx:0,endy:0,path:"",type:"rect",colour:"red",drawable:!1,initializer:function(e){this.editor=e.editor||null,this.gradeid=parseInt(e.gradeid,10)||0,this.pageno=parseInt(e.pageno,10)||0,this.x=parseInt(e.x,10)||0,this.y=parseInt(e.y,10)||0,this.endx=parseInt(e.endx,10)||0,this.endy=parseInt(e.endy,10)||0,this.path=e.path||"",this.type=e.type||"rect",this.colour=e.colour||"red",this.drawable=!1},clean:function(){return{gradeid:this.gradeid,x:parseInt(this.x,10),y:parseInt(this.y,10),endx:parseInt(this.endx,10),endy:parseInt(this.endy,10),type:this.type,path:this.path,pageno:this.pageno,colour:this.colour}},draw_highlight:function(){var t,n=this.editor.get_dialogue_element(s.DRAWINGREGION),r=this.editor.get_dialogue_element(s.DRAWINGCANVAS).getXY(),i;if(this.editor.currentannotation===this){t=new M.assignfeedback_editpdf.rect,t.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),i=this.editor.graphic.addShape({type:e.Rect,width:t.width,height:t.height,stroke:{weight:p,color:o},fill:{color:u},x:t.x,y:t.y}),this.drawable.shapes.push(i);var a=e.Node.create('<img src="'+M.util.image_url("trash","assignfeedback_editpdf")+'"/>'),f=e.Node.create('<a href="#" role="button"></a>');a.setAttrs({alt:M.util.get_string("deleteannotation","assignfeedback_editpdf")}),a.setStyles({backgroundColor:"white"}),f.addClass("deleteannotationbutton"),f.append(a),n.append(f),f.setData("annotation",this),f.setStyle("zIndex","200"),f.on("click",this.remove,this),f.on("key",this.remove,"space,enter",this),f.setX(r[0]+t.x+t.width-18),f.setY(r[1]+t.y+6),this.drawable.nodes.push(f)}return this.drawable},draw:function(){return this.draw_highlight(),this.drawable},remove:function(e){var t,n;e.preventDefault(),t=this.editor.pages[this.editor.currentpage].annotations;for(n=0;n<t.length;n++)if(t[n]===this){t.splice(n,1),this.drawable&&this.drawable.erase(),this.editor.currentannotation=!1,this.editor.save_current_page();return}},move:function(t,n){var r=t-this.x,i=n-this.y
-,s,o,u,a,f;this.x+=r,this.y+=i,this.endx+=r,this.endy+=i,this.path&&(s=[],o=this.path.split(":"),e.each(o,function(e){u=e.split(","),a=parseInt(u[0],10),f=parseInt(u[1],10),s.push(a+r+","+(f+i))}),this.path=s.join(":")),this.drawable&&this.drawable.erase(),this.editor.drawables.push(this.draw())},draw_current_edit:function(e){var t=e&&!1;return t},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.endx=t.x+t.width,this.endy=t.y+t.height,this.colour=e.annotationcolour,this.path="",t.has_min_width()&&t.has_min_height()}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotation=y;var b=function(e){b.superclass.constructor.apply(this,[e])};b.NAME="annotationline",b.ATTRS={},e.extend(b,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[this.colour]}}),n.moveTo(this.x,this.y),n.lineTo(this.endx,this.endy),n.end(),t.shapes.push(n),this.drawable=t,b.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r;return r=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[t.annotationcolour]}}),r.moveTo(t.start.x,t.start.y),r.lineTo(t.end.x,t.end.y),r.end(),n.shapes.push(r),n},init_from_edit:function(e){return this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=e.start.x,this.y=e.start.y,this.endx=e.end.x,this.endy=e.end.y,this.colour=e.annotationcolour,this.path="",this.endx-this.x!==0||this.endy-this.y!==0}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationline=b;var w=function(e){w.superclass.constructor.apply(this,[e])};w.NAME="annotationrectangle",w.ATTRS={},e.extend(w,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=new M.assignfeedback_editpdf.rect,n.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),r=this.editor.graphic.addShape({type:e.Rect,width:n.width,height:n.height,stroke:{weight:p,color:l[this.colour]},x:n.x,y:n.y}),t.shapes.push(r),this.drawable=t,w.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return i=new M.assignfeedback_editpdf.rect,i.bound([new M.assignfeedback_editpdf.point(t.start.x,t.start.y),new M.assignfeedback_editpdf.point(t.end.x,t.end.y)]),i.has_min_width()||i.set_min_width(),i.has_min_height()||i.set_min_height(),r=this.editor.graphic.addShape({type:e.Rect,width:i.width,height:i.height,stroke:{weight:p,color:l[t.annotationcolour]},x:i.x,y:i.y}),n.shapes.push(r),n}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationrectangle=w;var E=function(e){E.superclass.constructor.apply(this,[e])};E.NAME="annotationoval",E.ATTRS={},e.extend(E,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=new M.assignfeedback_editpdf.rect,n.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),r=this.editor.graphic.addShape({type:e.Ellipse,width:n.width,height:n.height,stroke:{weight:p,color:l[this.colour]},x:n.x,y:n.y}),t.shapes.push(r),this.drawable=t,E.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return i=new M.assignfeedback_editpdf.rect,i.bound([new M.assignfeedback_editpdf.point(t.start.x,t.start.y),new M.assignfeedback_editpdf.point(t.end.x,t.end.y)]),i.has_min_width()||i.set_min_width(),i.has_min_height()||i.set_min_height(),r=this.editor.graphic.addShape({type:e.Ellipse,width:i.width,height:i.height,stroke:{weight:p,color:l[t.annotationcolour]},x:i.x,y:i.y}),n.shapes.push(r),n}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationoval=E;var S=function(e){S.superclass.constructor.apply(this,[e])};S.NAME="annotationpen",S.ATTRS={},e.extend(S,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r,i,s;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[this.colour]}}),r=!0,i=this.path.split(":"),e.each(i,function(e){s=e.split(","),r?(n.moveTo(s[0],s[1]),r=!1):n.lineTo(s[0],s[1])},this),n.end(),t.shapes.push(n),this.drawable=t,S.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return r=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[t.annotationcolour]}}),i=!0,e.each(t.path,function(e){i?(r.moveTo(e.x,e.y),i=!1):r.lineTo(e.x,e.y)},this),r.end(),n.shapes.push(r),n},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect,n=[],r=0;t.bound(e.path);for(r=0;r<e.path.length;r++)n.push(parseInt(e.path[r].x,10)+","+parseInt(e.path[r].y,10));return this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.endx=t.x+t.width,this.endy=t.y+t.height,this.colour=e.annotationcolour,this.path=n.join(":"),t.has_min_width()||t.has_min_height()}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationpen=S;var x=function(e){x.superclass.constructor.apply(this,[e])};x.NAME="annotationhighlight",x.ATTRS={},e.extend(x,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r,i;return t=new M.assignfeedback_editpdf.drawable(this.editor),r=new M.assignfeedback_editpdf.rect,r.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),i=l[this.colour],i=i.replace("rgb","rgba"),i=i.replace(")",",0.5)"),n=this.editor
-.graphic.addShape({type:e.Rect,width:r.width,height:r.height,stroke:!1,fill:{color:i},x:r.x,y:r.y}),t.shapes.push(n),this.drawable=t,x.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i,s;return i=new M.assignfeedback_editpdf.rect,i.bound([new M.assignfeedback_editpdf.point(t.start.x,t.start.y),new M.assignfeedback_editpdf.point(t.end.x,t.end.y)]),i.has_min_width()||i.set_min_width(),s=l[t.annotationcolour],s=s.replace("rgb","rgba"),s=s.replace(")",",0.5)"),r=this.editor.graphic.addShape({type:e.Rect,width:i.width,height:20,stroke:!1,fill:{color:s},x:i.x,y:t.start.y-10}),n.shapes.push(r),n},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=e.start.y-10,this.endx=t.x+t.width,this.endy=e.start.y+10,this.colour=e.annotationcolour,this.page="",t.has_min_width()}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationhighlight=x;var T=function(e){T.superclass.constructor.apply(this,[e])};T.NAME="annotationstamp",T.ATTRS={},e.extend(T,M.assignfeedback_editpdf.annotation,{draw:function(){var t=new M.assignfeedback_editpdf.drawable(this.editor),n=this.editor.get_dialogue_element(s.DRAWINGREGION),r,i;return i=this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x,this.y)),r=e.Node.create("<div/>"),r.setStyles({position:"relative",display:"inline-block",backgroundImage:"url("+this.editor.get_stamp_image_url(this.path)+")",width:this.endx-this.x,height:this.endy-this.y,backgroundSize:"100% 100%",zIndex:50}),n.append(r),r.setX(i.x),r.setY(i.y),t.store_position(r,i.x,i.y),this.editor.get("readonly")||(r.on("gesturemovestart",this.editor.edit_start,null,this.editor),r.on("gesturemove",this.editor.edit_move,null,this.editor),r.on("gesturemoveend",this.editor.edit_end,null,this.editor)),t.nodes.push(r),this.drawable=t,T.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.rect,r=new M.assignfeedback_editpdf.drawable(this.editor),i=this.editor.get_dialogue_element(s.DRAWINGREGION),o,u;return n.bound([t.start,t.end]),u=this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(n.x,n.y)),o=e.Node.create("<div/>"),o.setStyles({position:"absolute",display:"inline-block",backgroundImage:"url("+this.editor.get_stamp_image_url(t.stamp)+")",width:n.width,height:n.height,backgroundSize:"100% 100%",zIndex:50}),i.append(o),o.setX(u.x),o.setY(u.y),r.store_position(o,u.x,u.y),r.nodes.push(o),r},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),t.width<40&&(t.width=40),t.height<40&&(t.height=40),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.endx=t.x+t.width,this.endy=t.y+t.height,this.colour=e.annotationcolour,this.path=e.stamp,!0},move:function(e,t){var n=e-this.x,r=t-this.y;this.x+=n,this.y+=r,this.endx+=n,this.endy+=r,this.drawable&&this.drawable.erase(),this.editor.drawables.push(this.draw())}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationstamp=T;var N="Dropdown menu",C;C=function(e){e.draggable=!1,e.centered=!1,e.width="auto",e.visible=!1,e.footerContent="",C.superclass.constructor.apply(this,[e])},e.extend(C,M.core.dialogue,{initializer:function(t){var n,r,i,s;C.superclass.initializer.call(this,t),s=this.get("boundingBox"),s.addClass("assignfeedback_editpdf_dropdown"),n=this.get("buttonNode"),r=this.bodyNode,i=e.Node.create("<h3/>"),i.addClass("accesshide"),i.setHTML(this.get("headerText")),r.prepend(i),r.on("clickoutside",function(e){this.get("visible")&&e.target.get("id")!==n.get("id")&&e.target.ancestor().get("id")!==n.get("id")&&(e.preventDefault(),this.hide())},this),n.on("click",function(e){e.preventDefault(),this.show()},this),n.on("key",this.show,"enter,space",this)},show:function(){var t=this.get("buttonNode"),n=C.superclass.show.call(this);return this.align(t,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),n}},{NAME:N,ATTRS:{headerText:{value:""},buttonNode:{value:null}}}),e.Base.modifyAttrs(C,{modal:{getter:function(){return!1}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.dropdown=C;var k="Colourpicker",L;L=function(e){L.superclass.constructor.apply(this,[e])},e.extend(L,M.assignfeedback_editpdf.dropdown,{initializer:function(t){var n=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>'),r;e.each(this.get("colours"),function(t,r){var i,s,o,u,a;o=M.util.get_string(r,"assignfeedback_editpdf"),a=this.get("iconprefix")+r,u=M.util.image_url(a,"assignfeedback_editpdf"),i=e.Node.create('<button><img alt="'+o+'" src="'+u+'"/></button>'),i.setAttribute("data-colour",r),i.setAttribute("data-rgb",t),i.setStyle("backgroundImage","none"),s=e.Node.create("<li/>"),s.append(i),n.append(s)},this),r=e.Node.create("<div/>"),n.delegate("click",this.callback_handler,"button",this),n.delegate("key",this.callback_handler,"down:13","button",this),this.set("headerText",M.util.get_string("colourpicker","assignfeedback_editpdf")),r.append(n),this.set("bodyContent",r),L.superclass.initializer.call(this,t)},callback_handler:function(t){t.preventDefault();var n=this.get("callback"),r=this.get("context"),i;this.hide(),i=e.bind(n,r,t),i()}},{NAME:k,ATTRS:{colours:{value:{}},callback:{value:null},context:{value:null},iconprefix:{value:"colour_"}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.colourpicker=L;var A="Colourpicker",O;O=function(e){O.superclass.constructor.apply(this,[e])},e.extend(O,M.assignfeedback_editpdf.dropdown,{initializer:function(t){var n=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>');e.each(this.get("stamps"),function(t){var r,i,s;s=M.util.get_string("stamp","assignfeedback_editpdf"),r=e.Node.create('<button><img height="16" width="16" alt="'+
-s+'" src="'+t+'"/></button>'),r.setAttribute("data-stamp",t),r.setStyle("backgroundImage","none"),i=e.Node.create("<li/>"),i.append(r),n.append(i)},this),n.delegate("click",this.callback_handler,"button",this),n.delegate("key",this.callback_handler,"down:13","button",this),this.set("headerText",M.util.get_string("stamppicker","assignfeedback_editpdf")),this.set("bodyContent",n),O.superclass.initializer.call(this,t)},callback_handler:function(t){t.preventDefault();var n=this.get("callback"),r=this.get("context"),i;this.hide(),i=e.bind(n,r,t),i()}},{NAME:A,ATTRS:{stamps:{value:[]},callback:{value:null},context:{value:null}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.stamppicker=O;var _="Commentmenu",D;D=function(e){D.superclass.constructor.apply(this,[e])},e.extend(D,M.assignfeedback_editpdf.dropdown,{initializer:function(t){var n,r,i,s;s=this.get("comment"),n=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>'),r=e.Node.create('<li><a tabindex="-1" href="#">'+M.util.get_string("addtoquicklist","assignfeedback_editpdf")+"</a></li>"),r.on("click",s.add_to_quicklist,s),r.on("key",s.add_to_quicklist,"enter,space",s),n.append(r),r=e.Node.create('<li><a tabindex="-1" href="#">'+M.util.get_string("deletecomment","assignfeedback_editpdf")+"</a></li>"),r.on("click",function(e){e.preventDefault(),this.menu.hide(),this.remove()},s),r.on("key",function(){s.menu.hide(),s.remove()},"enter,space",s),n.append(r),r=e.Node.create("<li><hr/></li>"),n.append(r),this.set("headerText",M.util.get_string("commentcontextmenu","assignfeedback_editpdf")),i=e.Node.create("<div/>"),i.append(n),this.set("bodyContent",i),D.superclass.initializer.call(this,t)},show:function(){var t=this.get("boundingBox").one("ul");t.all(".quicklist_comment").remove(!0);var n=this.get("comment");n.deleteme=!1,e.each(n.editor.quicklist.comments,function(r){var i=e.Node.create('<li class="quicklist_comment"></li>'),s=e.Node.create('<a href="#" tabindex="-1">'+r.rawtext+"</a>"),o=e.Node.create('<a href="#" tabindex="-1" class="delete_quicklist_comment"><img src="'+M.util.image_url("t/delete","core")+'" '+'alt="'+M.util.get_string("deletecomment","assignfeedback_editpdf")+'"/>'+"</a>");s.setAttribute("title",r.rawtext),i.append(s),i.append(o),t.append(i),i.on("click",n.set_from_quick_comment,n,r),i.on("key",n.set_from_quick_comment,"space,enter",n,r),o.on("click",n.remove_from_quicklist,n,r),o.on("key",n.remove_from_quicklist,"space,enter",n,r)},this),D.superclass.show.call(this)}},{NAME:_,ATTRS:{comment:{value:null}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.commentmenu=D;var P="commentsearch",H;H=function(e){e.draggable=!1,e.centered=!0,e.width="400px",e.visible=!1,e.headerContent=M.util.get_string("searchcomments","assignfeedback_editpdf"),e.footerContent="",H.superclass.constructor.apply(this,[e])},e.extend(H,M.core.dialogue,{initializer:function(t){var n,r,i,s,o,u;u=this.get("boundingBox"),u.addClass("assignfeedback_editpdf_commentsearch"),n=this.get("editor"),r=e.Node.create("<div/>"),i=M.util.get_string("filter","assignfeedback_editpdf"),s=e.Node.create('<input type="text" size="20" placeholder="'+i+'"/>'),r.append(s),o=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_search"/>'),r.append(o),s.on("keyup",this.filter_search_comments,this),o.delegate("click",this.focus_on_comment,"a",this),o.delegate("key",this.focus_on_comment,"enter,space","a",this),this.set("bodyContent",r),H.superclass.initializer.call(this,t)},filter_search_comments:function(){var t,n,r,i;i=this.get("id"),t=e.one("#"+i+s.SEARCHFILTER),n=e.one("#"+i+s.SEARCHCOMMENTSLIST),r=t.get("value"),n.all("li").each(function(e){e.get("text").indexOf(r)!==-1?e.show():e.hide()})},focus_on_comment:function(e){e.preventDefault();var t=e.target.ancestor("li"),n=t.getData("comment"),r=this.get("editor");this.hide(),n.pageno=n.clean().pageno,n.pageno!==r.currentpage&&(r.currentpage=n.pageno,r.change_page()),n.node=n.drawable.nodes[0].one("textarea"),n.node.ancestor("div").removeClass("commentcollapsed"),n.node.focus()},show:function(){var t=this.get("boundingBox").one("ul"),n=this.get("editor");t.all("li").remove(!0),e.each(n.pages,function(n){e.each(n.comments,function(n){var r=e.Node.create('<li><a href="#" tabindex="-1"><pre>'+n.rawtext+"</pre></a></li>");t.append(r),r.setData("comment",n)},this)},this),this.centerDialogue(),H.superclass.show.call(this)}},{NAME:P,ATTRS:{editor:{value:null}}}),e.Base.modifyAttrs(H,{modal:{getter:function(){return!0}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.commentsearch=H;var B=function(t,n,r,i,o,u,l,c){this.editor=t,this.gradeid=n||0,this.x=parseInt(i,10)||0,this.y=parseInt(o,10)||0,this.width=parseInt(u,10)||0,this.rawtext=c||"",this.pageno=r||0,this.colour=l||"yellow",this.drawable=!1,this.deleteme=!1,this.menulink=null,this.menu=null,this.clean=function(){return{gradeid:this.gradeid,x:parseInt(this.x,10),y:parseInt(this.y,10),width:parseInt(this.width,10),rawtext:this.rawtext,pageno:parseInt(this.pageno,10),colour:this.colour}},this.draw=function(n){var r=new M.assignfeedback_editpdf.drawable(this.editor),i,o=this.editor.get_dialogue_element(s.DRAWINGREGION),u,l,c,h,p,d;return i=e.Node.create("<textarea/>"),u=e.Node.create('<div class="commentdrawable"/>'),l=e.Node.create("<label/>"),c=e.Node.create('<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.5 -0.5 13 13" preserveAspectRatio="xMinYMin meet"><path d="M11 0H1C.4 0 0 .4 0 1v6c0 .6.4 1 1 1h1v4l4-4h5c.6 0 1-.4 1-1V1c0-.6-.4-1-1-1z" fill="currentColor" opacity="0.9" stroke="rgb(153, 153, 153)" stroke-width="0.5"/></svg>'),h=e.Node.create('<a href="#"><img src="'+M.util.image_url("t/contextmenu","core")+'"/></a>'),this.menulink=h,u.append(l),l.append(i),u.append(c),u.setAttribute("tabindex","-1"),l.setAttribute("tabindex","0"),i.setAttribute("tabindex","-1"),h.setAttribute("tabindex","0"),this.editor.get("readonly")?i.setAttribute("readonly","readonly"
-):u.append(h),this.width<100&&(this.width=100),p=this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x,this.y)),i.setStyles({width:this.width+"px",backgroundColor:f[this.colour],color:a}),o.append(u),u.setStyle("position","relative"),u.setX(p.x),u.setY(p.y),r.store_position(u,p.x,p.y),r.nodes.push(u),i.set("value",this.rawtext),d=i.get("scrollHeight"),i.setStyles({height:d+"px",overflow:"hidden"}),c.setStyle("color",f[this.colour]),this.attach_events(i,h),n?i.focus():t.collapsecomments&&u.addClass("commentcollapsed"),this.drawable=r,r},this.delete_comment_later=function(){this.deleteme&&this.remove()},this.attach_events=function(n,r){var i=n.ancestor("div"),s=n.ancestor("label"),o=s.next("svg");n.collapse=function(r){n.collapse.delay=e.later(r,n,function(){t.collapsecomments&&i.addClass("commentcollapsed")})},n.expand=function(){n.getData("dragging")!==!0&&(n.collapse.delay&&n.collapse.delay.cancel(),i.removeClass("commentcollapsed"))},i.on("mouseenter",function(){(t.currentedit.tool==="comment"||t.currentedit.tool==="select"||this.editor.get("readonly"))&&n.expand()},this),i.on("click|tap",function(){n.expand(),n.focus()},this),n.on("keyup",function(e){e.keyCode===9&&e.shiftKey&&r.getAttribute("tabindex")==="0"&&r.focus(),r.setAttribute("tabindex","0")},this),r.on("keydown",function(e){e.keyCode===9&&e.shiftKey&&r.setAttribute("tabindex","-1")},this),s.on("focus",function(){n.active=!0,n.collapse.delay&&n.collapse.delay.cancel(),n.setAttribute("tabindex","0"),n.expand(),n.focus(),s.setAttribute("tabindex","-1")},this),r.on("focus",function(){n.active=!0,n.collapse.delay&&n.collapse.delay.cancel(),this.deleteme=!1,s.setAttribute("tabindex","0")},this),n.on("blur",function(){n.setAttribute("tabindex","-1")},this),s.on("blur",function(){s.setAttribute("tabindex","0")},this),i.on("mouseleave",function(){t.collapsecomments&&n.active!==!0&&n.collapse(400)},this),i.on("blur",function(){n.active=!1,n.collapse(800)},this),this.editor.get("readonly")||(n.on("blur",function(){this.rawtext=n.get("value"),this.width=parseInt(n.getStyle("width"),10),this.rawtext.replace(/^\s+|\s+$/g,"")===""&&(this.deleteme=!0,e.later(400,this,this.delete_comment_later)),this.editor.save_current_page(),this.editor.editingcomment=!1},this),r.setData("comment",this),n.on("keyup",function(){n.setStyle("height","auto");var e=n.get("scrollHeight"),t=parseInt(n.getStyle("height"),10);e===t+8&&(e-=8),n.setStyle("height",e+"px")}),n.on("gesturemovestart",function(e){t.currentedit.tool==="select"&&(e.preventDefault(),t.collapsecomments?(n.setData("offsetx",8),n.setData("offsety",8)):(n.setData("offsetx",e.clientX-i.getX()),n.setData("offsety",e.clientY-i.getY())))}),n.on("gesturemove",function(e){if(t.currentedit.tool==="select"){var r=e.clientX-n.getData("offsetx"),s=e.clientY-n.getData("offsety"),o,u,a;n.getData("dragging")!==!0&&(n.collapse(0),n.setData("dragging",!0)),o=this.editor.get_canvas_coordinates(new M.assignfeedback_editpdf.point(r,s)),a=this.editor.get_canvas_bounds(!0),a.x=0,a.y=0,a.width-=24,a.height-=24,o.clip(a),this.x=o.x,this.y=o.y,u=this.editor.get_window_coordinates(o),i.setX(u.x),i.setY(u.y),this.drawable.store_position(i,u.x,u.y)}},null,this),n.on("gesturemoveend",function(){t.currentedit.tool==="select"&&(n.getData("dragging")===!0&&n.setData("dragging",!1),this.editor.save_current_page())},null,this),o.on("gesturemovestart",function(e){t.currentedit.tool==="select"&&(e.preventDefault(),n.setData("offsetx",e.clientX-i.getX()),n.setData("offsety",e.clientY-i.getY()),n.expand())}),o.on("gesturemove",function(e){if(t.currentedit.tool==="select"){var r=e.clientX-n.getData("offsetx"),s=e.clientY-n.getData("offsety"),o,u,a;n.getData("dragging")!==!0&&(n.collapse(100),n.setData("dragging",!0)),o=this.editor.get_canvas_coordinates(new M.assignfeedback_editpdf.point(r,s)),a=this.editor.get_canvas_bounds(!0),a.x=0,a.y=0,a.width-=24,a.height-=24,o.clip(a),this.x=o.x,this.y=o.y,u=this.editor.get_window_coordinates(o),i.setX(u.x),i.setY(u.y),this.drawable.store_position(i,u.x,u.y)}},null,this),o.on("gesturemoveend",function(){t.currentedit.tool==="select"&&(n.getData("dragging")===!0&&n.setData("dragging",!1),this.editor.save_current_page())},null,this),this.menu=new M.assignfeedback_editpdf.commentmenu({buttonNode:this.menulink,comment:this}))},this.remove=function(){var e=0,t;t=this.editor.pages[this.editor.currentpage].comments;for(e=0;e<t.length;e++)if(t[e]===this){t.splice(e,1),this.drawable.erase(),this.editor.save_current_page();return}},this.remove_from_quicklist=function(e,t){e.preventDefault(),e.stopPropagation(),this.menu.hide(),this.editor.quicklist.remove(t)},this.set_from_quick_comment=function(e,t){e.preventDefault(),this.menu.hide(),this.deleteme=!1,this.rawtext=t.rawtext,this.width=t.width,this.colour=t.colour,this.editor.save_current_page(),this.editor.redraw(),this.node=this.drawable.nodes[0].one("textarea"),this.node.ancestor("div").removeClass("commentcollapsed"),this.node.focus()},this.add_to_quicklist=function(e){e.preventDefault(),this.menu.hide(),this.editor.quicklist.add(this)},this.draw_current_edit=function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return i=new M.assignfeedback_editpdf.rect,i.bound([t.start,t.end]),r=this.editor.graphic.addShape({type:e.Rect,width:i.width,height:i.height,fill:{color:f[t.commentcolour]},x:i.x,y:i.y}),n.shapes.push(r),n},this.init_from_edit=function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),t.width<100&&(t.width=100),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.width=t.width,this.colour=e.commentcolour,this.rawtext="",t.has_min_width()&&t.has_min_height()},this.updatePosition=function(){var e=this.drawable.nodes[0].one("textarea"),t=e.ancestor("div"),n=new M.assignfeedback_editpdf.point(this.x,this.y),r=this.editor.get_window_coordinates(n);t.setX(r.x),t.setY(r.y),this.drawable.store_position(t,r.x,r.y)}};M.assignfeedback_editpdf=
-M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.comment=B;var j=function(e,t,n,r){this.rawtext=t||"",this.id=e||0,this.width=n||100,this.colour=r||"yellow"};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.quickcomment=j;var F=function(t){this.editor=t,this.comments=[],this.add=function(t){var r=n,i;if(t.rawtext==="")return;i={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"addtoquicklist",userid:this.editor.get("userid"),commenttext:t.rawtext,width:t.width,colour:t.colour,attemptnumber:this.editor.get("attemptnumber"),assignmentid:this.editor.get("assignmentid")},on:{success:function(t,n){var r,i;try{r=e.JSON.parse(n.responseText);if(r.error)return new M.core.ajaxException(r);i=new M.assignfeedback_editpdf.quickcomment(r.id,r.rawtext,r.width,r.colour),this.comments.push(i),this.comments.sort(function(e,t){return e.rawtext.localeCompare(t.rawtext)})}catch(s){return new M.core.exception(s)}},failure:function(e,t){return M.core.exception(t.responseText)}}},e.io(r,i)},this.remove=function(t){var r=n,i;if(!t)return;i={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"removefromquicklist",userid:this.editor.get("userid"),commentid:t.id,attemptnumber:this.editor.get("attemptnumber"),assignmentid:this.editor.get("assignmentid")},on:{success:function(){var e;e=this.comments.indexOf(t),e>=0&&this.comments.splice(e,1)},failure:function(e,t){return M.core.exception(t.responseText)}}},e.io(r,i)},this.load=function(){var t=n,r;r={method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"loadquicklist",userid:this.editor.get("userid"),attemptnumber:this.editor.get("attemptnumber"),assignmentid:this.editor.get("assignmentid")},on:{success:function(t,n){var r;try{r=e.JSON.parse(n.responseText);if(r.error)return new M.core.ajaxException(r);e.each(r,function(e){var t=new M.assignfeedback_editpdf.quickcomment(e.id,e.rawtext,e.width,e.colour);this.comments.push(t)},this),this.comments.sort(function(e,t){return e.rawtext.localeCompare(t.rawtext)})}catch(i){return new M.core.exception(i)}},failure:function(e,t){return M.core.exception(t.responseText)}}},e.io(t,r)}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.quickcommentlist=F;var I=function(){I.superclass.constructor.apply(this,arguments)};I.prototype={oldannotationcoordinates:null,dialogue:null,panel:null,pagecount:0,currentpage:0,pages:[],documentstatus:0,loadingicon:null,pageimage:null,graphic:null,currentedit:new M.assignfeedback_editpdf.edit,currentdrawable:!1,drawables:[],currentcomment:null,currentannotation:null,lastannotation:null,lastannotationtool:"pen",quicklist:null,searchcommentswindow:null,currentstamp:null,stamps:[],editingcomment:!1,collapsecomments:!0,initializer:function(){var t;t=e.one("#"+this.get("linkid")),t&&(t.on("click",this.link_handler,this),t.on("key",this.link_handler,"down:13",this),require(["mod_assign/grading_review_panel"],function(n){var r=new n,i=r.getReviewPanel("assignfeedback_editpdf");i&&(i=e.one(i),i.empty(),t.ancestor(".fitem").hide(),this.open_in_panel(i)),this.currentedit.start=!1,this.currentedit.end=!1,this.get("readonly")||(this.quicklist=new M.assignfeedback_editpdf.quickcommentlist(this))}.bind(this)))},refresh_button_state:function(){var e,t,n,r,i,o;e=this.get_dialogue_element(s.COMMENTCOLOURBUTTON),n=M.util.image_url("background_colour_"+this.currentedit.commentcolour,"assignfeedback_editpdf"),e.one("img").setAttribute("src",n),this.currentedit.commentcolour==="clear"?e.one("img").setStyle("borderStyle","dashed"):e.one("img").setStyle("borderStyle","solid"),e=this.get_dialogue_element(s.ANNOTATIONCOLOURBUTTON),n=M.util.image_url("colour_"+this.currentedit.annotationcolour,"assignfeedback_editpdf"),e.one("img").setAttribute("src",n),t=this.get_dialogue_element(h[this.currentedit.tool]),t.addClass("assignfeedback_editpdf_selectedbutton"),t.setAttribute("aria-pressed","true"),r=this.get_dialogue_element(s.DRAWINGREGION),r.setAttribute("data-currenttool",this.currentedit.tool),e=this.get_dialogue_element(s.STAMPSBUTTON),i=this.get_stamp_image_url(this.currentedit.stamp),e.one("img").setAttrs({src:i,height:"16",width:"16"}),o=this.get_dialogue_element(s.DRAWINGCANVAS);switch(this.currentedit.tool){case"drag":o.setStyle("cursor","move");break;case"highlight":o.setStyle("cursor","text");break;case"select":o.setStyle("cursor","default");break;case"stamp":o.setStyle("cursor","url("+i+"), crosshair");break;default:o.setStyle("cursor","crosshair")}},get_canvas_bounds:function(){var e=this.get_dialogue_element(s.DRAWINGCANVAS),t=e.getXY(),n=t[0],r=t[1],i=parseInt(e.getStyle("width"),10),o=parseInt(e.getStyle("height"),10);return new M.assignfeedback_editpdf.rect(n,r,i,o)},get_canvas_coordinates:function(e){var t=this.get_canvas_bounds(),n=new M.assignfeedback_editpdf.point(e.x-t.x,e.y-t.y);return t.x=t.y=0,n.clip(t),n},get_window_coordinates:function(e){var t=this.get_canvas_bounds(),n=new M.assignfeedback_editpdf.point(e.x+t.x,e.y+t.y);return n},open_in_panel:function(t){var n,r;this.panel=t,t.append(this.get("body")),t.addClass(i.DIALOGUE),this.loadingicon=this.get_dialogue_element(s.LOADINGICON),n=this.get_dialogue_element(s.DRAWINGCANVAS),this.graphic=new e.Graphic({render:n}),r=this.get_dialogue_element(s.DRAWINGREGION),r.on("scroll",this.move_canvas,this),this.get("readonly")||(n.on("gesturemovestart",this.edit_start,null,this),n.on("gesturemove",this.edit_move,null,this),n.on("gesturemoveend",this.edit_end,null,this),this.refresh_button_state()),this.start_generation()},link_handler:function(t){var n,r,o=!0;t.preventDefault(),this.dialogue||(this.dialogue=new M.core.dialogue({headerContent:this.get("header"),bodyContent:this.get("body"),footerContent:this.get("footer"),modal:!0,width:"840px",visible:!1,draggable:!0}),this.dialogue.get("boundingBox").addClass(i.DIALOGUE),this.loadingicon=this.get_dialogue_element(s.LOADINGICON),n=this.get_dialogue_element(s.DRAWINGCANVAS),this.graphic=new e
-.Graphic({render:n}),r=this.get_dialogue_element(s.DRAWINGREGION),r.on("scroll",this.move_canvas,this),this.get("readonly")||(n.on("gesturemovestart",this.edit_start,null,this),n.on("gesturemove",this.edit_move,null,this),n.on("gesturemoveend",this.edit_end,null,this),this.refresh_button_state()),this.start_generation(),n.on("windowresize",this.resize,this),o=!1),this.dialogue.centerDialogue(),this.dialogue.show(),this.dialogue.dd.on("drag:end",this.redraw,this),o&&this.resize()},start_generation:function(){this.poll_document_conversion_status()},poll_document_conversion_status:function(){var t=this.get("userid");e.io(n,{method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"pollconversions",userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),readonly:this.get("readonly")?1:0},on:{success:function(n,r){var i=e.one(s.USERINFOREGION);if(i){var o=i.getAttribute("data-userid");if(o&&o!=t)return}var u=this.handle_response_data(r),a=!1;if(u){this.documentstatus=u.status;if(u.status===0)a=!0;else if(u.status===1||u.status===3)a=!0;else if(u.status===2||u.status===-1)this.pagecount=u.pagecount,u.pageready==u.pagecount?this.prepare_pages_for_display(u):(this.update_page_load_progress(),this.start_document_to_image_conversion());a&&e.later(1e3,this,this.poll_document_conversion_status)}},failure:function(e,t){return new M.core.exception(t.responseText)}}})},start_document_to_image_conversion:function(){e.io(n,{method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"pollconversions",userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),readonly:this.get("readonly")?1:0},on:{success:function(e,t){var n=this.handle_response_data(t);n&&(this.documentstatus=n.status,n.status===2&&this.prepare_pages_for_display(n))},failure:function(e,t){return new M.core.exception(t.responseText)}}})},warning:function(t,n){var r=this.get_dialogue_element(s.ICONMESSAGECONTAINER),i=this.get_dialogue_element(s.WARNINGMESSAGECONTAINER),o=15,u=1,a="assignfeedback_editpdf_warningmessages alert alert-warning";n&&(o=4,a="assignfeedback_editpdf_warningmessages alert alert-info");var f=e.Node.create('<div class="'+a+'" role="alert"></div>');f.append(r.one("*").cloneNode()),f.append(t),i.prepend(f),f.transition({duration:u,delay:o,opacity:0},function(){f.remove()})},prepare_pages_for_display:function(e){var t,n,r,i,s,o;if(!e.pagecount){this.dialogue&&this.dialogue.hide(),i=new M.core.alert({message:M.util.get_string("cannotopenpdf","assignfeedback_editpdf")}),i.show();return}this.pages=e.pages;for(t=0;t<this.pages.length;t++){for(n=0;n<this.pages[t].comments.length;n++)r=this.pages[t].comments[n],this.pages[t].comments[n]=new M.assignfeedback_editpdf.comment(this,r.gradeid,r.pageno,r.x,r.y,r.width,r.colour,r.rawtext);for(n=0;n<this.pages[t].annotations.length;n++)s=this.pages[t].annotations[n],this.pages[t].annotations[n]=this.create_annotation(s.type,s)}o=this.get("readonly"),!o&&e.partial&&this.warning(M.util.get_string("partialwarning","assignfeedback_editpdf"),!1),this.quicklist&&this.quicklist.load(),this.setup_navigation(),this.setup_toolbar(),this.change_page()},update_page_load_progress:function(){var t,n=0,i=this.get_dialogue_element(s.PROGRESSBARCONTAINER+" .bar");if(!i)return;t={method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"conversionstatus",userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid")},on:{success:function(i,o){n=0;var u=0,a=this.get_dialogue_element(s.PROGRESSBARCONTAINER+" .bar");a&&(u=o.response/this.pagecount*100,a.setStyle("width",u+"%"),a.ancestor(s.PROGRESSBARCONTAINER).setAttribute("aria-valuenow",u),u<100&&(M.util.js_pending("checkconversionstatus"),e.later(1e3,this,function(){M.util.js_complete("checkconversionstatus"),e.io(r,t)})))},failure:function(i,s){return n+=1,this.pagecount===0&&n<5&&(M.util.js_pending("checkconversionstatus"),e.later(1e3,this,function(){M.util.js_complete("checkconversionstatus"),e.io(r,t)})),new M.core.exception(s.responseText)}}},M.util.js_pending("checkconversionstatus"),e.later(1e3,this,function(){n=0,M.util.js_complete("checkconversionstatus"),e.io(r,t)})},handle_response_data:function(t){var n;try{n=e.JSON.parse(t.responseText);if(!n.error)return n;this.dialogue&&this.dialogue.hide(),new M.core.alert({message:M.util.get_string("cannotopenpdf","assignfeedback_editpdf"),visible:!0})}catch(r){this.dialogue&&this.dialogue.hide(),new M.core.alert({title:M.util.get_string("cannotopenpdf","assignfeedback_editpdf"),visible:!0})}return},get_stamp_image_url:function(t){var n=this.get("stampfiles"),r="";return e.Array.each(n,function(e){e.indexOf(t)>0&&(r=e)},this),r},setup_toolbar:function(){var t,n,r,i,o,u,a,c,p,d,v;i=this.get_dialogue_element(s.SEARCHCOMMENTSBUTTON),i.on("click",this.open_search_comments,this),i.on("key",this.open_search_comments,"down:13",this),o=this.get_dialogue_element(s.EXPCOLCOMMENTSBUTTON),o.on("click",this.expandCollapseComments,this),o.on("key",this.expandCollapseComments,"down:13",this);if(this.get("readonly"))return;u=this.get_dialogue_element(s.ROTATELEFTBUTTON),u.on("click",this.rotatePDF,this,!0),u.on("key",this.rotatePDF,"down:13",this,!0),a=this.get_dialogue_element(s.ROTATERIGHTBUTTON),a.on("click",this.rotatePDF,this,!1),a.on("key",this.rotatePDF,"down:13",this,!1),this.disable_touch_scroll(),e.each(h,function(e,n){t=this.get_dialogue_element(e),t.on("click",this.handle_tool_button,this,n),t.on("key",this.handle_tool_button,"down:13",this,n),t.setAttribute("aria-pressed","false")},this),n=this.get_dialogue_element(s.COMMENTCOLOURBUTTON),d=new M.assignfeedback_editpdf.colourpicker({buttonNode:n,colours:f,iconprefix:"background_colour_",callback:function(e){var t=e.target.getAttribute("data-colour");t||(t=e.target.ancestor().getAttribute("data-colour")),this.currentedit.commentcolour=t,this.handle_tool_button(e,"comment")},context:this}),r=this
-.get_dialogue_element(s.ANNOTATIONCOLOURBUTTON),d=new M.assignfeedback_editpdf.colourpicker({buttonNode:r,iconprefix:"colour_",colours:l,callback:function(e){var t=e.target.getAttribute("data-colour");t||(t=e.target.ancestor().getAttribute("data-colour")),this.currentedit.annotationcolour=t,this.lastannotationtool?this.handle_tool_button(e,this.lastannotationtool):this.handle_tool_button(e,"pen")},context:this}),p=this.get("stampfiles"),p.length<=0?this.get_dialogue_element(h.stamp).ancestor().hide():(v=p[0].substr(p[0].lastIndexOf("/")+1),this.currentedit.stamp=v,c=this.get_dialogue_element(s.STAMPSBUTTON),d=new M.assignfeedback_editpdf.stamppicker({buttonNode:c,stamps:p,callback:function(e){var t=e.target.getAttribute("data-stamp"),n;t||(t=e.target.ancestor().getAttribute("data-stamp")),n=t.substr(t.lastIndexOf("/")),this.currentedit.stamp=n,this.handle_tool_button(e,"stamp")},context:this}),this.refresh_button_state())},handle_tool_button:function(e,t){var n;e.preventDefault(),n=this.get_dialogue_element(h[this.currentedit.tool]),n.removeClass("assignfeedback_editpdf_selectedbutton"),n.setAttribute("aria-pressed","false"),this.currentedit.tool=t,t!=="comment"&&t!=="select"&&t!=="drag"&&t!=="stamp"&&(this.lastannotationtool=t),this.refresh_button_state()},stringify_current_page:function(){var t=[],n=[],r,i=0;for(i=0;i<this.pages[this.currentpage].comments.length;i++)t[i]=this.pages[this.currentpage].comments[i].clean();for(i=0;i<this.pages[this.currentpage].annotations.length;i++)n[i]=this.pages[this.currentpage].annotations[i].clean();return r={comments:t,annotations:n},e.JSON.stringify(r)},get_current_drawable:function(){var e,t,n=!1;return!this.currentedit.start||!this.currentedit.end?!1:(this.currentedit.tool==="comment"?(e=new M.assignfeedback_editpdf.comment(this),n=e.draw_current_edit(this.currentedit)):(t=this.create_annotation(this.currentedit.tool,{}),t&&(n=t.draw_current_edit(this.currentedit))),n)},get_dialogue_element:function(e){return this.panel?this.panel.one(e):this.dialogue.get("boundingBox").one(e)},redraw_current_edit:function(){this.currentdrawable&&this.currentdrawable.erase(),this.currentdrawable=this.get_current_drawable()},edit_start:function(t){var n=this.get_dialogue_element(s.DRAWINGCANVAS),r=n.getXY(),i=n.get("docScrollY"),o=n.get("docScrollX"),u={x:t.clientX-r[0]+o,y:t.clientY-r[1]+i},a=!1;if(t.button===3)return;if(this.currentedit.starttime)return;if(this.editingcomment)return;this.currentedit.starttime=(new Date).getTime(),this.currentedit.start=u,this.currentedit.end={x:u.x,y:u.y};if(this.currentedit.tool==="select"){var f=this.currentedit.end.x,l=this.currentedit.end.y,c=this.pages[this.currentpage].annotations;e.each(c,function(e){(f-e.x)*(f-e.endx)<=0&&(l-e.y)*(l-e.endy)<=0&&(a=e)}),a?(this.lastannotation=this.currentannotation,this.currentannotation=a,this.lastannotation&&this.lastannotation!==a&&this.lastannotation.drawable&&(this.lastannotation.drawable.erase(),this.drawables.push(this.lastannotation.draw())),this.currentannotation.drawable&&this.currentannotation.drawable.erase(),this.drawables.push(this.currentannotation.draw())):(this.lastannotation=this.currentannotation,this.currentannotation=null,this.lastannotation&&this.lastannotation.drawable&&(this.lastannotation.drawable.erase(),this.drawables.push(this.lastannotation.draw())))}this.currentannotation&&(this.currentedit.annotationstart={x:this.currentannotation.x,y:this.currentannotation.y})},edit_move:function(e){e.preventDefault();var t=this.get_canvas_bounds(),n=this.get_dialogue_element(s.DRAWINGCANVAS),r=this.get_dialogue_element(s.DRAWINGREGION),i=new M.assignfeedback_editpdf.point(e.clientX+n.get("docScrollX"),e.clientY+n.get("docScrollY")),o=this.get_canvas_coordinates(i),u,a;if(o.x<0||o.x>t.width||o.y<0||o.y>t.height)return;this.currentedit.tool==="pen"&&this.currentedit.path.push(o),this.currentedit.tool==="select"?this.currentannotation&&this.currentedit&&this.currentannotation.move(this.currentedit.annotationstart.x+o.x-this.currentedit.start.x,this.currentedit.annotationstart.y+o.y-this.currentedit.start.y):this.currentedit.tool==="drag"?(u=o.x-this.currentedit.start.x,a=o.y-this.currentedit.start.y,r.getDOMNode().scrollLeft-=u,r.getDOMNode().scrollTop-=a):this.currentedit.start&&(this.currentedit.end=o,this.redraw_current_edit())},edit_end:function(){var e,t,n;e=(new Date).getTime()-this.currentedit.start;if(e<c||this.currentedit.start===!1)return;this.currentedit.tool==="comment"?(this.currentdrawable&&this.currentdrawable.erase(),this.currentdrawable=!1,t=new M.assignfeedback_editpdf.comment(this),t.init_from_edit(this.currentedit)&&(this.pages[this.currentpage].comments.push(t),this.drawables.push(t.draw(!0)),this.editingcomment=!0)):(n=this.create_annotation(this.currentedit.tool,{}),n&&(this.currentdrawable&&this.currentdrawable.erase(),this.currentdrawable=!1,n.init_from_edit(this.currentedit)&&(this.pages[this.currentpage].annotations.push(n),this.drawables.push(n.draw())))),this.save_current_page(),this.currentedit.starttime=0,this.currentedit.start=!1,this.currentedit.end=!1,this.currentedit.path=[]},resize:function(){var t,n;if(this.dialogue){if(!this.dialogue.get("visible"))return;this.dialogue.centerDialogue()}return n=e.one("body").get("winHeight")-120,n<100&&(n=100),t=this.get_dialogue_element(s.DRAWINGREGION),this.dialogue&&t.setStyle("maxHeight",n+"px"),this.redraw(),!0},create_annotation:function(e,t){return t.type=e,t.editor=this,e==="line"?new M.assignfeedback_editpdf.annotationline(t):e==="rectangle"?new M.assignfeedback_editpdf.annotationrectangle(t):e==="oval"?new M.assignfeedback_editpdf.annotationoval(t):e==="pen"?new M.assignfeedback_editpdf.annotationpen(t):e==="highlight"?new M.assignfeedback_editpdf.annotationhighlight(t):e==="stamp"?new M.assignfeedback_editpdf.annotationstamp(t):!1},save_current_page:function(){this.clear_warnings(!1);var t=n,r;r={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"savepage",index:this.currentpage
-,userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),page:this.stringify_current_page()},on:{success:function(t,n){var r;try{r=e.JSON.parse(n.responseText);if(r.error)return new M.core.ajaxException(r);e.one(s.UNSAVEDCHANGESINPUT).set("value","true"),this.warning(M.util.get_string("draftchangessaved","assignfeedback_editpdf"),!0)}catch(i){return new M.core.exception(i)}},failure:function(e,t){return new M.core.exception(t.responseText)}}},e.io(t,r)},open_search_comments:function(e){this.searchcommentswindow||(this.searchcommentswindow=new M.assignfeedback_editpdf.commentsearch({editor:this})),this.searchcommentswindow.show(),e.preventDefault()},expandCollapseComments:function(){var t=e.all(".commentdrawable");this.collapsecomments?(this.collapsecomments=!1,t.removeClass("commentcollapsed")):(this.collapsecomments=!0,t.addClass("commentcollapsed"))},redraw:function(){var e,t;t=this.pages[this.currentpage];if(t===undefined)return;while(this.drawables.length>0)this.drawables.pop().erase();for(e=0;e<t.annotations.length;e++)this.drawables.push(t.annotations[e].draw());for(e=0;e<t.comments.length;e++)this.drawables.push(t.comments[e].draw(!1))},clear_warnings:function(e){var t=this.get_dialogue_element(s.WARNINGMESSAGECONTAINER);e?t.empty():t.all(".alert-info").remove(!0)},change_page:function(){var e=this.get_dialogue_element(s.DRAWINGCANVAS),t,n,r;n=this.get_dialogue_element(s.PREVIOUSBUTTON),r=this.get_dialogue_element(s.NEXTBUTTON),this.currentpage>0?n.removeAttribute("disabled"):n.setAttribute("disabled","true"),this.currentpage<this.pagecount-1?r.removeAttribute("disabled"):r.setAttribute("disabled","true"),t=this.pages[this.currentpage],this.loadingicon&&this.loadingicon.hide(),e.setStyle("backgroundImage",'url("'+t.url+'")'),e.setStyle("width",t.width+"px"),e.setStyle("height",t.height+"px"),e.scrollIntoView(),this.get_dialogue_element(s.PAGESELECT).set("selectedIndex",this.currentpage),this.resize()},setup_navigation:function(){var t,n,r,i,o,u;t=this.get_dialogue_element(s.PAGESELECT);var a=t.all("option");if(a.size()<=1)for(n=0;n<this.pages.length;n++)i=e.Node.create("<option/>"),i.setAttribute("value",n),r={page:n+1,total:this.pages.length},i.setHTML(M.util.get_string("pagexofy","assignfeedback_editpdf",r)),t.append(i);t.removeAttribute("disabled"),t.on("change",function(){this.currentpage=t.get("value"),this.clear_warnings(!1),this.change_page()},this),o=this.get_dialogue_element(s.PREVIOUSBUTTON),u=this.get_dialogue_element(s.NEXTBUTTON),o.on("click",this.previous_page,this),o.on("key",this.previous_page,"down:13",this),u.on("click",this.next_page,this),u.on("key",this.next_page,"down:13",this)},previous_page:function(e){e.preventDefault(),this.currentpage--,this.currentpage<0&&(this.currentpage=0),this.clear_warnings(!1),this.change_page()},next_page:function(e){e.preventDefault(),this.currentpage++,this.currentpage>=this.pages.length&&(this.currentpage=this.pages.length-1),this.clear_warnings(!1),this.change_page()},move_canvas:function(){var e,t,n,r;e=this.get_dialogue_element(s.DRAWINGREGION),t=parseInt(e.get("scrollLeft"),10),n=parseInt(e.get("scrollTop"),10);for(r=0;r<this.drawables.length;r++)this.drawables[r].scroll_update(t,n)},rotatePDF:function(t,r){t.preventDefault();if(this.get("destroyed"))return;var i=this,o;this.oldannotationcoordinates=[];var u=this.pages[this.currentpage].annotations;for(o=0;o<u.length;o++){var a=u[o];this.oldannotationcoordinates.push([a.x,a.y])}var f=n,l={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"rotatepage",index:this.currentpage,userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),rotateleft:r},on:{success:function(t,n){var r;try{r=e.JSON.parse(n.responseText);var o=i.pages[i.currentpage];o.url=r.page.url,o.width=r.page.width,o.height=r.page.height,i.loadingicon.hide();var u=i.get_dialogue_element(s.DRAWINGCANVAS);u.setStyle("backgroundImage",'url("'+o.url+'")'),u.setStyle("width",o.width+"px"),u.setStyle("height",o.height+"px");var a,f=o.annotations;for(a=0;a<f.length;a++)if(i.oldannotationcoordinates&&i.oldannotationcoordinates[a]){var l=i.oldannotationcoordinates[a][0],c=i.oldannotationcoordinates[a][1],h=f[a];h.move(l,c)}var p=o.comments;for(a=0;a<p.length;a++)p[a].updatePosition();return i.save_current_page()}catch(d){return new M.core.exception(d)}},failure:function(e,t){return new M.core.exception(t.responseText)}}};e.io(f,l)},event_listener_options_supported:function(){var e=!1,t,n="testpassiveeventoptions";try{t=Object.defineProperty({},"passive",{get:function(){e=!0}}),document.addEventListener(n,t,t),document.removeEventListener(n,t,t)}catch(r){e=!1}return e},disable_touch_scroll:function(){this.event_listener_options_supported()&&document.addEventListener("touchmove",this.stop_touch_scroll.bind(this),{passive:!1})},stop_touch_scroll:function(e){var t=this.get_dialogue_element(s.DRAWINGREGION);t.contains(e.target)&&(e.stopPropagation(),e.preventDefault())}},e.extend(I,e.Base,I.prototype,{NAME:"moodle-assignfeedback_editpdf-editor",ATTRS:{userid:{validator:e.Lang.isInteger,value:0},assignmentid:{validator:e.Lang.isInteger,value:0},attemptnumber:{validator:e.Lang.isInteger,value:0},header:{validator:e.Lang.isString,value:""},body:{validator:e.Lang.isString,value:""},footer:{validator:e.Lang.isString,value:""},linkid:{validator:e.Lang.isString,value:""},deletelinkid:{validator:e.Lang.isString,value:""},readonly:{validator:e.Lang.isBoolean,value:!0},stampfiles:{validator:e.Lang.isArray,value:""}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.editor=M.assignfeedback_editpdf.editor||{},M.assignfeedback_editpdf.editor.init=M.assignfeedback_editpdf.editor.init||function(e){return M.assignfeedback_editpdf.instance=new I(e),M.assignfeedback_editpdf.instance}},"@VERSION@",{requires:["base","event","node","io","graphics","json","event-move","event-resize","transition","querystring-stringify-simple"
-,"moodle-core-notification-dialog","moodle-core-notification-alert","moodle-core-notification-warning","moodle-core-notification-exception","moodle-core-notification-ajaxexception"]});
+YUI.add("moodle-assignfeedback_editpdf-editor",function(e,t){var n=M.cfg.wwwroot+"/mod/assign/feedback/editpdf/ajax.php",r=M.cfg.wwwroot+"/mod/assign/feedback/editpdf/ajax_progress.php",i={DIALOGUE:"assignfeedback_editpdf_widget"},s={PREVIOUSBUTTON:".navigate-previous-button",NEXTBUTTON:" .navigate-next-button",SEARCHCOMMENTSBUTTON:".searchcommentsbutton",EXPCOLCOMMENTSBUTTON:".expcolcommentsbutton",SEARCHFILTER:".assignfeedback_editpdf_commentsearch input",SEARCHCOMMENTSLIST:".assignfeedback_editpdf_commentsearch ul",PAGESELECT:".navigate-page-select",LOADINGICON:".loading",PROGRESSBARCONTAINER:".progress-info.progress-striped",DRAWINGREGION:".drawingregion",DRAWINGCANVAS:".drawingcanvas",SAVE:".savebutton",COMMENTCOLOURBUTTON:".commentcolourbutton",COMMENTMENU:".commentdrawable a",ANNOTATIONCOLOURBUTTON:".annotationcolourbutton",DELETEANNOTATIONBUTTON:".deleteannotationbutton",WARNINGMESSAGECONTAINER:".warningmessages",ICONMESSAGECONTAINER:".infoicon",UNSAVEDCHANGESDIV:".assignfeedback_editpdf_warningmessages",UNSAVEDCHANGESINPUT:'input[name="assignfeedback_editpdf_haschanges"]',STAMPSBUTTON:".currentstampbutton",USERINFOREGION:'[data-region="user-info"]',ROTATELEFTBUTTON:".rotateleftbutton",ROTATERIGHTBUTTON:".rotaterightbutton",DIALOGUE:"."+i.DIALOGUE},o="rgba(200, 200, 255, 0.9)",u="rgba(200, 200, 255, 0.5)",a="rgb(51, 51, 51)",f={white:"rgb(255,255,255)",yellow:"rgb(255,236,174)",red:"rgb(249,181,179)",green:"rgb(214,234,178)",blue:"rgb(203,217,237)",clear:"rgba(255,255,255, 0)"},l={white:"rgb(255,255,255)",yellow:"rgb(255,207,53)",red:"rgb(239,69,64)",green:"rgb(152,202,62)",blue:"rgb(125,159,211)",black:"rgb(51,51,51)"},c=300,h={comment:".commentbutton",pen:".penbutton",line:".linebutton",rectangle:".rectanglebutton",oval:".ovalbutton",stamp:".stampbutton",select:".selectbutton",drag:".dragbutton",highlight:".highlightbutton"},p=4,d=function(e,t){this.x=parseInt(e,10),this.y=parseInt(t,10),this.clip=function(e){return this.x<e.x&&(this.x=e.x),this.x>e.x+e.width&&(this.x=e.x+e.width),this.y<e.y&&(this.y=e.y),this.y>e.y+e.height&&(this.y=e.y+e.height),this}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.point=d;var v=function(e,t,n,r){this.x=e,this.y=t,this.width=n,this.height=r,this.bound=function(e){var t=0,n=0,r=0,i=0,s=0,o;for(s=0;s<e.length;s++){o=e[s];if(o.x<t||s===0)t=o.x;if(o.x>n||s===0)n=o.x;if(o.y<r||s===0)r=o.y;if(o.y>i||s===0)i=o.y}return this.x=t,this.y=r,this.width=n-t,this.height=i-r,this},this.has_min_width=function(){return this.width>=5},this.has_min_height=function(){return this.height>=5},this.set_min_width=function(){this.width=5},this.set_min_height=function(){this.height=5}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.rect=v;var m=function(){this.start=!1,this.end=!1,this.starttime=0,this.annotationstart=!1,this.tool="drag",this.commentcolour="yellow",this.annotationcolour="red",this.stamp="",this.path=[]};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.edit=m;var g=function(e){this.editor=e,this.shapes=[],this.nodes=[],this.erase=function(){if(this.shapes)while(this.shapes.length>0)this.editor.graphic.removeShape(this.shapes.pop());if(this.nodes)while(this.nodes.length>0)this.nodes.pop().remove()},this.scroll_update=function(e,t){var n,r,i;for(n=0;n<this.nodes.length;n++)r=this.nodes[n].getData("x"),i=this.nodes[n].getData("y"),r!==undefined&&i!==undefined&&(this.nodes[n].setX(parseInt(r,10)-e),this.nodes[n].setY(parseInt(i,10)-t))},this.store_position=function(e,t,n){var r,i,o;r=this.editor.get_dialogue_element(s.DRAWINGREGION),i=parseInt(r.get("scrollLeft"),10),o=parseInt(r.get("scrollTop"),10),e.setData("x",t+i),e.setData("y",n+o)}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.drawable=g;var y=function(e){y.superclass.constructor.apply(this,[e])};y.NAME="annotation",y.ATTRS={},e.extend(y,e.Base,{editor:null,gradeid:0,pageno:0,x:0,y:0,endx:0,endy:0,path:"",type:"rect",colour:"red",drawable:!1,initializer:function(e){this.editor=e.editor||null,this.gradeid=parseInt(e.gradeid,10)||0,this.pageno=parseInt(e.pageno,10)||0,this.x=parseInt(e.x,10)||0,this.y=parseInt(e.y,10)||0,this.endx=parseInt(e.endx,10)||0,this.endy=parseInt(e.endy,10)||0,this.path=e.path||"",this.type=e.type||"rect",this.colour=e.colour||"red",this.drawable=!1},clean:function(){return{gradeid:this.gradeid,x:parseInt(this.x,10),y:parseInt(this.y,10),endx:parseInt(this.endx,10),endy:parseInt(this.endy,10),type:this.type,path:this.path,pageno:this.pageno,colour:this.colour}},draw_highlight:function(){var t,n=this.editor.get_dialogue_element(s.DRAWINGREGION),r=this.editor.get_dialogue_element(s.DRAWINGCANVAS).getXY(),i;if(this.editor.currentannotation===this){t=new M.assignfeedback_editpdf.rect,t.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),i=this.editor.graphic.addShape({type:e.Rect,width:t.width,height:t.height,stroke:{weight:p,color:o},fill:{color:u},x:t.x,y:t.y}),this.drawable.shapes.push(i);var a=e.Node.create('<img src="'+M.util.image_url("trash","assignfeedback_editpdf")+'"/>'),f=e.Node.create('<a href="#" role="button"></a>');a.setAttrs({alt:M.util.get_string("deleteannotation","assignfeedback_editpdf")}),a.setStyles({backgroundColor:"white"}),f.addClass("deleteannotationbutton"),f.append(a),n.append(f),f.setData("annotation",this),f.on("click",this.remove,this),f.on("key",this.remove,"space,enter",this),f.setX(r[0]+t.x+t.width-18),f.setY(r[1]+t.y+6),this.drawable.nodes.push(f)}return this.drawable},draw:function(){return this.draw_highlight(),this.drawable},remove:function(e){var t,n;e.preventDefault(),t=this.editor.pages[this.editor.currentpage].annotations;for(n=0;n<t.length;n++)if(t[n]===this){t.splice(n,1),this.drawable&&this.drawable.erase(),this.editor.currentannotation=!1,this.editor.save_current_page();return}},move:function(t,n){var r=t-this.x,i=n-this.y,s,o,u,a,f;this.x+=r,this.y+=
+i,this.endx+=r,this.endy+=i,this.path&&(s=[],o=this.path.split(":"),e.each(o,function(e){u=e.split(","),a=parseInt(u[0],10),f=parseInt(u[1],10),s.push(a+r+","+(f+i))}),this.path=s.join(":")),this.drawable&&this.drawable.erase(),this.editor.drawables.push(this.draw())},draw_current_edit:function(e){var t=e&&!1;return t},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.endx=t.x+t.width,this.endy=t.y+t.height,this.colour=e.annotationcolour,this.path="",t.has_min_width()&&t.has_min_height()}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotation=y;var b=function(e){b.superclass.constructor.apply(this,[e])};b.NAME="annotationline",b.ATTRS={},e.extend(b,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[this.colour]}}),n.moveTo(this.x,this.y),n.lineTo(this.endx,this.endy),n.end(),t.shapes.push(n),this.drawable=t,b.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r;return r=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[t.annotationcolour]}}),r.moveTo(t.start.x,t.start.y),r.lineTo(t.end.x,t.end.y),r.end(),n.shapes.push(r),n},init_from_edit:function(e){return this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=e.start.x,this.y=e.start.y,this.endx=e.end.x,this.endy=e.end.y,this.colour=e.annotationcolour,this.path="",this.endx-this.x!==0||this.endy-this.y!==0}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationline=b;var w=function(e){w.superclass.constructor.apply(this,[e])};w.NAME="annotationrectangle",w.ATTRS={},e.extend(w,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=new M.assignfeedback_editpdf.rect,n.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),r=this.editor.graphic.addShape({type:e.Rect,width:n.width,height:n.height,stroke:{weight:p,color:l[this.colour]},x:n.x,y:n.y}),t.shapes.push(r),this.drawable=t,w.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return i=new M.assignfeedback_editpdf.rect,i.bound([new M.assignfeedback_editpdf.point(t.start.x,t.start.y),new M.assignfeedback_editpdf.point(t.end.x,t.end.y)]),i.has_min_width()||i.set_min_width(),i.has_min_height()||i.set_min_height(),r=this.editor.graphic.addShape({type:e.Rect,width:i.width,height:i.height,stroke:{weight:p,color:l[t.annotationcolour]},x:i.x,y:i.y}),n.shapes.push(r),n}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationrectangle=w;var E=function(e){E.superclass.constructor.apply(this,[e])};E.NAME="annotationoval",E.ATTRS={},e.extend(E,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=new M.assignfeedback_editpdf.rect,n.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),r=this.editor.graphic.addShape({type:e.Ellipse,width:n.width,height:n.height,stroke:{weight:p,color:l[this.colour]},x:n.x,y:n.y}),t.shapes.push(r),this.drawable=t,E.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return i=new M.assignfeedback_editpdf.rect,i.bound([new M.assignfeedback_editpdf.point(t.start.x,t.start.y),new M.assignfeedback_editpdf.point(t.end.x,t.end.y)]),i.has_min_width()||i.set_min_width(),i.has_min_height()||i.set_min_height(),r=this.editor.graphic.addShape({type:e.Ellipse,width:i.width,height:i.height,stroke:{weight:p,color:l[t.annotationcolour]},x:i.x,y:i.y}),n.shapes.push(r),n}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationoval=E;var S=function(e){S.superclass.constructor.apply(this,[e])};S.NAME="annotationpen",S.ATTRS={},e.extend(S,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r,i,s;return t=new M.assignfeedback_editpdf.drawable(this.editor),n=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[this.colour]}}),r=!0,i=this.path.split(":"),e.each(i,function(e){s=e.split(","),r?(n.moveTo(s[0],s[1]),r=!1):n.lineTo(s[0],s[1])},this),n.end(),t.shapes.push(n),this.drawable=t,S.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return r=this.editor.graphic.addShape({type:e.Path,fill:!1,stroke:{weight:p,color:l[t.annotationcolour]}}),i=!0,e.each(t.path,function(e){i?(r.moveTo(e.x,e.y),i=!1):r.lineTo(e.x,e.y)},this),r.end(),n.shapes.push(r),n},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect,n=[],r=0;t.bound(e.path);for(r=0;r<e.path.length;r++)n.push(parseInt(e.path[r].x,10)+","+parseInt(e.path[r].y,10));return this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.endx=t.x+t.width,this.endy=t.y+t.height,this.colour=e.annotationcolour,this.path=n.join(":"),t.has_min_width()||t.has_min_height()}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationpen=S;var x=function(e){x.superclass.constructor.apply(this,[e])};x.NAME="annotationhighlight",x.ATTRS={},e.extend(x,M.assignfeedback_editpdf.annotation,{draw:function(){var t,n,r,i;return t=new M.assignfeedback_editpdf.drawable(this.editor),r=new M.assignfeedback_editpdf.rect,r.bound([new M.assignfeedback_editpdf.point(this.x,this.y),new M.assignfeedback_editpdf.point(this.endx,this.endy)]),i=l[this.colour],i=i.replace("rgb","rgba"),i=i.replace(")",",0.5)"),n=this.editor.graphic.addShape({type:e.Rect
+,width:r.width,height:r.height,stroke:!1,fill:{color:i},x:r.x,y:r.y}),t.shapes.push(n),this.drawable=t,x.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i,s;return i=new M.assignfeedback_editpdf.rect,i.bound([new M.assignfeedback_editpdf.point(t.start.x,t.start.y),new M.assignfeedback_editpdf.point(t.end.x,t.end.y)]),i.has_min_width()||i.set_min_width(),s=l[t.annotationcolour],s=s.replace("rgb","rgba"),s=s.replace(")",",0.5)"),r=this.editor.graphic.addShape({type:e.Rect,width:i.width,height:20,stroke:!1,fill:{color:s},x:i.x,y:t.start.y-10}),n.shapes.push(r),n},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=e.start.y-10,this.endx=t.x+t.width,this.endy=e.start.y+10,this.colour=e.annotationcolour,this.page="",t.has_min_width()}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationhighlight=x;var T=function(e){T.superclass.constructor.apply(this,[e])};T.NAME="annotationstamp",T.ATTRS={},e.extend(T,M.assignfeedback_editpdf.annotation,{draw:function(){var t=new M.assignfeedback_editpdf.drawable(this.editor),n=this.editor.get_dialogue_element(s.DRAWINGCANVAS),r,i;return i=this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x,this.y)),r=e.Node.create("<div/>"),r.addClass("annotation"),r.addClass("stamp"),r.setStyles({position:"absolute",display:"inline-block",backgroundImage:"url("+this.editor.get_stamp_image_url(this.path)+")",width:this.endx-this.x,height:this.endy-this.y,backgroundSize:"100% 100%"}),n.append(r),r.setX(i.x),r.setY(i.y),t.store_position(r,i.x,i.y),this.editor.get("readonly")||(r.on("gesturemovestart",this.editor.edit_start,null,this.editor),r.on("gesturemove",this.editor.edit_move,null,this.editor),r.on("gesturemoveend",this.editor.edit_end,null,this.editor)),t.nodes.push(r),this.drawable=t,T.superclass.draw.apply(this)},draw_current_edit:function(t){var n=new M.assignfeedback_editpdf.rect,r=new M.assignfeedback_editpdf.drawable(this.editor),i=this.editor.get_dialogue_element(s.DRAWINGREGION),o,u;return n.bound([t.start,t.end]),u=this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(n.x,n.y)),o=e.Node.create("<div/>"),o.addClass("annotation"),o.addClass("stamp"),o.setStyles({position:"absolute",display:"inline-block",backgroundImage:"url("+this.editor.get_stamp_image_url(t.stamp)+")",width:n.width,height:n.height,backgroundSize:"100% 100%"}),i.append(o),o.setX(u.x),o.setY(u.y),r.store_position(o,u.x,u.y),r.nodes.push(o),r},init_from_edit:function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),t.width<40&&(t.width=40),t.height<40&&(t.height=40),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.endx=t.x+t.width,this.endy=t.y+t.height,this.colour=e.annotationcolour,this.path=e.stamp,!0},move:function(e,t){var n=e-this.x,r=t-this.y;this.x+=n,this.y+=r,this.endx+=n,this.endy+=r,this.drawable&&this.drawable.erase(),this.editor.drawables.push(this.draw())}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.annotationstamp=T;var N="Dropdown menu",C;C=function(e){e.draggable=!1,e.centered=!1,e.width="auto",e.visible=!1,e.footerContent="",C.superclass.constructor.apply(this,[e])},e.extend(C,M.core.dialogue,{initializer:function(t){var n,r,i,s;C.superclass.initializer.call(this,t),s=this.get("boundingBox"),s.addClass("assignfeedback_editpdf_dropdown"),n=this.get("buttonNode"),r=this.bodyNode,i=e.Node.create("<h3/>"),i.addClass("accesshide"),i.setHTML(this.get("headerText")),r.prepend(i),r.on("clickoutside",function(e){this.get("visible")&&e.target.get("id")!==n.get("id")&&e.target.ancestor().get("id")!==n.get("id")&&(e.preventDefault(),this.hide())},this),n.on("click",function(e){e.preventDefault(),this.show()},this),n.on("key",this.show,"enter,space",this)},show:function(){var t=this.get("buttonNode"),n=C.superclass.show.call(this);return this.align(t,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),n}},{NAME:N,ATTRS:{headerText:{value:""},buttonNode:{value:null}}}),e.Base.modifyAttrs(C,{modal:{getter:function(){return!1}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.dropdown=C;var k="Colourpicker",L;L=function(e){L.superclass.constructor.apply(this,[e])},e.extend(L,M.assignfeedback_editpdf.dropdown,{initializer:function(t){var n=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>'),r;e.each(this.get("colours"),function(t,r){var i,s,o,u,a;o=M.util.get_string(r,"assignfeedback_editpdf"),a=this.get("iconprefix")+r,u=M.util.image_url(a,"assignfeedback_editpdf"),i=e.Node.create('<button><img alt="'+o+'" src="'+u+'"/></button>'),i.setAttribute("data-colour",r),i.setAttribute("data-rgb",t),i.setStyle("backgroundImage","none"),s=e.Node.create("<li/>"),s.append(i),n.append(s)},this),r=e.Node.create("<div/>"),n.delegate("click",this.callback_handler,"button",this),n.delegate("key",this.callback_handler,"down:13","button",this),this.set("headerText",M.util.get_string("colourpicker","assignfeedback_editpdf")),r.append(n),this.set("bodyContent",r),L.superclass.initializer.call(this,t)},callback_handler:function(t){t.preventDefault();var n=this.get("callback"),r=this.get("context"),i;this.hide(),i=e.bind(n,r,t),i()}},{NAME:k,ATTRS:{colours:{value:{}},callback:{value:null},context:{value:null},iconprefix:{value:"colour_"}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.colourpicker=L;var A="Colourpicker",O;O=function(e){O.superclass.constructor.apply(this,[e])},e.extend(O,M.assignfeedback_editpdf.dropdown,{initializer:function(t){var n=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>');e.each(this.get("stamps"),function(t){var r,i,s;s=M.util.get_string("stamp","assignfeedback_editpdf"),r=e.Node.create
+('<button><img height="16" width="16" alt="'+s+'" src="'+t+'"/></button>'),r.setAttribute("data-stamp",t),r.setStyle("backgroundImage","none"),i=e.Node.create("<li/>"),i.append(r),n.append(i)},this),n.delegate("click",this.callback_handler,"button",this),n.delegate("key",this.callback_handler,"down:13","button",this),this.set("headerText",M.util.get_string("stamppicker","assignfeedback_editpdf")),this.set("bodyContent",n),O.superclass.initializer.call(this,t)},callback_handler:function(t){t.preventDefault();var n=this.get("callback"),r=this.get("context"),i;this.hide(),i=e.bind(n,r,t),i()}},{NAME:A,ATTRS:{stamps:{value:[]},callback:{value:null},context:{value:null}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.stamppicker=O;var _="Commentmenu",D;D=function(e){D.superclass.constructor.apply(this,[e])},e.extend(D,M.assignfeedback_editpdf.dropdown,{initializer:function(t){var n,r,i,s;s=this.get("comment"),n=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_menu"/>'),r=e.Node.create('<li><a tabindex="-1" href="#">'+M.util.get_string("addtoquicklist","assignfeedback_editpdf")+"</a></li>"),r.on("click",s.add_to_quicklist,s),r.on("key",s.add_to_quicklist,"enter,space",s),n.append(r),r=e.Node.create('<li><a tabindex="-1" href="#">'+M.util.get_string("deletecomment","assignfeedback_editpdf")+"</a></li>"),r.on("click",function(e){e.preventDefault(),this.menu.hide(),this.remove()},s),r.on("key",function(){s.menu.hide(),s.remove()},"enter,space",s),n.append(r),r=e.Node.create("<li><hr/></li>"),n.append(r),this.set("headerText",M.util.get_string("commentcontextmenu","assignfeedback_editpdf")),i=e.Node.create("<div/>"),i.append(n),this.set("bodyContent",i),D.superclass.initializer.call(this,t)},show:function(){var t=this.get("boundingBox").one("ul");t.all(".quicklist_comment").remove(!0);var n=this.get("comment");n.deleteme=!1,e.each(n.editor.quicklist.comments,function(r){var i=e.Node.create('<li class="quicklist_comment"></li>'),s=e.Node.create('<a href="#" tabindex="-1">'+r.rawtext+"</a>"),o=e.Node.create('<a href="#" tabindex="-1" class="delete_quicklist_comment"><img src="'+M.util.image_url("t/delete","core")+'" '+'alt="'+M.util.get_string("deletecomment","assignfeedback_editpdf")+'"/>'+"</a>");s.setAttribute("title",r.rawtext),i.append(s),i.append(o),t.append(i),i.on("click",n.set_from_quick_comment,n,r),i.on("key",n.set_from_quick_comment,"space,enter",n,r),o.on("click",n.remove_from_quicklist,n,r),o.on("key",n.remove_from_quicklist,"space,enter",n,r)},this),D.superclass.show.call(this)}},{NAME:_,ATTRS:{comment:{value:null}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.commentmenu=D;var P="commentsearch",H;H=function(e){e.draggable=!1,e.centered=!0,e.width="400px",e.visible=!1,e.headerContent=M.util.get_string("searchcomments","assignfeedback_editpdf"),e.footerContent="",H.superclass.constructor.apply(this,[e])},e.extend(H,M.core.dialogue,{initializer:function(t){var n,r,i,s,o,u;u=this.get("boundingBox"),u.addClass("assignfeedback_editpdf_commentsearch"),n=this.get("editor"),r=e.Node.create("<div/>"),i=M.util.get_string("filter","assignfeedback_editpdf"),s=e.Node.create('<input type="text" size="20" placeholder="'+i+'"/>'),r.append(s),o=e.Node.create('<ul role="menu" class="assignfeedback_editpdf_search"/>'),r.append(o),s.on("keyup",this.filter_search_comments,this),o.delegate("click",this.focus_on_comment,"a",this),o.delegate("key",this.focus_on_comment,"enter,space","a",this),this.set("bodyContent",r),H.superclass.initializer.call(this,t)},filter_search_comments:function(){var t,n,r,i;i=this.get("id"),t=e.one("#"+i+s.SEARCHFILTER),n=e.one("#"+i+s.SEARCHCOMMENTSLIST),r=t.get("value"),n.all("li").each(function(e){e.get("text").indexOf(r)!==-1?e.show():e.hide()})},focus_on_comment:function(e){e.preventDefault();var t=e.target.ancestor("li"),n=t.getData("comment"),r=this.get("editor");this.hide(),n.pageno=n.clean().pageno,n.pageno!==r.currentpage&&(r.currentpage=n.pageno,r.change_page()),n.node=n.drawable.nodes[0].one("textarea"),n.node.ancestor("div").removeClass("commentcollapsed"),n.node.focus()},show:function(){var t=this.get("boundingBox").one("ul"),n=this.get("editor");t.all("li").remove(!0),e.each(n.pages,function(n){e.each(n.comments,function(n){var r=e.Node.create('<li><a href="#" tabindex="-1"><pre>'+n.rawtext+"</pre></a></li>");t.append(r),r.setData("comment",n)},this)},this),this.centerDialogue(),H.superclass.show.call(this)}},{NAME:P,ATTRS:{editor:{value:null}}}),e.Base.modifyAttrs(H,{modal:{getter:function(){return!0}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.commentsearch=H;var B=function(t,n,r,i,o,u,l,c){this.editor=t,this.gradeid=n||0,this.x=parseInt(i,10)||0,this.y=parseInt(o,10)||0,this.width=parseInt(u,10)||0,this.rawtext=c||"",this.pageno=r||0,this.colour=l||"yellow",this.drawable=!1,this.deleteme=!1,this.menulink=null,this.menu=null,this.clean=function(){return{gradeid:this.gradeid,x:parseInt(this.x,10),y:parseInt(this.y,10),width:parseInt(this.width,10),rawtext:this.rawtext,pageno:parseInt(this.pageno,10),colour:this.colour}},this.draw=function(n){var r=new M.assignfeedback_editpdf.drawable(this.editor),i,o=this.editor.get_dialogue_element(s.DRAWINGCANVAS),u,l,c,h,p,d;return i=e.Node.create("<textarea/>"),u=e.Node.create('<div class="commentdrawable"/>'),l=e.Node.create("<label/>"),c=e.Node.create('<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.5 -0.5 13 13" preserveAspectRatio="xMinYMin meet"><path d="M11 0H1C.4 0 0 .4 0 1v6c0 .6.4 1 1 1h1v4l4-4h5c.6 0 1-.4 1-1V1c0-.6-.4-1-1-1z" fill="currentColor" opacity="0.9" stroke="rgb(153, 153, 153)" stroke-width="0.5"/></svg>'),h=e.Node.create('<a href="#"><img src="'+M.util.image_url("t/contextmenu","core")+'"/></a>'),this.menulink=h,u.append(l),l.append(i),u.append(c),u.setAttribute("tabindex","-1"),l.setAttribute("tabindex","0"),i.setAttribute("tabindex","-1"),h.setAttribute("tabindex","0"),this.editor.get
+("readonly")?i.setAttribute("readonly","readonly"):u.append(h),this.width<100&&(this.width=100),p=this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x,this.y)),i.setStyles({width:this.width+"px",backgroundColor:f[this.colour],color:a}),o.append(u),u.setStyle("position","absolute"),u.setX(p.x),u.setY(p.y),r.store_position(u,p.x,p.y),r.nodes.push(u),i.set("value",this.rawtext),d=i.get("scrollHeight"),i.setStyles({height:d+"px",overflow:"hidden"}),c.setStyle("color",f[this.colour]),this.attach_events(i,h),n?i.focus():t.collapsecomments&&u.addClass("commentcollapsed"),this.drawable=r,r},this.delete_comment_later=function(){this.deleteme&&this.remove()},this.attach_events=function(n,r){var i=n.ancestor("div"),s=n.ancestor("label"),o=s.next("svg");n.collapse=function(r){n.collapse.delay=e.later(r,n,function(){t.collapsecomments&&i.addClass("commentcollapsed")})},n.expand=function(){n.getData("dragging")!==!0&&(n.collapse.delay&&n.collapse.delay.cancel(),i.removeClass("commentcollapsed"))},i.on("mouseenter",function(){(t.currentedit.tool==="comment"||t.currentedit.tool==="select"||this.editor.get("readonly"))&&n.expand()},this),i.on("click|tap",function(){n.expand(),n.focus()},this),n.on("keyup",function(e){e.keyCode===9&&e.shiftKey&&r.getAttribute("tabindex")==="0"&&r.focus(),r.setAttribute("tabindex","0")},this),r.on("keydown",function(e){e.keyCode===9&&e.shiftKey&&r.setAttribute("tabindex","-1")},this),s.on("focus",function(){n.active=!0,n.collapse.delay&&n.collapse.delay.cancel(),n.setAttribute("tabindex","0"),n.expand(),n.focus(),s.setAttribute("tabindex","-1")},this),r.on("focus",function(){n.active=!0,n.collapse.delay&&n.collapse.delay.cancel(),this.deleteme=!1,s.setAttribute("tabindex","0")},this),n.on("blur",function(){n.setAttribute("tabindex","-1")},this),s.on("blur",function(){s.setAttribute("tabindex","0")},this),i.on("mouseleave",function(){t.collapsecomments&&n.active!==!0&&n.collapse(400)},this),i.on("blur",function(){n.active=!1,n.collapse(800)},this),this.editor.get("readonly")||(n.on("blur",function(){this.rawtext=n.get("value"),this.width=parseInt(n.getStyle("width"),10),this.rawtext.replace(/^\s+|\s+$/g,"")===""&&(this.deleteme=!0,e.later(400,this,this.delete_comment_later)),this.editor.save_current_page(),this.editor.editingcomment=!1},this),r.setData("comment",this),n.on("keyup",function(){n.setStyle("height","auto");var e=n.get("scrollHeight"),t=parseInt(n.getStyle("height"),10);e===t+8&&(e-=8),n.setStyle("height",e+"px")}),n.on("gesturemovestart",function(e){t.currentedit.tool==="select"&&(e.preventDefault(),t.collapsecomments?(n.setData("offsetx",8),n.setData("offsety",8)):(n.setData("offsetx",e.clientX-i.getX()),n.setData("offsety",e.clientY-i.getY())))}),n.on("gesturemove",function(e){if(t.currentedit.tool==="select"){var r=e.clientX-n.getData("offsetx"),s=e.clientY-n.getData("offsety"),o,u,a;n.getData("dragging")!==!0&&(n.collapse(0),n.setData("dragging",!0)),o=this.editor.get_canvas_coordinates(new M.assignfeedback_editpdf.point(r,s)),a=this.editor.get_canvas_bounds(!0),a.x=0,a.y=0,a.width-=24,a.height-=24,o.clip(a),this.x=o.x,this.y=o.y,u=this.editor.get_window_coordinates(o),i.setX(u.x),i.setY(u.y),this.drawable.store_position(i,u.x,u.y)}},null,this),n.on("gesturemoveend",function(){t.currentedit.tool==="select"&&(n.getData("dragging")===!0&&n.setData("dragging",!1),this.editor.save_current_page())},null,this),o.on("gesturemovestart",function(e){t.currentedit.tool==="select"&&(e.preventDefault(),n.setData("offsetx",e.clientX-i.getX()),n.setData("offsety",e.clientY-i.getY()),n.expand())}),o.on("gesturemove",function(e){if(t.currentedit.tool==="select"){var r=e.clientX-n.getData("offsetx"),s=e.clientY-n.getData("offsety"),o,u,a;n.getData("dragging")!==!0&&(n.collapse(100),n.setData("dragging",!0)),o=this.editor.get_canvas_coordinates(new M.assignfeedback_editpdf.point(r,s)),a=this.editor.get_canvas_bounds(!0),a.x=0,a.y=0,a.width-=24,a.height-=24,o.clip(a),this.x=o.x,this.y=o.y,u=this.editor.get_window_coordinates(o),i.setX(u.x),i.setY(u.y),this.drawable.store_position(i,u.x,u.y)}},null,this),o.on("gesturemoveend",function(){t.currentedit.tool==="select"&&(n.getData("dragging")===!0&&n.setData("dragging",!1),this.editor.save_current_page())},null,this),this.menu=new M.assignfeedback_editpdf.commentmenu({buttonNode:this.menulink,comment:this}))},this.remove=function(){var e=0,t;t=this.editor.pages[this.editor.currentpage].comments;for(e=0;e<t.length;e++)if(t[e]===this){t.splice(e,1),this.drawable.erase(),this.editor.save_current_page();return}},this.remove_from_quicklist=function(e,t){e.preventDefault(),e.stopPropagation(),this.menu.hide(),this.editor.quicklist.remove(t)},this.set_from_quick_comment=function(e,t){e.preventDefault(),this.menu.hide(),this.deleteme=!1,this.rawtext=t.rawtext,this.width=t.width,this.colour=t.colour,this.editor.save_current_page(),this.editor.redraw(),this.node=this.drawable.nodes[0].one("textarea"),this.node.ancestor("div").removeClass("commentcollapsed"),this.node.focus()},this.add_to_quicklist=function(e){e.preventDefault(),this.menu.hide(),this.editor.quicklist.add(this)},this.draw_current_edit=function(t){var n=new M.assignfeedback_editpdf.drawable(this.editor),r,i;return i=new M.assignfeedback_editpdf.rect,i.bound([t.start,t.end]),r=this.editor.graphic.addShape({type:e.Rect,width:i.width,height:i.height,fill:{color:f[t.commentcolour]},x:i.x,y:i.y}),n.shapes.push(r),n},this.init_from_edit=function(e){var t=new M.assignfeedback_editpdf.rect;return t.bound([e.start,e.end]),t.width<100&&(t.width=100),this.gradeid=this.editor.get("gradeid"),this.pageno=this.editor.currentpage,this.x=t.x,this.y=t.y,this.width=t.width,this.colour=e.commentcolour,this.rawtext="",t.has_min_width()&&t.has_min_height()},this.updatePosition=function(){var e=this.drawable.nodes[0].one("textarea"),t=e.ancestor("div"),n=new M.assignfeedback_editpdf.point(this.x,this.y),r=this.editor.get_window_coordinates(n);t.setX(r.x),t.setY(r.y),this.drawable
+.store_position(t,r.x,r.y)}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.comment=B;var j=function(e,t,n,r){this.rawtext=t||"",this.id=e||0,this.width=n||100,this.colour=r||"yellow"};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.quickcomment=j;var F=function(t){this.editor=t,this.comments=[],this.add=function(t){var r=n,i;if(t.rawtext==="")return;i={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"addtoquicklist",userid:this.editor.get("userid"),commenttext:t.rawtext,width:t.width,colour:t.colour,attemptnumber:this.editor.get("attemptnumber"),assignmentid:this.editor.get("assignmentid")},on:{success:function(t,n){var r,i;try{r=e.JSON.parse(n.responseText);if(r.error)return new M.core.ajaxException(r);i=new M.assignfeedback_editpdf.quickcomment(r.id,r.rawtext,r.width,r.colour),this.comments.push(i),this.comments.sort(function(e,t){return e.rawtext.localeCompare(t.rawtext)})}catch(s){return new M.core.exception(s)}},failure:function(e,t){return M.core.exception(t.responseText)}}},e.io(r,i)},this.remove=function(t){var r=n,i;if(!t)return;i={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"removefromquicklist",userid:this.editor.get("userid"),commentid:t.id,attemptnumber:this.editor.get("attemptnumber"),assignmentid:this.editor.get("assignmentid")},on:{success:function(){var e;e=this.comments.indexOf(t),e>=0&&this.comments.splice(e,1)},failure:function(e,t){return M.core.exception(t.responseText)}}},e.io(r,i)},this.load=function(){var t=n,r;r={method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"loadquicklist",userid:this.editor.get("userid"),attemptnumber:this.editor.get("attemptnumber"),assignmentid:this.editor.get("assignmentid")},on:{success:function(t,n){var r;try{r=e.JSON.parse(n.responseText);if(r.error)return new M.core.ajaxException(r);e.each(r,function(e){var t=new M.assignfeedback_editpdf.quickcomment(e.id,e.rawtext,e.width,e.colour);this.comments.push(t)},this),this.comments.sort(function(e,t){return e.rawtext.localeCompare(t.rawtext)})}catch(i){return new M.core.exception(i)}},failure:function(e,t){return M.core.exception(t.responseText)}}},e.io(t,r)}};M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.quickcommentlist=F;var I=function(){I.superclass.constructor.apply(this,arguments)};I.prototype={oldannotationcoordinates:null,dialogue:null,panel:null,pagecount:0,currentpage:0,pages:[],documentstatus:0,loadingicon:null,pageimage:null,graphic:null,currentedit:new M.assignfeedback_editpdf.edit,currentdrawable:!1,drawables:[],currentcomment:null,currentannotation:null,lastannotation:null,lastannotationtool:"pen",quicklist:null,searchcommentswindow:null,currentstamp:null,stamps:[],editingcomment:!1,collapsecomments:!0,initializer:function(){var t;t=e.one("#"+this.get("linkid")),t&&(t.on("click",this.link_handler,this),t.on("key",this.link_handler,"down:13",this),require(["mod_assign/grading_review_panel"],function(n){var r=new n,i=r.getReviewPanel("assignfeedback_editpdf");i&&(i=e.one(i),i.empty(),t.ancestor(".fitem").hide(),this.open_in_panel(i)),this.currentedit.start=!1,this.currentedit.end=!1,this.get("readonly")||(this.quicklist=new M.assignfeedback_editpdf.quickcommentlist(this))}.bind(this)))},refresh_button_state:function(){var e,t,n,r,i,o;e=this.get_dialogue_element(s.COMMENTCOLOURBUTTON),n=M.util.image_url("background_colour_"+this.currentedit.commentcolour,"assignfeedback_editpdf"),e.one("img").setAttribute("src",n),this.currentedit.commentcolour==="clear"?e.one("img").setStyle("borderStyle","dashed"):e.one("img").setStyle("borderStyle","solid"),e=this.get_dialogue_element(s.ANNOTATIONCOLOURBUTTON),n=M.util.image_url("colour_"+this.currentedit.annotationcolour,"assignfeedback_editpdf"),e.one("img").setAttribute("src",n),t=this.get_dialogue_element(h[this.currentedit.tool]),t.addClass("assignfeedback_editpdf_selectedbutton"),t.setAttribute("aria-pressed","true"),r=this.get_dialogue_element(s.DRAWINGREGION),r.setAttribute("data-currenttool",this.currentedit.tool),e=this.get_dialogue_element(s.STAMPSBUTTON),i=this.get_stamp_image_url(this.currentedit.stamp),e.one("img").setAttrs({src:i,height:"16",width:"16"}),o=this.get_dialogue_element(s.DRAWINGCANVAS);switch(this.currentedit.tool){case"drag":o.setStyle("cursor","move");break;case"highlight":o.setStyle("cursor","text");break;case"select":o.setStyle("cursor","default");break;case"stamp":o.setStyle("cursor","url("+i+"), crosshair");break;default:o.setStyle("cursor","crosshair")}},get_canvas_bounds:function(){var e=this.get_dialogue_element(s.DRAWINGCANVAS),t=e.getXY(),n=t[0],r=t[1],i=parseInt(e.getStyle("width"),10),o=parseInt(e.getStyle("height"),10);return new M.assignfeedback_editpdf.rect(n,r,i,o)},get_canvas_coordinates:function(e){var t=this.get_canvas_bounds(),n=new M.assignfeedback_editpdf.point(e.x-t.x,e.y-t.y);return t.x=t.y=0,n.clip(t),n},get_window_coordinates:function(e){var t=this.get_canvas_bounds(),n=new M.assignfeedback_editpdf.point(e.x+t.x,e.y+t.y);return n},open_in_panel:function(t){var n;this.panel=t,t.append(this.get("body")),t.addClass(i.DIALOGUE),this.loadingicon=this.get_dialogue_element(s.LOADINGICON),n=this.get_dialogue_element(s.DRAWINGCANVAS),this.graphic=new e.Graphic({render:n}),this.get("readonly")||(n.on("gesturemovestart",this.edit_start,null,this),n.on("gesturemove",this.edit_move,null,this),n.on("gesturemoveend",this.edit_end,null,this),this.refresh_button_state()),this.start_generation()},link_handler:function(t){var n,r=!0;t.preventDefault(),this.dialogue||(this.dialogue=new M.core.dialogue({headerContent:this.get("header"),bodyContent:this.get("body"),footerContent:this.get("footer"),modal:!0,width:"840px",visible:!1,draggable:!0}),this.dialogue.get("boundingBox").addClass(i.DIALOGUE),this.loadingicon=this.get_dialogue_element(s.LOADINGICON),n=this.get_dialogue_element(s.DRAWINGCANVAS),this.graphic=new e.Graphic({render:n}),this.get("readonly"
+)||(n.on("gesturemovestart",this.edit_start,null,this),n.on("gesturemove",this.edit_move,null,this),n.on("gesturemoveend",this.edit_end,null,this),this.refresh_button_state()),this.start_generation(),n.on("windowresize",this.resize,this),r=!1),this.dialogue.centerDialogue(),this.dialogue.show(),this.dialogue.dd.on("drag:end",this.redraw,this),r&&this.resize()},start_generation:function(){this.poll_document_conversion_status()},poll_document_conversion_status:function(){var t=this.get("userid");e.io(n,{method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"pollconversions",userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),readonly:this.get("readonly")?1:0},on:{success:function(n,r){var i=e.one(s.USERINFOREGION);if(i){var o=i.getAttribute("data-userid");if(o&&o!=t)return}var u=this.handle_response_data(r),a=!1;if(u){this.documentstatus=u.status;if(u.status===0)a=!0;else if(u.status===1||u.status===3)a=!0;else if(u.status===2||u.status===-1)this.pagecount=u.pagecount,u.pageready==u.pagecount?this.prepare_pages_for_display(u):(this.update_page_load_progress(),this.start_document_to_image_conversion());a&&e.later(1e3,this,this.poll_document_conversion_status)}},failure:function(e,t){return new M.core.exception(t.responseText)}}})},start_document_to_image_conversion:function(){e.io(n,{method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"pollconversions",userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),readonly:this.get("readonly")?1:0},on:{success:function(e,t){var n=this.handle_response_data(t);n&&(this.documentstatus=n.status,n.status===2&&this.prepare_pages_for_display(n))},failure:function(e,t){return new M.core.exception(t.responseText)}}})},warning:function(t,n){var r=this.get_dialogue_element(s.ICONMESSAGECONTAINER),i=this.get_dialogue_element(s.WARNINGMESSAGECONTAINER),o=15,u=1,a="assignfeedback_editpdf_warningmessages alert alert-warning";n&&(o=4,a="assignfeedback_editpdf_warningmessages alert alert-info");var f=e.Node.create('<div class="'+a+'" role="alert"></div>');f.append(r.one("*").cloneNode()),f.append(t),i.prepend(f),f.transition({duration:u,delay:o,opacity:0},function(){f.remove()})},prepare_pages_for_display:function(e){var t,n,r,i,s,o;if(!e.pagecount){this.dialogue&&this.dialogue.hide(),i=new M.core.alert({message:M.util.get_string("cannotopenpdf","assignfeedback_editpdf")}),i.show();return}this.pages=e.pages;for(t=0;t<this.pages.length;t++){for(n=0;n<this.pages[t].comments.length;n++)r=this.pages[t].comments[n],this.pages[t].comments[n]=new M.assignfeedback_editpdf.comment(this,r.gradeid,r.pageno,r.x,r.y,r.width,r.colour,r.rawtext);for(n=0;n<this.pages[t].annotations.length;n++)s=this.pages[t].annotations[n],this.pages[t].annotations[n]=this.create_annotation(s.type,s)}o=this.get("readonly"),!o&&e.partial&&this.warning(M.util.get_string("partialwarning","assignfeedback_editpdf"),!1),this.quicklist&&this.quicklist.load(),this.setup_navigation(),this.setup_toolbar(),this.change_page()},update_page_load_progress:function(){var t,n=0,i=this.get_dialogue_element(s.PROGRESSBARCONTAINER+" .bar");if(!i)return;t={method:"get",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"conversionstatus",userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid")},on:{success:function(i,o){n=0;var u=0,a=this.get_dialogue_element(s.PROGRESSBARCONTAINER+" .bar");a&&(u=o.response/this.pagecount*100,a.setStyle("width",u+"%"),a.ancestor(s.PROGRESSBARCONTAINER).setAttribute("aria-valuenow",u),u<100&&(M.util.js_pending("checkconversionstatus"),e.later(1e3,this,function(){M.util.js_complete("checkconversionstatus"),e.io(r,t)})))},failure:function(i,s){return n+=1,this.pagecount===0&&n<5&&(M.util.js_pending("checkconversionstatus"),e.later(1e3,this,function(){M.util.js_complete("checkconversionstatus"),e.io(r,t)})),new M.core.exception(s.responseText)}}},M.util.js_pending("checkconversionstatus"),e.later(1e3,this,function(){n=0,M.util.js_complete("checkconversionstatus"),e.io(r,t)})},handle_response_data:function(t){var n;try{n=e.JSON.parse(t.responseText);if(!n.error)return n;this.dialogue&&this.dialogue.hide(),new M.core.alert({message:M.util.get_string("cannotopenpdf","assignfeedback_editpdf"),visible:!0})}catch(r){this.dialogue&&this.dialogue.hide(),new M.core.alert({title:M.util.get_string("cannotopenpdf","assignfeedback_editpdf"),visible:!0})}return},get_stamp_image_url:function(t){var n=this.get("stampfiles"),r="";return e.Array.each(n,function(e){e.indexOf(t)>0&&(r=e)},this),r},setup_toolbar:function(){var t,n,r,i,o,u,a,c,p,d,v;i=this.get_dialogue_element(s.SEARCHCOMMENTSBUTTON),i.on("click",this.open_search_comments,this),i.on("key",this.open_search_comments,"down:13",this),o=this.get_dialogue_element(s.EXPCOLCOMMENTSBUTTON),o.on("click",this.expandCollapseComments,this),o.on("key",this.expandCollapseComments,"down:13",this);if(this.get("readonly"))return;u=this.get_dialogue_element(s.ROTATELEFTBUTTON),u.on("click",this.rotatePDF,this,!0),u.on("key",this.rotatePDF,"down:13",this,!0),a=this.get_dialogue_element(s.ROTATERIGHTBUTTON),a.on("click",this.rotatePDF,this,!1),a.on("key",this.rotatePDF,"down:13",this,!1),this.disable_touch_scroll(),e.each(h,function(e,n){t=this.get_dialogue_element(e),t.on("click",this.handle_tool_button,this,n),t.on("key",this.handle_tool_button,"down:13",this,n),t.setAttribute("aria-pressed","false")},this),n=this.get_dialogue_element(s.COMMENTCOLOURBUTTON),d=new M.assignfeedback_editpdf.colourpicker({buttonNode:n,colours:f,iconprefix:"background_colour_",callback:function(e){var t=e.target.getAttribute("data-colour");t||(t=e.target.ancestor().getAttribute("data-colour")),this.currentedit.commentcolour=t,this.handle_tool_button(e,"comment")},context:this}),r=this.get_dialogue_element(s.ANNOTATIONCOLOURBUTTON),d=new M.assignfeedback_editpdf.colourpicker({buttonNode:r,iconprefix:"colour_"
+,colours:l,callback:function(e){var t=e.target.getAttribute("data-colour");t||(t=e.target.ancestor().getAttribute("data-colour")),this.currentedit.annotationcolour=t,this.lastannotationtool?this.handle_tool_button(e,this.lastannotationtool):this.handle_tool_button(e,"pen")},context:this}),p=this.get("stampfiles"),p.length<=0?this.get_dialogue_element(h.stamp).ancestor().hide():(v=p[0].substr(p[0].lastIndexOf("/")+1),this.currentedit.stamp=v,c=this.get_dialogue_element(s.STAMPSBUTTON),d=new M.assignfeedback_editpdf.stamppicker({buttonNode:c,stamps:p,callback:function(e){var t=e.target.getAttribute("data-stamp"),n;t||(t=e.target.ancestor().getAttribute("data-stamp")),n=t.substr(t.lastIndexOf("/")),this.currentedit.stamp=n,this.handle_tool_button(e,"stamp")},context:this}),this.refresh_button_state())},handle_tool_button:function(e,t){var n;e.preventDefault(),n=this.get_dialogue_element(h[this.currentedit.tool]),n.removeClass("assignfeedback_editpdf_selectedbutton"),n.setAttribute("aria-pressed","false"),this.currentedit.tool=t,t!=="comment"&&t!=="select"&&t!=="drag"&&t!=="stamp"&&(this.lastannotationtool=t),this.refresh_button_state()},stringify_current_page:function(){var t=[],n=[],r,i=0;for(i=0;i<this.pages[this.currentpage].comments.length;i++)t[i]=this.pages[this.currentpage].comments[i].clean();for(i=0;i<this.pages[this.currentpage].annotations.length;i++)n[i]=this.pages[this.currentpage].annotations[i].clean();return r={comments:t,annotations:n},e.JSON.stringify(r)},get_current_drawable:function(){var e,t,n=!1;return!this.currentedit.start||!this.currentedit.end?!1:(this.currentedit.tool==="comment"?(e=new M.assignfeedback_editpdf.comment(this),n=e.draw_current_edit(this.currentedit)):(t=this.create_annotation(this.currentedit.tool,{}),t&&(n=t.draw_current_edit(this.currentedit))),n)},get_dialogue_element:function(e){return this.panel?this.panel.one(e):this.dialogue.get("boundingBox").one(e)},redraw_current_edit:function(){this.currentdrawable&&this.currentdrawable.erase(),this.currentdrawable=this.get_current_drawable()},edit_start:function(t){var n=this.get_dialogue_element(s.DRAWINGCANVAS),r=n.getXY(),i=n.get("docScrollY"),o=n.get("docScrollX"),u={x:t.clientX-r[0]+o,y:t.clientY-r[1]+i},a=!1;if(t.button===3)return;if(this.currentedit.starttime)return;if(this.editingcomment)return;this.currentedit.starttime=(new Date).getTime(),this.currentedit.start=u,this.currentedit.end={x:u.x,y:u.y};if(this.currentedit.tool==="select"){var f=this.currentedit.end.x,l=this.currentedit.end.y,c=this.pages[this.currentpage].annotations;e.each(c,function(e){(f-e.x)*(f-e.endx)<=0&&(l-e.y)*(l-e.endy)<=0&&(a=e)}),a?(this.lastannotation=this.currentannotation,this.currentannotation=a,this.lastannotation&&this.lastannotation!==a&&this.lastannotation.drawable&&(this.lastannotation.drawable.erase(),this.drawables.push(this.lastannotation.draw())),this.currentannotation.drawable&&this.currentannotation.drawable.erase(),this.drawables.push(this.currentannotation.draw())):(this.lastannotation=this.currentannotation,this.currentannotation=null,this.lastannotation&&this.lastannotation.drawable&&(this.lastannotation.drawable.erase(),this.drawables.push(this.lastannotation.draw())))}this.currentannotation&&(this.currentedit.annotationstart={x:this.currentannotation.x,y:this.currentannotation.y})},edit_move:function(e){e.preventDefault();var t=this.get_canvas_bounds(),n=this.get_dialogue_element(s.DRAWINGCANVAS),r=this.get_dialogue_element(s.DRAWINGREGION),i=new M.assignfeedback_editpdf.point(e.clientX+n.get("docScrollX"),e.clientY+n.get("docScrollY")),o=this.get_canvas_coordinates(i),u,a;if(o.x<0||o.x>t.width||o.y<0||o.y>t.height)return;this.currentedit.tool==="pen"&&this.currentedit.path.push(o),this.currentedit.tool==="select"?this.currentannotation&&this.currentedit&&this.currentannotation.move(this.currentedit.annotationstart.x+o.x-this.currentedit.start.x,this.currentedit.annotationstart.y+o.y-this.currentedit.start.y):this.currentedit.tool==="drag"?(u=o.x-this.currentedit.start.x,a=o.y-this.currentedit.start.y,r.getDOMNode().scrollLeft-=u,r.getDOMNode().scrollTop-=a):this.currentedit.start&&(this.currentedit.end=o,this.redraw_current_edit())},edit_end:function(){var e,t,n;e=(new Date).getTime()-this.currentedit.start;if(e<c||this.currentedit.start===!1)return;this.currentedit.tool==="comment"?(this.currentdrawable&&this.currentdrawable.erase(),this.currentdrawable=!1,t=new M.assignfeedback_editpdf.comment(this),t.init_from_edit(this.currentedit)&&(this.pages[this.currentpage].comments.push(t),this.drawables.push(t.draw(!0)),this.editingcomment=!0)):(n=this.create_annotation(this.currentedit.tool,{}),n&&(this.currentdrawable&&this.currentdrawable.erase(),this.currentdrawable=!1,n.init_from_edit(this.currentedit)&&(this.pages[this.currentpage].annotations.push(n),this.drawables.push(n.draw())))),this.save_current_page(),this.currentedit.starttime=0,this.currentedit.start=!1,this.currentedit.end=!1,this.currentedit.path=[]},resize:function(){var t,n;if(this.dialogue){if(!this.dialogue.get("visible"))return;this.dialogue.centerDialogue()}return n=e.one("body").get("winHeight")-120,n<100&&(n=100),t=this.get_dialogue_element(s.DRAWINGREGION),this.dialogue&&t.setStyle("maxHeight",n+"px"),this.redraw(),!0},create_annotation:function(e,t){return t.type=e,t.editor=this,e==="line"?new M.assignfeedback_editpdf.annotationline(t):e==="rectangle"?new M.assignfeedback_editpdf.annotationrectangle(t):e==="oval"?new M.assignfeedback_editpdf.annotationoval(t):e==="pen"?new M.assignfeedback_editpdf.annotationpen(t):e==="highlight"?new M.assignfeedback_editpdf.annotationhighlight(t):e==="stamp"?new M.assignfeedback_editpdf.annotationstamp(t):!1},save_current_page:function(){this.clear_warnings(!1);var t=n,r;r={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"savepage",index:this.currentpage,userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),page:this.stringify_current_page
+()},on:{success:function(t,n){var r;try{r=e.JSON.parse(n.responseText);if(r.error)return new M.core.ajaxException(r);e.one(s.UNSAVEDCHANGESINPUT).set("value","true"),this.warning(M.util.get_string("draftchangessaved","assignfeedback_editpdf"),!0)}catch(i){return new M.core.exception(i)}},failure:function(e,t){return new M.core.exception(t.responseText)}}},e.io(t,r)},open_search_comments:function(e){this.searchcommentswindow||(this.searchcommentswindow=new M.assignfeedback_editpdf.commentsearch({editor:this})),this.searchcommentswindow.show(),e.preventDefault()},expandCollapseComments:function(){var t=e.all(".commentdrawable");this.collapsecomments?(this.collapsecomments=!1,t.removeClass("commentcollapsed")):(this.collapsecomments=!0,t.addClass("commentcollapsed"))},redraw:function(){var e,t;t=this.pages[this.currentpage];if(t===undefined)return;while(this.drawables.length>0)this.drawables.pop().erase();for(e=0;e<t.annotations.length;e++)this.drawables.push(t.annotations[e].draw());for(e=0;e<t.comments.length;e++)this.drawables.push(t.comments[e].draw(!1))},clear_warnings:function(e){var t=this.get_dialogue_element(s.WARNINGMESSAGECONTAINER);e?t.empty():t.all(".alert-info").remove(!0)},change_page:function(){var e=this.get_dialogue_element(s.DRAWINGCANVAS),t,n,r;n=this.get_dialogue_element(s.PREVIOUSBUTTON),r=this.get_dialogue_element(s.NEXTBUTTON),this.currentpage>0?n.removeAttribute("disabled"):n.setAttribute("disabled","true"),this.currentpage<this.pagecount-1?r.removeAttribute("disabled"):r.setAttribute("disabled","true"),t=this.pages[this.currentpage],this.loadingicon&&this.loadingicon.hide(),e.setStyle("backgroundImage",'url("'+t.url+'")'),e.setStyle("width",t.width+"px"),e.setStyle("height",t.height+"px"),e.scrollIntoView(),this.get_dialogue_element(s.PAGESELECT).set("selectedIndex",this.currentpage),this.resize()},setup_navigation:function(){var t,n,r,i,o,u;t=this.get_dialogue_element(s.PAGESELECT);var a=t.all("option");if(a.size()<=1)for(n=0;n<this.pages.length;n++)i=e.Node.create("<option/>"),i.setAttribute("value",n),r={page:n+1,total:this.pages.length},i.setHTML(M.util.get_string("pagexofy","assignfeedback_editpdf",r)),t.append(i);t.removeAttribute("disabled"),t.on("change",function(){this.currentpage=t.get("value"),this.clear_warnings(!1),this.change_page()},this),o=this.get_dialogue_element(s.PREVIOUSBUTTON),u=this.get_dialogue_element(s.NEXTBUTTON),o.on("click",this.previous_page,this),o.on("key",this.previous_page,"down:13",this),u.on("click",this.next_page,this),u.on("key",this.next_page,"down:13",this)},previous_page:function(e){e.preventDefault(),this.currentpage--,this.currentpage<0&&(this.currentpage=0),this.clear_warnings(!1),this.change_page()},next_page:function(e){e.preventDefault(),this.currentpage++,this.currentpage>=this.pages.length&&(this.currentpage=this.pages.length-1),this.clear_warnings(!1),this.change_page()},move_canvas:function(){var e,t,n,r;e=this.get_dialogue_element(s.DRAWINGREGION),t=parseInt(e.get("scrollLeft"),10),n=parseInt(e.get("scrollTop"),10);for(r=0;r<this.drawables.length;r++)this.drawables[r].scroll_update(t,n)},rotatePDF:function(t,r){t.preventDefault();if(this.get("destroyed"))return;var i=this,o;this.oldannotationcoordinates=[];var u=this.pages[this.currentpage].annotations;for(o=0;o<u.length;o++){var a=u[o];this.oldannotationcoordinates.push([a.x,a.y])}var f=n,l={method:"post",context:this,sync:!1,data:{sesskey:M.cfg.sesskey,action:"rotatepage",index:this.currentpage,userid:this.get("userid"),attemptnumber:this.get("attemptnumber"),assignmentid:this.get("assignmentid"),rotateleft:r},on:{success:function(t,n){var r;try{r=e.JSON.parse(n.responseText);var o=i.pages[i.currentpage];o.url=r.page.url,o.width=r.page.width,o.height=r.page.height,i.loadingicon.hide();var u=i.get_dialogue_element(s.DRAWINGCANVAS);u.setStyle("backgroundImage",'url("'+o.url+'")'),u.setStyle("width",o.width+"px"),u.setStyle("height",o.height+"px");var a,f=o.annotations;for(a=0;a<f.length;a++)if(i.oldannotationcoordinates&&i.oldannotationcoordinates[a]){var l=i.oldannotationcoordinates[a][0],c=i.oldannotationcoordinates[a][1],h=f[a];h.move(l,c)}var p=o.comments;for(a=0;a<p.length;a++)p[a].updatePosition();return i.save_current_page()}catch(d){return new M.core.exception(d)}},failure:function(e,t){return new M.core.exception(t.responseText)}}};e.io(f,l)},event_listener_options_supported:function(){var e=!1,t,n="testpassiveeventoptions";try{t=Object.defineProperty({},"passive",{get:function(){e=!0}}),document.addEventListener(n,t,t),document.removeEventListener(n,t,t)}catch(r){e=!1}return e},disable_touch_scroll:function(){this.event_listener_options_supported()&&document.addEventListener("touchmove",this.stop_touch_scroll.bind(this),{passive:!1})},stop_touch_scroll:function(e){var t=this.get_dialogue_element(s.DRAWINGREGION);t.contains(e.target)&&(e.stopPropagation(),e.preventDefault())}},e.extend(I,e.Base,I.prototype,{NAME:"moodle-assignfeedback_editpdf-editor",ATTRS:{userid:{validator:e.Lang.isInteger,value:0},assignmentid:{validator:e.Lang.isInteger,value:0},attemptnumber:{validator:e.Lang.isInteger,value:0},header:{validator:e.Lang.isString,value:""},body:{validator:e.Lang.isString,value:""},footer:{validator:e.Lang.isString,value:""},linkid:{validator:e.Lang.isString,value:""},deletelinkid:{validator:e.Lang.isString,value:""},readonly:{validator:e.Lang.isBoolean,value:!0},stampfiles:{validator:e.Lang.isArray,value:""}}}),M.assignfeedback_editpdf=M.assignfeedback_editpdf||{},M.assignfeedback_editpdf.editor=M.assignfeedback_editpdf.editor||{},M.assignfeedback_editpdf.editor.init=M.assignfeedback_editpdf.editor.init||function(e){return M.assignfeedback_editpdf.instance=new I(e),M.assignfeedback_editpdf.instance}},"@VERSION@",{requires:["base","event","node","io","graphics","json","event-move","event-resize","transition","querystring-stringify-simple","moodle-core-notification-dialog","moodle-core-notification-alert","moodle-core-notification-warning","moodle-core-notification-exception"
+,"moodle-core-notification-ajaxexception"]});
diff --git a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index ee82675f460f6..14ce3579b69fd 100644
--- a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
+++ b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
@@ -732,7 +732,6 @@ Y.extend(ANNOTATION, Y.Base, {
 
             drawingregion.append(deletelink);
             deletelink.setData('annotation', this);
-            deletelink.setStyle('zIndex', '200');
 
             deletelink.on('click', this.remove, this);
             deletelink.on('key', this.remove, 'space,enter', this);
@@ -1570,24 +1569,24 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
      */
     draw: function() {
         var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
-            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
+            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
             node,
             position;
 
         position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
         node = Y.Node.create('<div/>');
-        // If these are absolutely positioned, they escape their scroll container.
+        node.addClass('annotation');
+        node.addClass('stamp');
         node.setStyles({
-            'position': 'relative',
+            'position': 'absolute',
             'display': 'inline-block',
             'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
             'width': (this.endx - this.x),
             'height': (this.endy - this.y),
-            'backgroundSize': '100% 100%',
-            'zIndex': 50
+            'backgroundSize': '100% 100%'
         });
 
-        drawingregion.append(node);
+        drawingcanvas.append(node);
         node.setX(position.x);
         node.setY(position.y);
         drawable.store_position(node, position.x, position.y);
@@ -1624,14 +1623,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
         position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(bounds.x, bounds.y));
 
         node = Y.Node.create('<div/>');
+        node.addClass('annotation');
+        node.addClass('stamp');
         node.setStyles({
             'position': 'absolute',
             'display': 'inline-block',
             'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
             'width': bounds.width,
             'height': bounds.height,
-            'backgroundSize': '100% 100%',
-            'zIndex': 50
+            'backgroundSize': '100% 100%'
         });
 
         drawingregion.append(node);
@@ -2544,7 +2544,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
     this.draw = function(focus) {
         var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
             node,
-            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
+            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
             container,
             label,
             marker,
@@ -2587,8 +2587,8 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
             color: COMMENTTEXTCOLOUR
         });
 
-        drawingregion.append(container);
-        container.setStyle('position', 'relative');
+        drawingcanvas.append(container);
+        container.setStyle('position', 'absolute');
         container.setX(position.x);
         container.setY(position.y);
         drawable.store_position(container, position.x, position.y);
@@ -3664,7 +3664,7 @@ EDITOR.prototype = {
      * @method open_in_panel
      */
     open_in_panel: function(panel) {
-        var drawingcanvas, drawingregion;
+        var drawingcanvas;
 
         this.panel = panel;
         panel.append(this.get('body'));
@@ -3675,9 +3675,6 @@ EDITOR.prototype = {
         drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
         this.graphic = new Y.Graphic({render: drawingcanvas});
 
-        drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
-        drawingregion.on('scroll', this.move_canvas, this);
-
         if (!this.get('readonly')) {
             drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
             drawingcanvas.on('gesturemove', this.edit_move, null, this);
@@ -3694,7 +3691,7 @@ EDITOR.prototype = {
      * @method link_handler
      */
     link_handler: function(e) {
-        var drawingcanvas, drawingregion;
+        var drawingcanvas;
         var resize = true;
         e.preventDefault();
 
@@ -3717,9 +3714,6 @@ EDITOR.prototype = {
             drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
             this.graphic = new Y.Graphic({render: drawingcanvas});
 
-            drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
-            drawingregion.on('scroll', this.move_canvas, this);
-
             if (!this.get('readonly')) {
                 drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
                 drawingcanvas.on('gesturemove', this.edit_move, null, this);
diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/annotation.js b/mod/assign/feedback/editpdf/yui/src/editor/js/annotation.js
index 1305efa536032..7d5ec569e9e71 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/annotation.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/annotation.js
@@ -212,7 +212,6 @@ Y.extend(ANNOTATION, Y.Base, {
 
             drawingregion.append(deletelink);
             deletelink.setData('annotation', this);
-            deletelink.setStyle('zIndex', '200');
 
             deletelink.on('click', this.remove, this);
             deletelink.on('key', this.remove, 'space,enter', this);
diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js b/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js
index 27a1cbd28ffd3..e27354c9a7571 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js
@@ -43,24 +43,24 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
      */
     draw: function() {
         var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
-            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
+            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
             node,
             position;
 
         position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
         node = Y.Node.create('<div/>');
-        // If these are absolutely positioned, they escape their scroll container.
+        node.addClass('annotation');
+        node.addClass('stamp');
         node.setStyles({
-            'position': 'relative',
+            'position': 'absolute',
             'display': 'inline-block',
             'backgroundImage': 'url(' + this.editor.get_stamp_image_url(this.path) + ')',
             'width': (this.endx - this.x),
             'height': (this.endy - this.y),
-            'backgroundSize': '100% 100%',
-            'zIndex': 50
+            'backgroundSize': '100% 100%'
         });
 
-        drawingregion.append(node);
+        drawingcanvas.append(node);
         node.setX(position.x);
         node.setY(position.y);
         drawable.store_position(node, position.x, position.y);
@@ -97,14 +97,15 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
         position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(bounds.x, bounds.y));
 
         node = Y.Node.create('<div/>');
+        node.addClass('annotation');
+        node.addClass('stamp');
         node.setStyles({
             'position': 'absolute',
             'display': 'inline-block',
             'backgroundImage': 'url(' + this.editor.get_stamp_image_url(edit.stamp) + ')',
             'width': bounds.width,
             'height': bounds.height,
-            'backgroundSize': '100% 100%',
-            'zIndex': 50
+            'backgroundSize': '100% 100%'
         });
 
         drawingregion.append(node);
diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js b/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
index 75c2dcba401ad..146f728d092c7 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
@@ -160,7 +160,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
     this.draw = function(focus) {
         var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
             node,
-            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
+            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
             container,
             label,
             marker,
@@ -203,8 +203,8 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
             color: COMMENTTEXTCOLOUR
         });
 
-        drawingregion.append(container);
-        container.setStyle('position', 'relative');
+        drawingcanvas.append(container);
+        container.setStyle('position', 'absolute');
         container.setX(position.x);
         container.setY(position.y);
         drawable.store_position(container, position.x, position.y);
diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js b/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
index 579c33fbb5221..dfeb368d9456a 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
@@ -367,7 +367,7 @@ EDITOR.prototype = {
      * @method open_in_panel
      */
     open_in_panel: function(panel) {
-        var drawingcanvas, drawingregion;
+        var drawingcanvas;
 
         this.panel = panel;
         panel.append(this.get('body'));
@@ -378,9 +378,6 @@ EDITOR.prototype = {
         drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
         this.graphic = new Y.Graphic({render: drawingcanvas});
 
-        drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
-        drawingregion.on('scroll', this.move_canvas, this);
-
         if (!this.get('readonly')) {
             drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
             drawingcanvas.on('gesturemove', this.edit_move, null, this);
@@ -397,7 +394,7 @@ EDITOR.prototype = {
      * @method link_handler
      */
     link_handler: function(e) {
-        var drawingcanvas, drawingregion;
+        var drawingcanvas;
         var resize = true;
         e.preventDefault();
 
@@ -420,9 +417,6 @@ EDITOR.prototype = {
             drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
             this.graphic = new Y.Graphic({render: drawingcanvas});
 
-            drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
-            drawingregion.on('scroll', this.move_canvas, this);
-
             if (!this.get('readonly')) {
                 drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
                 drawingcanvas.on('gesturemove', this.edit_move, null, this);
diff --git a/mod/assign/feedback/file/db/upgrade.php b/mod/assign/feedback/file/db/upgrade.php
index 898839c128c8b..ee2291bf41b46 100644
--- a/mod/assign/feedback/file/db/upgrade.php
+++ b/mod/assign/feedback/file/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignfeedback_file_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/file/importzipform.php b/mod/assign/feedback/file/importzipform.php
index 433d205251d61..2e6840eb2026f 100644
--- a/mod/assign/feedback/file/importzipform.php
+++ b/mod/assign/feedback/file/importzipform.php
@@ -80,7 +80,7 @@ public function definition() {
             if ($importer->is_valid_filename_for_import($assignment, $unzippedfile, $participants, $user, $plugin, $filename)) {
                 if ($importer->is_file_modified($assignment, $user, $plugin, $filename, $unzippedfile)) {
                     // Get a string we can show to identify this user.
-                    $userdesc = fullname($user);
+                    $userdesc = fullname($user, has_capability('moodle/site:viewfullnames', $assignment->get_context()));
                     $path = pathinfo($filename);
                     if ($assignment->is_blind_marking()) {
                         $userdesc = get_string('hiddenuser', 'assign') .
diff --git a/mod/assign/feedback/file/lang/en/assignfeedback_file.php b/mod/assign/feedback/file/lang/en/assignfeedback_file.php
index 3765b000f2d51..d9bfd017057c2 100644
--- a/mod/assign/feedback/file/lang/en/assignfeedback_file.php
+++ b/mod/assign/feedback/file/lang/en/assignfeedback_file.php
@@ -31,11 +31,11 @@
 $string['default'] = 'Enabled by default';
 $string['default_help'] = 'If set, this feedback method will be enabled by default for all new assignments.';
 $string['enabled'] = 'File feedback';
-$string['enabled_help'] = 'If enabled, the teacher will be able to upload files with feedback when marking the assignments. These files may be, but are not limited to marked up student submissions, documents with comments or spoken audio feedback. ';
+$string['enabled_help'] = 'If enabled, the teacher will be able to upload files with feedback when marking assignment submissions. These files may be, but are not limited to, marked-up student submissions, documents with comments or spoken audio feedback.';
 $string['feedbackzip'] = 'Zip file with feedback files';
 $string['feedbackfileadded'] = 'New feedback file "{$a->filename}" for student "{$a->student}"';
 $string['feedbackfileupdated'] = 'Modified feedback file "{$a->filename}" for student "{$a->student}"';
-$string['feedbackzip_help'] = 'A zip file containing a list of feedback files for one or more students. Feedback files will be assigned to students based on the participant id which should be the second part of each filename immediately after the users full name. This naming convention is used when downloading submissions so you can download all submissions, add comments to a few files and then rezip and upload all of the files. Files with no changes will be ignored.';
+$string['feedbackzip_help'] = 'A zip file containing a list of feedback files for one or more students. Feedback files will be assigned to students based on the user ID which should be the second part of each file name immediately after the user\'s full name. This naming convention is used when downloading submissions so you can download all submissions, add comments to a few files, then re-zip and upload all of the files. Files with no changes will be ignored.';
 $string['file'] = 'Feedback files';
 $string['privacy:metadata:filepurpose'] = 'Feedback files from the teacher for the student.';
 $string['privacy:path'] = 'Feedback files';
diff --git a/mod/assign/gradingbatchoperationsform.php b/mod/assign/gradingbatchoperationsform.php
index 5ea1b0128a59b..d31b8bfb754d6 100644
--- a/mod/assign/gradingbatchoperationsform.php
+++ b/mod/assign/gradingbatchoperationsform.php
@@ -50,7 +50,7 @@ public function definition() {
         if ($instance['submissiondrafts']) {
             $options['reverttodraft'] = get_string('reverttodraft', 'assign');
         }
-        if (has_capability('mod/assign:grade', $instance['context'])) {
+        if (has_capability('mod/assign:editothersubmission', $instance['context'])) {
             $options['removesubmission'] = get_string('removesubmission', 'assign');
         }
         if ($instance['duedate'] && has_capability('mod/assign:grantextension', $instance['context'])) {
diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
index e5033dc1066f7..6741cd2a5ff3b 100644
--- a/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@ -24,7 +24,7 @@
 
 $string['activityoverview'] = 'You have assignments that need attention';
 $string['addsubmission'] = 'Add submission';
-$string['addsubmission_help'] = 'You have not made a submission yet';
+$string['addsubmission_help'] = 'You have not made a submission yet.';
 $string['addattempt'] = 'Allow another attempt';
 $string['addnewattempt'] = 'Add a new attempt';
 $string['addnewattempt_help'] = 'This will create a new blank submission for you to work on.';
@@ -33,7 +33,7 @@
 $string['addnewgroupoverride'] = 'Add group override';
 $string['addnewuseroverride'] = 'Add user override';
 $string['allocatedmarker'] = 'Allocated Marker';
-$string['allocatedmarker_help'] = 'Marker allocated to this submission';
+$string['allocatedmarker_help'] = 'Marker allocated to this submission.';
 $string['allowsubmissions'] = 'Allow the user to continue making submissions to this assignment.';
 $string['allowsubmissionsshort'] = 'Allow submission changes';
 $string['allowsubmissionsfromdate'] = 'Allow submissions from';
@@ -41,7 +41,7 @@
 $string['allowsubmissionsfromdatesummary'] = 'This assignment will accept submissions from <strong>{$a}</strong>';
 $string['allowsubmissionsanddescriptionfromdatesummary'] = 'The assignment details and submission form will be available from <strong>{$a}</strong>';
 $string['alwaysshowdescription'] = 'Always show description';
-$string['alwaysshowdescription_help'] = 'If disabled, the Assignment Description above will only become visible to students at the "Allow submissions from" date.';
+$string['alwaysshowdescription_help'] = 'If disabled, the assignment description above will only become visible to students on the "Allow submissions from" date.';
 $string['applytoteam'] = 'Apply grades and feedback to entire group';
 $string['assign:addinstance'] = 'Add a new assignment';
 $string['assign:exportownsubmission'] = 'Export own submission';
@@ -84,7 +84,11 @@
 $string['attemptnumber'] = 'Attempt number';
 $string['attemptsettings'] = 'Attempt settings';
 $string['attemptreopenmethod'] = 'Attempts reopened';
-$string['attemptreopenmethod_help'] = 'Determines how student submission attempts are reopened. The available options are: <ul><li>Never - The student submission cannot be reopened.</li><li>Manually - The student submission can be reopened by a teacher.</li><li>Automatically until pass - The student submission is automatically reopened until the student achieves the grade to pass value set in the Gradebook (Gradebook setup section) for this assignment.</li></ul>';
+$string['attemptreopenmethod_help'] = 'Determines how student submission attempts are reopened. The available options are:
+
+* Never - The submission cannot be reopened.
+* Manually - The submission can be reopened by a teacher.
+* Automatically until pass - The submission is automatically reopened until the student achieves the grade to pass set in the gradebook for this assignment.';
 $string['attemptreopenmethod_manual'] = 'Manually';
 $string['attemptreopenmethod_none'] = 'Never';
 $string['attemptreopenmethod_untilpass'] = 'Automatically until pass';
@@ -131,6 +135,7 @@
 $string['couldnotcreatenewassignmentinstance'] = 'Could not create new assignment instance.';
 $string['couldnotfindassignmenttoupgrade'] = 'Could not find old assignment instance to upgrade.';
 $string['crontask'] = 'Background processing for assignment module';
+$string['currentassigngrade'] = 'Current grade in assignment';
 $string['currentgrade'] = 'Current grade in gradebook';
 $string['currentattempt'] = 'This is attempt {$a}.';
 $string['currentattemptof'] = 'This is attempt {$a->attemptnumber} ( {$a->maxattempts} attempts allowed ).';
@@ -167,7 +172,7 @@
 $string['editoverride'] = 'Edit override';
 $string['editsubmission'] = 'Edit submission';
 $string['editsubmissionother'] = 'Edit submission for {$a}';
-$string['editsubmission_help'] = 'You can still make changes to your submission';
+$string['editsubmission_help'] = 'You can still make changes to your submission.';
 $string['editingstatus'] = 'Editing status';
 $string['editaction'] = 'Actions...';
 $string['enabled'] = 'Enabled';
@@ -284,16 +289,18 @@
 $string['gradingsummary'] = 'Grading summary';
 $string['groupoverrides'] = 'Group overrides';
 $string['groupoverridesdeleted'] = 'Group overrides deleted';
-$string['groupsnone'] = 'There are no groups in this course';
+$string['groupsnone'] = 'No groups you can access.';
 $string['hidegrader'] = 'Hide grader identity from students';
-$string['hidegrader_help'] = 'Hides the identity of any user who grades an assignment submission, so students can\'t see who marked their work.';
+$string['hidegrader_help'] = 'If enabled, the identity of any user who grades an assignment submission is not shown, so students can\'t see who marked their work.
+
+Note that this setting has no effect on the comments box on the grading page.';
 $string['hideshow'] = 'Hide/Show';
 $string['hiddenuser'] = 'Participant ';
 $string['inactiveoverridehelp'] = '* Student does not have the correct group or role to attempt the assignment';
 $string['indicator:cognitivedepth'] = 'Assignment cognitive';
-$string['indicator:cognitivedepth_help'] = 'This indicator is based on the cognitive depth reached by the student in an Assignment activity.';
+$string['indicator:cognitivedepth_help'] = 'This indicator is based on the cognitive depth reached by the student in an assignment activity.';
 $string['indicator:socialbreadth'] = 'Assignment social';
-$string['indicator:socialbreadth_help'] = 'This indicator is based on the social breadth reached by the student in an Assignment activity.';
+$string['indicator:socialbreadth_help'] = 'This indicator is based on the social breadth reached by the student in an assignment activity.';
 $string['instructionfiles'] = 'Instruction files';
 $string['introattachments'] = 'Additional files';
 $string['introattachments_help'] = 'Additional files for use in the assignment, such as answer templates, may be added. Download links for the files will then be displayed on the assignment page under the description.';
@@ -323,7 +330,7 @@
 * In marking - the marker has started but not yet finished
 * Marking completed - the marker has finished but might need to go back for checking/corrections
 * In review - the marking is now with the teacher in charge for quality checking
-* Ready for release - the teacher in charge is satisfied with the marking but wait before giving students access to the marking
+* Ready for release - the teacher in charge is satisfied with the marking but may wait before giving students access to the marking
 * Released - the student can access the grades/feedback';
 $string['markingworkflowstateinmarking'] = 'In marking';
 $string['markingworkflowstateinreview'] = 'In review';
@@ -336,7 +343,7 @@
 $string['maxgrade'] = 'Maximum grade';
 $string['maxgrade'] = 'Maximum Grade';
 $string['maxperpage'] = 'Maximum assignments per page';
-$string['maxperpage_help'] = 'The maximum number of assignments a grader can show in the assignment grading page. Useful to prevent timeouts on courses with very large enrolments.';
+$string['maxperpage_help'] = 'The maximum number of assignments a grader can show in the assignment grading page. This setting is useful in preventing timeouts for courses with a large number of participants.';
 $string['messageprovider:assign_notification'] = 'Assignment notifications';
 $string['modulename'] = 'Assignment';
 $string['modulename_help'] = 'The assignment activity module enables a teacher to communicate tasks, collect work and provide grades and feedback.
@@ -474,7 +481,7 @@
 $string['sendlatenotifications'] = 'Notify graders about late submissions';
 $string['sendlatenotifications_help'] = 'If enabled, graders (usually teachers) receive a message whenever a student submits an assignment late. Message methods are configurable.';
 $string['sendsubmissionreceipts'] = 'Send submission receipt to students';
-$string['sendsubmissionreceipts_help'] = 'This switch will enable submission receipts for students. Students will receive a notification every time they successfully submit an assignment';
+$string['sendsubmissionreceipts_help'] = 'This switch enables submission receipts for students. Students will receive a notification every time they successfully submit an assignment.';
 $string['setmarkingallocation'] = 'Set allocated marker';
 $string['setmarkingworkflowstate'] = 'Set marking workflow state';
 $string['selectedusers'] = 'Selected users';
@@ -495,7 +502,7 @@
 <p>You can see the status of your <a href="{$a->url}">assignment submission</a>.</p>';
 $string['submissioncopiedsmall'] = 'You have copied your previous assignment submission for {$a->assignment}';
 $string['submissiondrafts'] = 'Require students to click the submit button';
-$string['submissiondrafts_help'] = 'If enabled, students will have to click a Submit button to declare their submission as final. This allows students to keep a draft version of the submission on the system. If this setting is changed from "No" to "Yes" after students have already submitted those submissions will be regarded as final.';
+$string['submissiondrafts_help'] = 'If enabled, students will have to click a submit button to declare their submission as final. This allows students to keep a draft version of the submission on the system. If this setting is changed from "No" to "Yes" after students have already submitted, those submissions will be regarded as final.';
 $string['submissioneditable'] = 'Student can edit this submission';
 $string['submissionlog'] = 'Student: {$a->fullname}, Status: {$a->status}';
 $string['submissionnotcopiedinvalidstatus'] = 'The submission was not copied because it has been edited since it was reopened.';
@@ -532,13 +539,13 @@
 $string['submissionstatement'] = 'Submission statement';
 $string['submissionstatement_help'] = 'Assignment submission confirmation statement';
 $string['submissionstatementdefault'] = 'This submission is my own work, except where I have acknowledged the use of the works of other people.';
-$string['submissionstatement_help'] = 'Statement that student must accept in order to submit their work';
+$string['submissionstatement_help'] = 'Statement that each student must accept in order to submit their work.';
 $string['submissionstatementteamsubmission'] = 'Group submission statement';
 $string['submissionstatementteamsubmissiondefault'] = 'This submission is the work of my group, except where we have acknowledged the use of the works of other people.';
-$string['submissionstatementteamsubmission_help'] = 'Statement that student must accept in order to submit the work of their group.';
+$string['submissionstatementteamsubmission_help'] = 'Statement that each student must accept in order to submit the work of their group.';
 $string['submissionstatementteamsubmissionallsubmit'] = 'Group submission statement where all group members submit';
 $string['submissionstatementteamsubmissionallsubmitdefault'] = 'This submission is my own work as a group member, except where I have acknowledged the use of the works of other people.';
-$string['submissionstatementteamsubmissionallsubmit_help'] = 'Statement that student must accept in order to submit their work as a group member.';
+$string['submissionstatementteamsubmissionallsubmit_help'] = 'Statement that each student must accept in order to submit their work as a group member.';
 $string['submissionstatementacceptedlog'] = 'Submission statement accepted by user {$a}';
 $string['submissionstatus_draft'] = 'Draft (not submitted)';
 $string['submissionstatusheading'] = 'Submission status';
@@ -567,9 +574,9 @@
 $string['subplugintype_assignfeedback_plural'] = 'Feedback plugins';
 $string['teamname'] = 'Team: {$a}';
 $string['teamsubmission'] = 'Students submit in groups';
-$string['teamsubmission_help'] = 'If enabled students will be divided into groups based on the default set of groups or a custom grouping. A group submission will be shared among group members and all members of the group will see each others changes to the submission.';
+$string['teamsubmission_help'] = 'If enabled, students will be divided into groups based on the default set of groups or a custom grouping. A group submission will be shared among group members and all members of the group will see each others\' changes to the submission.';
 $string['teamsubmissiongroupingid'] = 'Grouping for student groups';
-$string['teamsubmissiongroupingid_help'] = 'This is the grouping that the assignment will use to find groups for student groups. If not set - the default set of groups will be used.';
+$string['teamsubmissiongroupingid_help'] = 'This is the grouping that the assignment will use to find groups for student groups. If not set, the default set of groups will be used.';
 $string['textinstructions'] = 'Assignment instructions';
 $string['timemodified'] = 'Last modified';
 $string['timeremaining'] = 'Time remaining';
@@ -590,6 +597,7 @@
 $string['useridlistnotcached'] = 'The grade changes were NOT saved, as it was not possible to determine which submission they were for.';
 $string['useroverrides'] = 'User overrides';
 $string['useroverridesdeleted'] = 'User overrides deleted';
+$string['usersubmissioncannotberemoved'] = 'The submission of {$a} cannot be removed.';
 $string['usersnone'] = 'No students have access to this assignment.';
 $string['userswhoneedtosubmit'] = 'Users who need to submit: {$a}';
 $string['usergrade'] = 'User grade';
diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index 6f0d59b2994e4..47a2ed945156a 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -1846,6 +1846,14 @@ function mod_assign_core_calendar_provide_event_action(calendar_event $event,
     $cm = get_fast_modinfo($event->courseid, $userid)->instances['assign'][$event->instance];
     $context = context_module::instance($cm->id);
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     $assign = new assign($context, $cm, null);
 
     // Apply overrides.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index a9f0174335bb9..1cd4568c28c02 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -176,6 +176,9 @@ class assign {
      */
     private $mostrecentteamsubmission = null;
 
+    /** @var array Array of error messages encountered during the execution of assignment related operations. */
+    private $errors = array();
+
     /**
      * Constructor for the base assign class.
      *
@@ -311,6 +314,24 @@ public function set_course(stdClass $course) {
         $this->course = $course;
     }
 
+    /**
+     * Set error message.
+     *
+     * @param string $message The error message
+     */
+    protected function set_error_message(string $message) {
+        $this->errors[] = $message;
+    }
+
+    /**
+     * Get error messages.
+     *
+     * @return array The array of error messages
+     */
+    protected function get_error_messages(): array {
+        return $this->errors;
+    }
+
     /**
      * Get list of feedback plugins installed.
      *
@@ -594,7 +615,14 @@ public function view($action='', $args = array()) {
         // Now show the right view page.
         if ($action == 'redirect') {
             $nextpageurl = new moodle_url('/mod/assign/view.php', $nextpageparams);
-            redirect($nextpageurl);
+            $messages = '';
+            $messagetype = \core\output\notification::NOTIFY_INFO;
+            $errors = $this->get_error_messages();
+            if (!empty($errors)) {
+                $messages = html_writer::alist($errors, ['class' => 'mb-1 mt-1']);
+                $messagetype = \core\output\notification::NOTIFY_ERROR;
+            }
+            redirect($nextpageurl, $messages, null, $messagetype);
             return;
         } else if ($action == 'savegradingresult') {
             $message = get_string('gradingchangessaved', 'assign');
@@ -2467,15 +2495,15 @@ public static function cron() {
         // Only ever send a max of one days worth of updates.
         $yesterday = time() - (24 * 3600);
         $timenow   = time();
-        $lastcron = $DB->get_field('modules', 'lastcron', array('name' => 'assign'));
+        $lastruntime = $DB->get_field('task_scheduled', 'lastruntime', array('component' => 'mod_assign'));
 
         // Collect all submissions that require mailing.
         // Submissions are included if all are true:
         //   - The assignment is visible in the gradebook.
         //   - No previous notification has been sent.
         //   - The grader was a real user, not an automated process.
-        //   - If marking workflow is not enabled, the grade was updated in the past 24 hours, or
-        //     if marking workflow is enabled, the workflow state is at 'released'.
+        //   - The grade was updated in the past 24 hours.
+        //   - If marking workflow is enabled, the workflow state is at 'released'.
         $sql = "SELECT g.id as gradeid, a.course, a.name, a.blindmarking, a.revealidentities, a.hidegrader,
                        g.*, g.timemodified as lastmodified, cm.id as cmid, um.id as recordid
                  FROM {assign} a
@@ -2485,9 +2513,9 @@ public static function cron() {
                  JOIN {modules} md ON md.id = cm.module AND md.name = 'assign'
                  JOIN {grade_items} gri ON gri.iteminstance = a.id AND gri.courseid = a.course AND gri.itemmodule = md.name
             LEFT JOIN {assign_user_mapping} um ON g.id = um.userid AND um.assignment = a.id
-                 WHERE ((a.markingworkflow = 0 AND g.timemodified >= :yesterday AND g.timemodified <= :today) OR
-                        (a.markingworkflow = 1 AND uf.workflowstate = :wfreleased)) AND
-                       g.grader > 0 AND uf.mailed = 0 AND gri.hidden = 0
+                 WHERE (a.markingworkflow = 0 OR (a.markingworkflow = 1 AND uf.workflowstate = :wfreleased)) AND
+                       g.grader > 0 AND uf.mailed = 0 AND gri.hidden = 0 AND
+                       g.timemodified >= :yesterday AND g.timemodified <= :today
               ORDER BY a.course, cm.id";
 
         $params = array(
@@ -2639,10 +2667,10 @@ public static function cron() {
         $sql = 'SELECT id
                     FROM {assign}
                     WHERE
-                        allowsubmissionsfromdate >= :lastcron AND
+                        allowsubmissionsfromdate >= :lastruntime AND
                         allowsubmissionsfromdate <= :timenow AND
                         alwaysshowdescription = 0';
-        $params = array('lastcron' => $lastcron, 'timenow' => $timenow);
+        $params = array('lastruntime' => $lastruntime, 'timenow' => $timenow);
         $newlyavailable = $DB->get_records_sql($sql, $params);
         foreach ($newlyavailable as $record) {
             $cm = get_coursemodule_from_instance('assign', $record->id, 0, false, MUST_EXIST);
@@ -3348,11 +3376,12 @@ protected function view_quickgrading_result($message) {
                                                       $this->show_intro(),
                                                       $this->get_course_module()->id,
                                                       get_string('quickgradingresult', 'assign')));
+        $gradingerror = in_array($message, $this->get_error_messages());
         $lastpage = optional_param('lastpage', null, PARAM_INT);
         $gradingresult = new assign_gradingmessage(get_string('quickgradingresult', 'assign'),
                                                    $message,
                                                    $this->get_course_module()->id,
-                                                   false,
+                                                   $gradingerror,
                                                    $lastpage);
         $o .= $this->get_renderer()->render($gradingresult);
         $o .= $this->view_footer();
@@ -3517,7 +3546,8 @@ protected function download_submissions($userids = false) {
                     $prefix = str_replace('_', ' ', $groupname . get_string('participant', 'assign'));
                     $prefix = clean_filename($prefix . '_' . $this->get_uniqueid_for_user($userid));
                 } else {
-                    $prefix = str_replace('_', ' ', $groupname . fullname($student));
+                    $fullname = fullname($student, has_capability('moodle/site:viewfullnames', $this->get_context()));
+                    $prefix = str_replace('_', ' ', $groupname . $fullname);
                     $prefix = clean_filename($prefix . '_' . $this->get_uniqueid_for_user($userid));
                 }
 
@@ -5540,7 +5570,7 @@ public function get_assign_grading_summary_renderable($activitygroup = null) {
                                                   $this->is_any_submission_plugin_enabled(),
                                                   $this->count_submissions_with_status($submitted, $activitygroup),
                                                   $instance->cutoffdate,
-                                                  $instance->duedate,
+                                                  $this->get_duedate($activitygroup),
                                                   $this->get_course_module()->id,
                                                   $this->count_submissions_need_grading($activitygroup),
                                                   $instance->teamsubmission,
@@ -5556,7 +5586,7 @@ public function get_assign_grading_summary_renderable($activitygroup = null) {
                                                   $this->is_any_submission_plugin_enabled(),
                                                   $this->count_submissions_with_status($submitted, $activitygroup),
                                                   $instance->cutoffdate,
-                                                  $instance->duedate,
+                                                  $this->get_duedate($activitygroup),
                                                   $this->get_course_module()->id,
                                                   $this->count_submissions_need_grading($activitygroup),
                                                   $instance->teamsubmission,
@@ -5568,6 +5598,29 @@ public function get_assign_grading_summary_renderable($activitygroup = null) {
         return $summary;
     }
 
+    /**
+     * Return group override duedate.
+     *
+     * @param int $activitygroup Activity active group
+     * @return int $duedate
+     */
+    private function  get_duedate($activitygroup = null) {
+        global $DB;
+
+        if ($activitygroup === null) {
+            $activitygroup = groups_get_activity_group($this->get_course_module());
+        }
+
+        if ($this->can_view_grades()) {
+            $params = array('groupid' => $activitygroup, 'assignid' => $this->get_instance()->id);
+            $groupoverride = $DB->get_record('assign_overrides', $params);
+            if (!empty($groupoverride->duedate)) {
+                return $groupoverride->duedate;
+            }
+        }
+        return $this->get_instance()->duedate;
+    }
+
     /**
      * View submissions page (contains details of current submission).
      *
@@ -6660,7 +6713,9 @@ protected function process_save_quick_grades() {
         $gradingmanager = get_grading_manager($this->get_context(), 'mod_assign', 'submissions');
         $controller = $gradingmanager->get_active_controller();
         if (!empty($controller)) {
-            return get_string('errorquickgradingvsadvancedgrading', 'assign');
+            $message = get_string('errorquickgradingvsadvancedgrading', 'assign');
+            $this->set_error_message($message);
+            return $message;
         }
 
         $users = array();
@@ -6694,7 +6749,9 @@ protected function process_save_quick_grades() {
         }
 
         if (empty($users)) {
-            return get_string('nousersselected', 'assign');
+            $message = get_string('nousersselected', 'assign');
+            $this->set_error_message($message);
+            return $message;
         }
 
         list($userids, $params) = $DB->get_in_or_equal(array_keys($users), SQL_PARAMS_NAMED);
@@ -6748,7 +6805,9 @@ protected function process_save_quick_grades() {
                     // handle hidden columns.
                     if ($plugin->is_quickgrading_modified($modified->userid, $grade)) {
                         if ((int)$current->lastmodified > (int)$modified->lastmodified) {
-                            return get_string('errorrecordmodified', 'assign');
+                            $message = get_string('errorrecordmodified', 'assign');
+                            $this->set_error_message($message);
+                            return $message;
                         } else {
                             $modifiedusers[$modified->userid] = $modified;
                             continue;
@@ -6783,7 +6842,9 @@ protected function process_save_quick_grades() {
                 $badattempt = (int)$current->attemptnumber != (int)$modified->attemptnumber;
                 if ($badmodified || $badattempt) {
                     // Error - record has been modified since viewing the page.
-                    return get_string('errorrecordmodified', 'assign');
+                    $message = get_string('errorrecordmodified', 'assign');
+                    $this->set_error_message($message);
+                    return $message;
                 } else {
                     $modifiedusers[$modified->userid] = $modified;
                 }
@@ -7585,6 +7646,14 @@ public function add_grade_form_elements(MoodleQuickForm $mform, stdClass $data,
             $options = array('' => get_string('markingworkflowstatenotmarked', 'assign')) + $states;
             $mform->addElement('select', 'workflowstate', get_string('markingworkflowstate', 'assign'), $options);
             $mform->addHelpButton('workflowstate', 'markingworkflowstate', 'assign');
+            $gradingstatus = $this->get_grading_status($userid);
+            if ($gradingstatus != ASSIGN_MARKING_WORKFLOW_STATE_RELEASED) {
+                if ($grade->grade && $grade->grade != -1) {
+                    $assigngradestring = html_writer::span(grade_floatval($grade->grade), 'currentgrade');
+                    $label = get_string('currentassigngrade', 'assign');
+                    $mform->addElement('static', 'currentassigngrade', $label, $assigngradestring);
+                }
+            }
         }
 
         if ($this->get_instance()->markingworkflow &&
@@ -7606,6 +7675,7 @@ public function add_grade_form_elements(MoodleQuickForm $mform, stdClass $data,
             $mform->disabledIf('allocatedmarker', 'workflowstate', 'eq', ASSIGN_MARKING_WORKFLOW_STATE_READYFORRELEASE);
             $mform->disabledIf('allocatedmarker', 'workflowstate', 'eq', ASSIGN_MARKING_WORKFLOW_STATE_RELEASED);
         }
+
         $gradestring = '<span class="currentgrade">' . $gradestring . '</span>';
         $mform->addElement('static', 'currentgrade', get_string('currentgrade', 'assign'), $gradestring);
 
@@ -7849,7 +7919,10 @@ public function remove_submission($userid) {
         global $USER;
 
         if (!$this->can_edit_submission($userid, $USER->id)) {
-            print_error('nopermission');
+            $user = core_user::get_user($userid);
+            $message = get_string('usersubmissioncannotberemoved', 'assign', fullname($user));
+            $this->set_error_message($message);
+            return false;
         }
 
         if ($this->get_instance()->teamsubmission) {
@@ -8031,14 +8104,14 @@ protected function process_set_batch_marking_workflow_state() {
 
                 // Will not apply update if user does not have permission to assign this workflow state.
                 if (!$gradingdisabled && $this->update_user_flags($flags)) {
-                    if ($state == ASSIGN_MARKING_WORKFLOW_STATE_RELEASED) {
-                        // Update Gradebook.
-                        $assign = clone $this->get_instance();
-                        $assign->cmidnumber = $this->get_course_module()->idnumber;
-                        // Set assign gradebook feedback plugin status.
-                        $assign->gradefeedbackenabled = $this->is_gradebook_feedback_enabled();
-                        assign_update_grades($assign, $userid);
-                    }
+                    // Update Gradebook.
+                    $grade = $this->get_user_grade($userid, true);
+                    $this->update_grade($grade);
+                    $assign = clone $this->get_instance();
+                    $assign->cmidnumber = $this->get_course_module()->idnumber;
+                    // Set assign gradebook feedback plugin status.
+                    $assign->gradefeedbackenabled = $this->is_gradebook_feedback_enabled();
+                    assign_update_grades($assign, $userid);
 
                     $user = $DB->get_record('user', array('id' => $userid), '*', MUST_EXIST);
                     \mod_assign\event\workflow_state_updated::create_from_user($this, $user, $state)->trigger();
diff --git a/mod/assign/module.js b/mod/assign/module.js
index f0ee769b8b250..70a1d609c6a22 100644
--- a/mod/assign/module.js
+++ b/mod/assign/module.js
@@ -163,59 +163,65 @@ M.mod_assign.init_grading_options = function(Y) {
 };
 
 M.mod_assign.init_plugin_summary = function(Y, subtype, type, submissionid) {
-    suffix = subtype + '_' + type + '_' + submissionid;
-    classname = 'contract_' + suffix;
-    contract = Y.one('.' + classname);
+    var suffix = subtype + '_' + type + '_' + submissionid;
+    var classname = 'contract_' + suffix;
+    var contract = Y.one('.' + classname);
     if (contract) {
         contract.on('click', function(e) {
-            img = e.target;
-            imgclasses = img.getAttribute('class').split(' ');
-            for (i = 0; i < imgclasses.length; i++) {
-                classname = imgclasses[i];
+            e.preventDefault();
+            var link = e.target;
+            var linkclasses = link.getAttribute('class').split(' ');
+            var thissuffix = '';
+            for (var i = 0; i < linkclasses.length; i++) {
+                classname = linkclasses[i];
                 if (classname.indexOf('contract_') == 0) {
                     thissuffix = classname.substr(9);
                 }
             }
-            fullclassname = 'full_' + thissuffix;
-            full = Y.one('.' + fullclassname);
+            var fullclassname = 'full_' + thissuffix;
+            var full = Y.one('.' + fullclassname);
             if (full) {
                 full.hide(false);
             }
-            summaryclassname = 'summary_' + thissuffix;
-            summary = Y.one('.' + summaryclassname);
+            var summaryclassname = 'summary_' + thissuffix;
+            var summary = Y.one('.' + summaryclassname);
             if (summary) {
                 summary.show(false);
+                summary.one('a.expand_' + thissuffix).focus();
             }
         });
     }
     classname = 'expand_' + suffix;
-    expand = Y.one('.' + classname);
+    var expand = Y.one('.' + classname);
 
-    full = Y.one('.full_' + suffix);
+    var full = Y.one('.full_' + suffix);
     if (full) {
         full.hide(false);
         full.toggleClass('hidefull');
     }
     if (expand) {
         expand.on('click', function(e) {
-            img = e.target;
-            imgclasses = img.getAttribute('class').split(' ');
-            for (i = 0; i < imgclasses.length; i++) {
-                classname = imgclasses[i];
+            e.preventDefault();
+            var link = e.target;
+            var linkclasses = link.getAttribute('class').split(' ');
+            var thissuffix = '';
+            for (var i = 0; i < linkclasses.length; i++) {
+                classname = linkclasses[i];
                 if (classname.indexOf('expand_') == 0) {
                     thissuffix = classname.substr(7);
                 }
             }
-            summaryclassname = 'summary_' + thissuffix;
-            summary = Y.one('.' + summaryclassname);
+            var summaryclassname = 'summary_' + thissuffix;
+            var summary = Y.one('.' + summaryclassname);
             if (summary) {
                 summary.hide(false);
             }
-            fullclassname = 'full_' + thissuffix;
+            var fullclassname = 'full_' + thissuffix;
             full = Y.one('.' + fullclassname);
             if (full) {
                 full.show(false);
+                full.one('a.contract_' + thissuffix).focus();
             }
         });
     }
-}
+};
diff --git a/mod/assign/override_form.php b/mod/assign/override_form.php
index 0c68b7710062f..f7eb984c6bb59 100644
--- a/mod/assign/override_form.php
+++ b/mod/assign/override_form.php
@@ -85,13 +85,16 @@ public function __construct($submiturl, $cm, $assign, $context, $groupmode, $ove
      * Define this form - called by the parent constructor
      */
     protected function definition() {
-        global $CFG, $DB;
+        global $DB;
 
         $cm = $this->cm;
         $mform = $this->_form;
 
         $mform->addElement('header', 'override', get_string('override', 'assign'));
 
+        $assigngroupmode = groups_get_activity_groupmode($cm);
+        $accessallgroups = ($assigngroupmode == NOGROUPS) || has_capability('moodle/site:accessallgroups', $this->context);
+
         if ($this->groupmode) {
             // Group override.
             if ($this->groupid) {
@@ -107,7 +110,8 @@ protected function definition() {
                 $mform->freeze('sortorder');
             } else {
                 // Prepare the list of groups.
-                $groups = groups_get_all_groups($cm->course);
+                // Only include the groups the current can access.
+                $groups = $accessallgroups ? groups_get_all_groups($cm->course) : groups_get_activity_allowed_groups($cm);
                 if (empty($groups)) {
                     // Generate an error.
                     $link = new moodle_url('/mod/assign/overrides.php', array('cmid' => $cm->id));
@@ -140,8 +144,27 @@ protected function definition() {
                 $mform->freeze('userid');
             } else {
                 // Prepare the list of users.
-                $users = get_enrolled_users($this->context, '', 0,
-                        'u.id, u.email, ' . get_all_user_name_fields(true, 'u'));
+                $users = [];
+                list($sort) = users_order_by_sql('u');
+
+                // Get the list of appropriate users, depending on whether and how groups are used.
+                if ($accessallgroups) {
+                    $users = get_enrolled_users($this->context, '', 0,
+                            'u.id, u.email, ' . get_all_user_name_fields(true, 'u'), $sort);
+                } else if ($groups = groups_get_activity_allowed_groups($cm)) {
+                    $enrolledjoin = get_enrolled_join($this->context, 'u.id');
+                    $userfields = 'u.id, u.email, ' . get_all_user_name_fields(true, 'u');
+                    list($ingroupsql, $ingroupparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+                    $params = $enrolledjoin->params + $ingroupparams;
+                    $sql = "SELECT $userfields
+                              FROM {user} u
+                              JOIN {groups_members} gm ON gm.userid = u.id
+                                   {$enrolledjoin->joins}
+                             WHERE gm.groupid $ingroupsql
+                                   AND {$enrolledjoin->wheres}
+                          ORDER BY $sort";
+                    $users = $DB->get_records_sql($sql, $params);
+                }
 
                 // Filter users based on any fixed restrictions (groups, profile).
                 $info = new \core_availability\info_module($cm);
@@ -233,7 +256,6 @@ protected function definition() {
      * @return array of "element_name"=>"error_description" if there are errors
      */
     public function validation($data, $files) {
-        global $COURSE, $DB;
         $errors = parent::validation($data, $files);
 
         $mform =& $this->_form;
diff --git a/mod/assign/overridedelete.php b/mod/assign/overridedelete.php
index 69d280010ed7e..b96999a9be953 100644
--- a/mod/assign/overridedelete.php
+++ b/mod/assign/overridedelete.php
@@ -44,6 +44,16 @@
 // Check the user has the required capabilities to modify an override.
 require_capability('mod/assign:manageoverrides', $context);
 
+if ($override->groupid) {
+    if (!groups_group_visible($override->groupid, $course, $cm)) {
+        print_error('invalidoverrideid', 'assign');
+    }
+} else {
+    if (!groups_user_groups_visible($course, $override->userid, $cm)) {
+        print_error('invalidoverrideid', 'assign');
+    }
+}
+
 $url = new moodle_url('/mod/assign/overridedelete.php', array('id' => $override->id));
 $confirmurl = new moodle_url($url, array('id' => $override->id, 'confirm' => 1));
 $cancelurl = new moodle_url('/mod/assign/overrides.php', array('cmid' => $cm->id));
diff --git a/mod/assign/overrideedit.php b/mod/assign/overrideedit.php
index fd5ca49dba0ec..9928e8baba5f2 100644
--- a/mod/assign/overrideedit.php
+++ b/mod/assign/overrideedit.php
@@ -76,6 +76,16 @@
 if ($overrideid) {
     // Editing an override.
     $data = clone $override;
+
+    if ($override->groupid) {
+        if (!groups_group_visible($override->groupid, $course, $cm)) {
+            print_error('invalidoverrideid', 'assign');
+        }
+    } else {
+        if (!groups_user_groups_visible($course, $override->userid, $cm)) {
+            print_error('invalidoverrideid', 'assign');
+        }
+    }
 } else {
     // Creating a new override.
     $data = new stdClass();
diff --git a/mod/assign/overrides.php b/mod/assign/overrides.php
index 4a7c6894a7d47..1125b734f0546 100644
--- a/mod/assign/overrides.php
+++ b/mod/assign/overrides.php
@@ -38,13 +38,20 @@
 list($course, $cm) = get_course_and_cm_from_cmid($cmid, 'assign');
 $assign = $DB->get_record('assign', array('id' => $cm->instance), '*', MUST_EXIST);
 
+require_login($course, false, $cm);
+
+$context = context_module::instance($cm->id);
+
+// Check the user has the required capabilities to list overrides.
+require_capability('mod/assign:manageoverrides', $context);
+
+$assigngroupmode = groups_get_activity_groupmode($cm);
+$accessallgroups = ($assigngroupmode == NOGROUPS) || has_capability('moodle/site:accessallgroups', $context);
+
 $overridecountgroup = $DB->count_records('assign_overrides', array('userid' => null, 'assignid' => $assign->id));
 
-// Get the course groups.
-$groups = groups_get_all_groups($cm->course);
-if ($groups === false) {
-    $groups = array();
-}
+// Get the course groups that the current user can access.
+$groups = $accessallgroups ? groups_get_all_groups($cm->course) : groups_get_activity_allowed_groups($cm);
 
 // Default mode is "group", unless there are no groups.
 if ($mode != "user" and $mode != "group") {
@@ -60,13 +67,6 @@
 
 $PAGE->set_url($url);
 
-require_login($course, false, $cm);
-
-$context = context_module::instance($cm->id);
-
-// Check the user has the required capabilities to list overrides.
-require_capability('mod/assign:manageoverrides', $context);
-
 if ($action == 'movegroupoverride') {
     $id = required_param('id', PARAM_INT);
     $dir = required_param('dir', PARAM_ALPHA);
@@ -86,38 +86,63 @@
 
 // Delete orphaned group overrides.
 $sql = 'SELECT o.id
-            FROM {assign_overrides} o LEFT JOIN {groups} g
-            ON o.groupid = g.id
-            WHERE o.groupid IS NOT NULL
-              AND g.id IS NULL
-              AND o.assignid = ?';
+          FROM {assign_overrides} o
+     LEFT JOIN {groups} g ON o.groupid = g.id
+         WHERE o.groupid IS NOT NULL
+               AND g.id IS NULL
+               AND o.assignid = ?';
 $params = array($assign->id);
 $orphaned = $DB->get_records_sql($sql, $params);
 if (!empty($orphaned)) {
     $DB->delete_records_list('assign_overrides', 'id', array_keys($orphaned));
 }
 
+$overrides = [];
+
 // Fetch all overrides.
 if ($groupmode) {
     $colname = get_string('group');
-    $sql = 'SELECT o.*, g.name
-                FROM {assign_overrides} o
-                JOIN {groups} g ON o.groupid = g.id
-                WHERE o.assignid = :assignid
-                ORDER BY o.sortorder';
-    $params = array('assignid' => $assign->id);
+    // To filter the result by the list of groups that the current user has access to.
+    if ($groups) {
+        $params = ['assignid' => $assign->id];
+        list($insql, $inparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params += $inparams;
+
+        $sql = "SELECT o.*, g.name
+                  FROM {assign_overrides} o
+                  JOIN {groups} g ON o.groupid = g.id
+                 WHERE o.assignid = :assignid AND g.id $insql
+              ORDER BY o.sortorder";
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    }
 } else {
     $colname = get_string('user');
     list($sort, $params) = users_order_by_sql('u');
-    $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
-            FROM {assign_overrides} o
-            JOIN {user} u ON o.userid = u.id
-            WHERE o.assignid = :assignid
-            ORDER BY ' . $sort;
     $params['assignid'] = $assign->id;
-}
 
-$overrides = $DB->get_records_sql($sql, $params);
+    if ($accessallgroups) {
+        $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
+                  FROM {assign_overrides} o
+                  JOIN {user} u ON o.userid = u.id
+                 WHERE o.assignid = :assignid
+              ORDER BY ' . $sort;
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    } else if ($groups) {
+        list($insql, $inparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params += $inparams;
+
+        $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
+                  FROM {assign_overrides} o
+                  JOIN {user} u ON o.userid = u.id
+                  JOIN {groups_members} gm ON u.id = gm.userid
+                 WHERE o.assignid = :assignid AND gm.groupid ' . $insql . '
+              ORDER BY ' . $sort;
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    }
+}
 
 // Initialise table.
 $table = new html_table();
@@ -278,13 +303,31 @@
 } else {
     $users = array();
     // See if there are any users in the assign.
-    $users = get_enrolled_users($context);
+    if ($accessallgroups) {
+        $users = get_enrolled_users($context, '', 0, 'u.id');
+        $nousermessage = get_string('usersnone', 'assign');
+    } else if ($groups) {
+        $enrolledjoin = get_enrolled_join($context, 'u.id');
+        list($ingroupsql, $ingroupparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params = $enrolledjoin->params + $ingroupparams;
+        $sql = "SELECT u.id
+                  FROM {user} u
+                  JOIN {groups_members} gm ON gm.userid = u.id
+                       {$enrolledjoin->joins}
+                 WHERE gm.groupid $ingroupsql
+                       AND {$enrolledjoin->wheres}
+              ORDER BY $sort";
+        $users = $DB->get_records_sql($sql, $params);
+        $nousermessage = get_string('usersnone', 'assign');
+    } else {
+        $nousermessage = get_string('groupsnone', 'assign');
+    }
     $info = new \core_availability\info_module($cm);
     $users = $info->filter_user_list($users);
 
     if (empty($users)) {
         // There are no users.
-        echo $OUTPUT->notification(get_string('usersnone', 'assign'), 'error');
+        echo $OUTPUT->notification($nousermessage, 'error');
         $options['disabled'] = true;
     }
     echo $OUTPUT->single_button($overrideediturl->out(true,
diff --git a/mod/assign/renderer.php b/mod/assign/renderer.php
index 32de4ef12b0ed..cd058e8e07913 100644
--- a/mod/assign/renderer.php
+++ b/mod/assign/renderer.php
@@ -70,18 +70,28 @@ public function render_assign_files(assign_files $tree) {
     }
 
     /**
-     * Utility function to add a row of data to a table with 2 columns. Modified
-     * the table param and does not return a value
+     * Utility function to add a row of data to a table with 2 columns where the first column is the table's header.
+     * Modified the table param and does not return a value.
      *
      * @param html_table $table The table to append the row of data to
      * @param string $first The first column text
      * @param string $second The second column text
+     * @param array $firstattributes The first column attributes (optional)
+     * @param array $secondattributes The second column attributes (optional)
      * @return void
      */
-    private function add_table_row_tuple(html_table $table, $first, $second) {
+    private function add_table_row_tuple(html_table $table, $first, $second, $firstattributes = [],
+            $secondattributes = []) {
         $row = new html_table_row();
         $cell1 = new html_table_cell($first);
+        $cell1->header = true;
+        if (!empty($firstattributes)) {
+            $cell1->attributes = $firstattributes;
+        }
         $cell2 = new html_table_cell($second);
+        if (!empty($secondattributes)) {
+            $cell2->attributes = $secondattributes;
+        }
         $row->cells = array($cell1, $cell2);
         $table->data[] = $row;
     }
@@ -274,35 +284,40 @@ public function render_assign_grading_summary(assign_grading_summary $summary) {
         $t = new html_table();
 
         // Visibility Status.
-        $this->add_table_row_tuple($t, get_string('hiddenfromstudents'),
-            (!$summary->isvisible) ? get_string('yes') : get_string('no'));
+        $cell1content = get_string('hiddenfromstudents');
+        $cell2content = (!$summary->isvisible) ? get_string('yes') : get_string('no');
+        $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
         // Status.
         if ($summary->teamsubmission) {
             if ($summary->warnofungroupedusers) {
                 $o .= $this->output->notification(get_string('ungroupedusers', 'assign'));
             }
-
-            $this->add_table_row_tuple($t, get_string('numberofteams', 'assign'),
-                                       $summary->participantcount);
+            $cell1content = get_string('numberofteams', 'assign');
         } else {
-            $this->add_table_row_tuple($t, get_string('numberofparticipants', 'assign'),
-                                       $summary->participantcount);
+            $cell1content = get_string('numberofparticipants', 'assign');
         }
 
+        $cell2content = $summary->participantcount;
+        $this->add_table_row_tuple($t, $cell1content, $cell2content);
+
         // Drafts count and dont show drafts count when using offline assignment.
         if ($summary->submissiondraftsenabled && $summary->submissionsenabled) {
-            $this->add_table_row_tuple($t, get_string('numberofdraftsubmissions', 'assign'),
-                                       $summary->submissiondraftscount);
+            $cell1content = get_string('numberofdraftsubmissions', 'assign');
+            $cell2content = $summary->submissiondraftscount;
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
         }
 
         // Submitted for grading.
         if ($summary->submissionsenabled) {
-            $this->add_table_row_tuple($t, get_string('numberofsubmittedassignments', 'assign'),
-                                       $summary->submissionssubmittedcount);
+            $cell1content = get_string('numberofsubmittedassignments', 'assign');
+            $cell2content = $summary->submissionssubmittedcount;
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
+
             if (!$summary->teamsubmission) {
-                $this->add_table_row_tuple($t, get_string('numberofsubmissionsneedgrading', 'assign'),
-                                           $summary->submissionsneedgradingcount);
+                $cell1content = get_string('numberofsubmissionsneedgrading', 'assign');
+                $cell2content = $summary->submissionsneedgradingcount;
+                $this->add_table_row_tuple($t, $cell1content, $cell2content);
             }
         }
 
@@ -310,27 +325,31 @@ public function render_assign_grading_summary(assign_grading_summary $summary) {
         if ($summary->duedate) {
             // Due date.
             $duedate = $summary->duedate;
-            $this->add_table_row_tuple($t, get_string('duedate', 'assign'),
-                                       userdate($duedate));
+            $cell1content = get_string('duedate', 'assign');
+            $cell2content = userdate($duedate);
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
             // Time remaining.
-            $due = '';
+            $cell1content = get_string('timeremaining', 'assign');
             if ($duedate - $time <= 0) {
-                $due = get_string('assignmentisdue', 'assign');
+                $cell2content = get_string('assignmentisdue', 'assign');
             } else {
-                $due = format_time($duedate - $time);
+                $cell2content = format_time($duedate - $time);
             }
-            $this->add_table_row_tuple($t, get_string('timeremaining', 'assign'), $due);
+
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
             if ($duedate < $time) {
                 $cutoffdate = $summary->cutoffdate;
                 if ($cutoffdate) {
+                    $cell1content = get_string('latesubmissions', 'assign');
                     if ($cutoffdate > $time) {
-                        $late = get_string('latesubmissionsaccepted', 'assign', userdate($summary->cutoffdate));
+                        $cell2content = get_string('latesubmissionsaccepted', 'assign',
+                            userdate($cutoffdate));
                     } else {
-                        $late = get_string('nomoresubmissionsaccepted', 'assign');
+                        $cell2content = get_string('nomoresubmissionsaccepted', 'assign');
                     }
-                    $this->add_table_row_tuple($t, get_string('latesubmissions', 'assign'), $late);
+                    $this->add_table_row_tuple($t, $cell1content, $cell2content);
                 }
             }
 
@@ -341,21 +360,23 @@ public function render_assign_grading_summary(assign_grading_summary $summary) {
         $o .= $this->output->box_end();
 
         // Link to the grading page.
-        $o .= '<center>';
+        $o .= html_writer::start_tag('center');
         $o .= $this->output->container_start('submissionlinks');
         $urlparams = array('id' => $summary->coursemoduleid, 'action' => 'grading');
         $url = new moodle_url('/mod/assign/view.php', $urlparams);
-        $o .= '<a href="' . $url . '" class="btn btn-secondary">' . get_string('viewgrading', 'mod_assign') . '</a> ';
+        $o .= html_writer::link($url, get_string('viewgrading', 'mod_assign'),
+            ['class' => 'btn btn-secondary']);
         if ($summary->cangrade) {
             $urlparams = array('id' => $summary->coursemoduleid, 'action' => 'grader');
             $url = new moodle_url('/mod/assign/view.php', $urlparams);
-            $o .= '<a href="' . $url . '" class="btn btn-primary">' . get_string('grade') . '</a>';
+            $o .= html_writer::link($url, get_string('grade'),
+                ['class' => 'btn btn-primary ml-1']);
         }
         $o .= $this->output->container_end();
 
         // Close the container and insert a spacer.
         $o .= $this->output->container_end();
-        $o .= '</center>';
+        $o .= html_writer::end_tag('center');
 
         return $o;
     }
@@ -367,7 +388,6 @@ public function render_assign_grading_summary(assign_grading_summary $summary) {
      * @return string
      */
     public function render_assign_feedback_status(assign_feedback_status $status) {
-        global $DB, $CFG;
         $o = '';
 
         $o .= $this->output->container_start('feedback');
@@ -377,30 +397,23 @@ public function render_assign_feedback_status(assign_feedback_status $status) {
 
         // Grade.
         if (isset($status->gradefordisplay)) {
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('grade'));
-            $cell2 = new html_table_cell($status->gradefordisplay);
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $cell1content = get_string('grade');
+            $cell2content = $status->gradefordisplay;
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
             // Grade date.
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('gradedon', 'assign'));
-            $cell2 = new html_table_cell(userdate($status->gradeddate));
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $cell1content = get_string('gradedon', 'assign');
+            $cell2content = userdate($status->gradeddate);
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
         }
 
         if ($status->grader) {
             // Grader.
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('gradedby', 'assign'));
-            $userdescription = $this->output->user_picture($status->grader) .
-                               $this->output->spacer(array('width'=>30)) .
-                               fullname($status->grader, $status->canviewfullnames);
-            $cell2 = new html_table_cell($userdescription);
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $cell1content = get_string('gradedby', 'assign');
+            $cell2content = $this->output->user_picture($status->grader) .
+                            $this->output->spacer(array('width' => 30)) .
+                            fullname($status->grader, $status->canviewfullnames);
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
         }
 
         foreach ($status->feedbackplugins as $plugin) {
@@ -410,8 +423,6 @@ public function render_assign_feedback_status(assign_feedback_status $status) {
                     !empty($status->grade) &&
                     !$plugin->is_empty($status->grade)) {
 
-                $row = new html_table_row();
-                $cell1 = new html_table_cell($plugin->get_name());
                 $displaymode = assign_feedback_plugin_feedback::SUMMARY;
                 $pluginfeedback = new assign_feedback_plugin_feedback($plugin,
                                                                       $status->grade,
@@ -419,9 +430,9 @@ public function render_assign_feedback_status(assign_feedback_status $status) {
                                                                       $status->coursemoduleid,
                                                                       $status->returnaction,
                                                                       $status->returnparams);
-                $cell2 = new html_table_cell($this->render($pluginfeedback));
-                $row->cells = array($cell1, $cell2);
-                $t->data[] = $row;
+                $cell1content = $plugin->get_name();
+                $cell2content = $this->render($pluginfeedback);
+                $this->add_table_row_tuple($t, $cell1content, $cell2content);
             }
         }
 
@@ -645,32 +656,26 @@ public function render_assign_submission_status(assign_submission_status $status
 
         $warningmsg = '';
         if ($status->teamsubmissionenabled) {
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('submissionteam', 'assign'));
+            $cell1content = get_string('submissionteam', 'assign');
             $group = $status->submissiongroup;
             if ($group) {
-                $cell2 = new html_table_cell(format_string($group->name, false, $status->context));
+                $cell2content = format_string($group->name, false, $status->context);
             } else if ($status->preventsubmissionnotingroup) {
                 if (count($status->usergroups) == 0) {
                     $notification = new \core\output\notification(get_string('noteam', 'assign'), 'error');
                     $notification->set_show_closebutton(false);
-                    $cell2 = new html_table_cell(
-                        $this->output->render($notification)
-                    );
                     $warningmsg = $this->output->notification(get_string('noteam_desc', 'assign'), 'error');
                 } else if (count($status->usergroups) > 1) {
                     $notification = new \core\output\notification(get_string('multipleteams', 'assign'), 'error');
                     $notification->set_show_closebutton(false);
-                    $cell2 = new html_table_cell(
-                        $this->output->render($notification)
-                    );
                     $warningmsg = $this->output->notification(get_string('multipleteams_desc', 'assign'), 'error');
                 }
+                $cell2content = $this->output->render($notification);
             } else {
-                $cell2 = new html_table_cell(get_string('defaultteam', 'assign'));
+                $cell2content = get_string('defaultteam', 'assign');
             }
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
         }
 
         if ($status->attemptreopenmethod != ASSIGN_ATTEMPT_REOPEN_METHOD_NONE) {
@@ -685,49 +690,38 @@ public function render_assign_submission_status(assign_submission_status $status
                 }
             }
 
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('attemptnumber', 'assign'));
+            $cell1content = get_string('attemptnumber', 'assign');
             $maxattempts = $status->maxattempts;
             if ($maxattempts == ASSIGN_UNLIMITED_ATTEMPTS) {
-                $message = get_string('currentattempt', 'assign', $currentattempt);
+                $cell2content = get_string('currentattempt', 'assign', $currentattempt);
             } else {
-                $message = get_string('currentattemptof', 'assign', array('attemptnumber'=>$currentattempt,
-                                                                          'maxattempts'=>$maxattempts));
+                $cell2content = get_string('currentattemptof', 'assign',
+                    array('attemptnumber' => $currentattempt, 'maxattempts' => $maxattempts));
             }
-            $cell2 = new html_table_cell($message);
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
         }
 
-        $row = new html_table_row();
-        $cell1 = new html_table_cell(get_string('submissionstatus', 'assign'));
+        $cell1content = get_string('submissionstatus', 'assign');
+        $cell2attributes = [];
         if (!$status->teamsubmissionenabled) {
             if ($status->submission && $status->submission->status != ASSIGN_SUBMISSION_STATUS_NEW) {
-                $statusstr = get_string('submissionstatus_' . $status->submission->status, 'assign');
-                $cell2 = new html_table_cell($statusstr);
-                $cell2->attributes = array('class'=>'submissionstatus' . $status->submission->status);
+                $cell2content = get_string('submissionstatus_' . $status->submission->status, 'assign');
+                $cell2attributes = array('class' => 'submissionstatus' . $status->submission->status);
             } else {
                 if (!$status->submissionsenabled) {
-                    $cell2 = new html_table_cell(get_string('noonlinesubmissions', 'assign'));
+                    $cell2content = get_string('noonlinesubmissions', 'assign');
                 } else {
-                    $cell2 = new html_table_cell(get_string('noattempt', 'assign'));
+                    $cell2content = get_string('noattempt', 'assign');
                 }
             }
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
         } else {
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('submissionstatus', 'assign'));
             $group = $status->submissiongroup;
             if (!$group && $status->preventsubmissionnotingroup) {
-                $cell2 = new html_table_cell(get_string('nosubmission', 'assign'));
+                $cell2content = get_string('nosubmission', 'assign');
             } else if ($status->teamsubmission && $status->teamsubmission->status != ASSIGN_SUBMISSION_STATUS_NEW) {
                 $teamstatus = $status->teamsubmission->status;
-                $submissionsummary = get_string('submissionstatus_' . $teamstatus, 'assign');
-                $groupid = 0;
-                if ($status->submissiongroup) {
-                    $groupid = $status->submissiongroup->id;
-                }
+                $cell2content = get_string('submissionstatus_' . $teamstatus, 'assign');
 
                 $members = $status->submissiongroupmemberswhoneedtosubmit;
                 $userslist = array();
@@ -744,156 +738,133 @@ public function render_assign_submission_status(assign_submission_status $status
                 if (count($userslist) > 0) {
                     $userstr = join(', ', $userslist);
                     $formatteduserstr = get_string('userswhoneedtosubmit', 'assign', $userstr);
-                    $submissionsummary .= $this->output->container($formatteduserstr);
+                    $cell2content .= $this->output->container($formatteduserstr);
                 }
 
-                $cell2 = new html_table_cell($submissionsummary);
-                $cell2->attributes = array('class'=>'submissionstatus' . $status->teamsubmission->status);
+                $cell2attributes = array('class' => 'submissionstatus' . $status->teamsubmission->status);
             } else {
-                $cell2 = new html_table_cell(get_string('nosubmission', 'assign'));
                 if (!$status->submissionsenabled) {
-                    $cell2 = new html_table_cell(get_string('noonlinesubmissions', 'assign'));
+                    $cell2content = get_string('noonlinesubmissions', 'assign');
                 } else {
-                    $cell2 = new html_table_cell(get_string('nosubmission', 'assign'));
+                    $cell2content = get_string('nosubmission', 'assign');
                 }
             }
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
         }
 
+        $this->add_table_row_tuple($t, $cell1content, $cell2content, [], $cell2attributes);
+
         // Is locked?
         if ($status->locked) {
-            $row = new html_table_row();
-            $cell1 = new html_table_cell();
-            $cell2 = new html_table_cell(get_string('submissionslocked', 'assign'));
-            $cell2->attributes = array('class'=>'submissionlocked');
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $cell1content = '';
+            $cell2content = get_string('submissionslocked', 'assign');
+            $cell2attributes = array('class' => 'submissionlocked');
+            $this->add_table_row_tuple($t, $cell1content, $cell2content, [], $cell2attributes);
         }
 
         // Grading status.
-        $row = new html_table_row();
-        $cell1 = new html_table_cell(get_string('gradingstatus', 'assign'));
-
+        $cell1content = get_string('gradingstatus', 'assign');
         if ($status->gradingstatus == ASSIGN_GRADING_STATUS_GRADED ||
             $status->gradingstatus == ASSIGN_GRADING_STATUS_NOT_GRADED) {
-            $cell2 = new html_table_cell(get_string($status->gradingstatus, 'assign'));
+            $cell2content = get_string($status->gradingstatus, 'assign');
         } else {
             $gradingstatus = 'markingworkflowstate' . $status->gradingstatus;
-            $cell2 = new html_table_cell(get_string($gradingstatus, 'assign'));
+            $cell2content = get_string($gradingstatus, 'assign');
         }
         if ($status->gradingstatus == ASSIGN_GRADING_STATUS_GRADED ||
             $status->gradingstatus == ASSIGN_MARKING_WORKFLOW_STATE_RELEASED) {
-            $cell2->attributes = array('class' => 'submissiongraded');
+            $cell2attributes = array('class' => 'submissiongraded');
         } else {
-            $cell2->attributes = array('class' => 'submissionnotgraded');
+            $cell2attributes = array('class' => 'submissionnotgraded');
         }
-        $row->cells = array($cell1, $cell2);
-        $t->data[] = $row;
+        $this->add_table_row_tuple($t, $cell1content, $cell2content, [], $cell2attributes);
 
         $submission = $status->teamsubmission ? $status->teamsubmission : $status->submission;
         $duedate = $status->duedate;
         if ($duedate > 0) {
             // Due date.
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('duedate', 'assign'));
-            $cell2 = new html_table_cell(userdate($duedate));
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $cell1content = get_string('duedate', 'assign');
+            $cell2content = userdate($duedate);
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
             if ($status->view == assign_submission_status::GRADER_VIEW) {
                 if ($status->cutoffdate) {
                     // Cut off date.
-                    $row = new html_table_row();
-                    $cell1 = new html_table_cell(get_string('cutoffdate', 'assign'));
-                    $cell2 = new html_table_cell(userdate($status->cutoffdate));
-                    $row->cells = array($cell1, $cell2);
-                    $t->data[] = $row;
+                    $cell1content = get_string('cutoffdate', 'assign');
+                    $cell2content = userdate($status->cutoffdate);
+                    $this->add_table_row_tuple($t, $cell1content, $cell2content);
                 }
             }
 
             if ($status->extensionduedate) {
                 // Extension date.
-                $row = new html_table_row();
-                $cell1 = new html_table_cell(get_string('extensionduedate', 'assign'));
-                $cell2 = new html_table_cell(userdate($status->extensionduedate));
-                $row->cells = array($cell1, $cell2);
-                $t->data[] = $row;
+                $cell1content = get_string('extensionduedate', 'assign');
+                $cell2content = userdate($status->extensionduedate);
+                $this->add_table_row_tuple($t, $cell1content, $cell2content);
                 $duedate = $status->extensionduedate;
             }
 
             // Time remaining.
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('timeremaining', 'assign'));
+            $cell1content = get_string('timeremaining', 'assign');
+            $cell2attributes = [];
             if ($duedate - $time <= 0) {
                 if (!$submission ||
                         $submission->status != ASSIGN_SUBMISSION_STATUS_SUBMITTED) {
                     if ($status->submissionsenabled) {
-                        $overduestr = get_string('overdue', 'assign', format_time($time - $duedate));
-                        $cell2 = new html_table_cell($overduestr);
-                        $cell2->attributes = array('class'=>'overdue');
+                        $cell2content = get_string('overdue', 'assign', format_time($time - $duedate));
+                        $cell2attributes = array('class' => 'overdue');
                     } else {
-                        $cell2 = new html_table_cell(get_string('duedatereached', 'assign'));
+                        $cell2content = get_string('duedatereached', 'assign');
                     }
                 } else {
                     if ($submission->timemodified > $duedate) {
-                        $latestr = get_string('submittedlate',
+                        $cell2content = get_string('submittedlate',
                                               'assign',
                                               format_time($submission->timemodified - $duedate));
-                        $cell2 = new html_table_cell($latestr);
-                        $cell2->attributes = array('class'=>'latesubmission');
+                        $cell2attributes = array('class' => 'latesubmission');
                     } else {
-                        $earlystr = get_string('submittedearly',
+                        $cell2content = get_string('submittedearly',
                                                'assign',
                                                format_time($submission->timemodified - $duedate));
-                        $cell2 = new html_table_cell($earlystr);
-                        $cell2->attributes = array('class'=>'earlysubmission');
+                        $cell2attributes = array('class' => 'earlysubmission');
                     }
                 }
             } else {
-                $cell2 = new html_table_cell(format_time($duedate - $time));
+                $cell2content = format_time($duedate - $time);
             }
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $this->add_table_row_tuple($t, $cell1content, $cell2content, [], $cell2attributes);
         }
 
         // Show graders whether this submission is editable by students.
         if ($status->view == assign_submission_status::GRADER_VIEW) {
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('editingstatus', 'assign'));
+            $cell1content = get_string('editingstatus', 'assign');
             if ($status->canedit) {
-                $cell2 = new html_table_cell(get_string('submissioneditable', 'assign'));
-                $cell2->attributes = array('class'=>'submissioneditable');
+                $cell2content = get_string('submissioneditable', 'assign');
+                $cell2attributes = array('class' => 'submissioneditable');
             } else {
-                $cell2 = new html_table_cell(get_string('submissionnoteditable', 'assign'));
-                $cell2->attributes = array('class'=>'submissionnoteditable');
+                $cell2content = get_string('submissionnoteditable', 'assign');
+                $cell2attributes = array('class' => 'submissionnoteditable');
             }
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $this->add_table_row_tuple($t, $cell1content, $cell2content, [], $cell2attributes);
         }
 
         // Grading criteria preview.
         if (!empty($status->gradingcontrollerpreview)) {
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('gradingmethodpreview', 'assign'));
-            $cell2 = new html_table_cell($status->gradingcontrollerpreview);
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $cell1content = get_string('gradingmethodpreview', 'assign');
+            $cell2content = $status->gradingcontrollerpreview;
+            $this->add_table_row_tuple($t, $cell1content, $cell2content, [], $cell2attributes);
         }
 
         // Last modified.
         if ($submission) {
-            $row = new html_table_row();
-            $cell1 = new html_table_cell(get_string('timemodified', 'assign'));
+            $cell1content = get_string('timemodified', 'assign');
 
             if ($submission->status != ASSIGN_SUBMISSION_STATUS_NEW) {
-                $cell2 = new html_table_cell(userdate($submission->timemodified));
+                $cell2content = userdate($submission->timemodified);
             } else {
-                $cell2 = new html_table_cell('-');
+                $cell2content = "-";
             }
 
-            $row->cells = array($cell1, $cell2);
-            $t->data[] = $row;
+            $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
             if (!$status->teamsubmission || $status->submissiongroup != false || !$status->preventsubmissionnotingroup) {
                 foreach ($status->submissionplugins as $plugin) {
@@ -904,8 +875,7 @@ public function render_assign_submission_status(assign_submission_status $status
                         $pluginshowsummary
                     ) {
 
-                        $row = new html_table_row();
-                        $cell1 = new html_table_cell($plugin->get_name());
+                        $cell1content = $plugin->get_name();
                         $displaymode = assign_submission_plugin_submission::SUMMARY;
                         $pluginsubmission = new assign_submission_plugin_submission($plugin,
                             $submission,
@@ -913,9 +883,8 @@ public function render_assign_submission_status(assign_submission_status $status
                             $status->coursemoduleid,
                             $status->returnaction,
                             $status->returnparams);
-                        $cell2 = new html_table_cell($this->render($pluginsubmission));
-                        $row->cells = array($cell1, $cell2);
-                        $t->data[] = $row;
+                        $cell2content = $this->render($pluginsubmission);
+                        $this->add_table_row_tuple($t, $cell1content, $cell2content);
                     }
                 }
             }
@@ -1011,11 +980,6 @@ public function render_assign_attempt_history_chooser(assign_attempt_history_cho
     public function render_assign_attempt_history(assign_attempt_history $history) {
         $o = '';
 
-        $submittedstr = get_string('submitted', 'assign');
-        $gradestr = get_string('grade');
-        $gradedonstr = get_string('gradedon', 'assign');
-        $gradedbystr = get_string('gradedby', 'assign');
-
         // Don't show the last one because it is the current submission.
         array_pop($history->submissions);
 
@@ -1041,8 +1005,6 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
                 }
             }
 
-            $editbtn = '';
-
             if ($submission) {
                 $submissionsummary = userdate($submission->timemodified);
             } else {
@@ -1056,9 +1018,9 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
             $t = new html_table();
 
             if ($submission) {
-                $cell1 = new html_table_cell(get_string('submissionstatus', 'assign'));
-                $cell2 = new html_table_cell(get_string('submissionstatus_' . $submission->status, 'assign'));
-                $t->data[] = new html_table_row(array($cell1, $cell2));
+                $cell1content = get_string('submissionstatus', 'assign');
+                $cell2content = get_string('submissionstatus_' . $submission->status, 'assign');
+                $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
                 foreach ($history->submissionplugins as $plugin) {
                     $pluginshowsummary = !$plugin->is_empty($submission) || !$plugin->allow_submissions();
@@ -1067,16 +1029,15 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
                             $plugin->has_user_summary() &&
                             $pluginshowsummary) {
 
-                        $cell1 = new html_table_cell($plugin->get_name());
+                        $cell1content = $plugin->get_name();
                         $pluginsubmission = new assign_submission_plugin_submission($plugin,
                                                                                     $submission,
                                                                                     assign_submission_plugin_submission::SUMMARY,
                                                                                     $history->coursemoduleid,
                                                                                     $history->returnaction,
                                                                                     $history->returnparams);
-                        $cell2 = new html_table_cell($this->render($pluginsubmission));
-
-                        $t->data[] = new html_table_row(array($cell1, $cell2));
+                        $cell2content = $this->render($pluginsubmission);
+                        $this->add_table_row_tuple($t, $cell1content, $cell2content);
                     }
                 }
             }
@@ -1107,21 +1068,21 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
                 $t->data[] = new html_table_row(array($cell));
 
                 // Grade.
-                $cell1 = new html_table_cell($gradestr);
-                $cell2 = $grade->gradefordisplay;
-                $t->data[] = new html_table_row(array($cell1, $cell2));
+                $cell1content = get_string('grade');
+                $cell2content = $grade->gradefordisplay;
+                $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
                 // Graded on.
-                $cell1 = new html_table_cell($gradedonstr);
-                $cell2 = new html_table_cell(userdate($grade->timemodified));
-                $t->data[] = new html_table_row(array($cell1, $cell2));
+                $cell1content = get_string('gradedon', 'assign');
+                $cell2content = userdate($grade->timemodified);
+                $this->add_table_row_tuple($t, $cell1content, $cell2content);
 
                 // Graded by set to a real user. Not set can be empty or -1.
                 if (!empty($grade->grader) && is_object($grade->grader)) {
-                    $cell1 = new html_table_cell($gradedbystr);
-                    $cell2 = new html_table_cell($this->output->user_picture($grade->grader) .
-                                                 $this->output->spacer(array('width' => 30)) . fullname($grade->grader));
-                    $t->data[] = new html_table_row(array($cell1, $cell2));
+                    $cell1content = get_string('gradedby', 'assign');
+                    $cell2content = $this->output->user_picture($grade->grader) .
+                                    $this->output->spacer(array('width' => 30)) . fullname($grade->grader);
+                    $this->add_table_row_tuple($t, $cell1content, $cell2content);
                 }
 
                 // Feedback from plugins.
@@ -1131,13 +1092,14 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
                         $plugin->has_user_summary() &&
                         !$plugin->is_empty($grade)) {
 
-                        $cell1 = new html_table_cell($plugin->get_name());
                         $pluginfeedback = new assign_feedback_plugin_feedback(
                             $plugin, $grade, assign_feedback_plugin_feedback::SUMMARY, $history->coursemoduleid,
                             $history->returnaction, $history->returnparams
                         );
-                        $cell2 = new html_table_cell($this->render($pluginfeedback));
-                        $t->data[] = new html_table_row(array($cell1, $cell2));
+
+                        $cell1content = $plugin->get_name();
+                        $cell2content = $this->render($pluginfeedback);
+                        $this->add_table_row_tuple($t, $cell1content, $cell2content);
                     }
 
                 }
@@ -1147,7 +1109,6 @@ public function render_assign_attempt_history(assign_attempt_history $history) {
             $o .= html_writer::table($t);
         }
         $o .= $this->box_end();
-        $jsparams = array($containerid);
 
         $this->page->requires->yui_module('moodle-mod_assign-history', 'Y.one("#' . $containerid . '").history');
 
@@ -1182,8 +1143,14 @@ public function render_assign_submission_plugin_submission(assign_submission_plu
                 $icon = $this->output->pix_icon('t/preview', $previewstr);
 
                 $expandstr = get_string('viewfull', 'assign');
-                $options = array('class'=>'expandsummaryicon expand_' . $classsuffix);
-                $o .= $this->output->pix_icon('t/switch_plus', $expandstr, null, $options);
+                $expandicon = $this->output->pix_icon('t/switch_plus', $expandstr);
+                $options = array(
+                    'class' => 'expandsummaryicon expand_' . $classsuffix,
+                    'aria-label' => $expandstr,
+                    'role' => 'button',
+                    'aria-expanded' => 'false'
+                );
+                $o .= html_writer::link('', $expandicon, $options);
 
                 $jsparams = array($submissionplugin->plugin->get_subtype(),
                                   $submissionplugin->plugin->get_type(),
@@ -1211,11 +1178,16 @@ public function render_assign_submission_plugin_submission(assign_submission_plu
             $o .= $this->output->box_end();
             if ($showviewlink) {
                 $o .= $this->output->box_start('boxaligncenter hidefull full_' . $classsuffix);
-                $classes = 'expandsummaryicon contract_' . $classsuffix;
-                $o .= $this->output->pix_icon('t/switch_minus',
-                                              get_string('viewsummary', 'assign'),
-                                              null,
-                                              array('class'=>$classes));
+                $collapsestr = get_string('viewsummary', 'assign');
+                $options = array(
+                    'class' => 'expandsummaryicon contract_' . $classsuffix,
+                    'aria-label' => $collapsestr,
+                    'role' => 'button',
+                    'aria-expanded' => 'true'
+                );
+                $collapseicon = $this->output->pix_icon('t/switch_minus', $collapsestr);
+                $o .= html_writer::link('', $collapseicon, $options);
+
                 $o .= $submissionplugin->plugin->view($submissionplugin->submission);
                 $o .= $this->output->box_end();
             }
@@ -1288,8 +1260,14 @@ public function render_assign_feedback_plugin_feedback(assign_feedback_plugin_fe
                 $icon = $this->output->pix_icon('t/preview', $previewstr);
 
                 $expandstr = get_string('viewfull', 'assign');
-                $options = array('class'=>'expandsummaryicon expand_' . $classsuffix);
-                $o .= $this->output->pix_icon('t/switch_plus', $expandstr, null, $options);
+                $expandicon = $this->output->pix_icon('t/switch_plus', $expandstr);
+                $options = array(
+                    'class' => 'expandsummaryicon expand_' . $classsuffix,
+                    'aria-label' => $expandstr,
+                    'role' => 'button',
+                    'aria-expanded' => 'false'
+                );
+                $o .= html_writer::link('', $expandicon, $options);
 
                 $jsparams = array($feedbackplugin->plugin->get_subtype(),
                                   $feedbackplugin->plugin->get_type(),
@@ -1314,11 +1292,16 @@ public function render_assign_feedback_plugin_feedback(assign_feedback_plugin_fe
             $o .= $this->output->box_end();
             if ($showviewlink) {
                 $o .= $this->output->box_start('boxaligncenter hidefull full_' . $classsuffix);
-                $classes = 'expandsummaryicon contract_' . $classsuffix;
-                $o .= $this->output->pix_icon('t/switch_minus',
-                                              get_string('viewsummary', 'assign'),
-                                              null,
-                                              array('class'=>$classes));
+                $collapsestr = get_string('viewsummary', 'assign');
+                $options = array(
+                    'class' => 'expandsummaryicon contract_' . $classsuffix,
+                    'aria-label' => $collapsestr,
+                    'role' => 'button',
+                    'aria-expanded' => 'true'
+                );
+                $collapseicon = $this->output->pix_icon('t/switch_minus', $collapsestr);
+                $o .= html_writer::link('', $collapseicon, $options);
+
                 $o .= $feedbackplugin->plugin->view($feedbackplugin->grade);
                 $o .= $this->output->box_end();
             }
diff --git a/mod/assign/styles.css b/mod/assign/styles.css
index 4b6aba9040477..6768241c298d7 100644
--- a/mod/assign/styles.css
+++ b/mod/assign/styles.css
@@ -187,12 +187,15 @@
 }
 
 .path-mod-assign .expandsummaryicon {
-    cursor: pointer;
     display: none;
 }
 
+.path-mod-assign .expandsummaryicon i {
+    pointer-events: none;
+}
+
 .path-mod-assign.jsenabled .expandsummaryicon {
-    display: inline;
+    display: inline-block;
 }
 
 .path-mod-assign .hidefull {
@@ -1160,6 +1163,7 @@
         width: auto;
         display: inline-block;
         margin: 0 auto;
+        height: auto;
     }
 
     .path-mod-assign [data-region="user-selector"] .alignment {
diff --git a/mod/assign/submission/comments/db/upgrade.php b/mod/assign/submission/comments/db/upgrade.php
index 3c41dfe59f321..c134833cdc8f9 100644
--- a/mod/assign/submission/comments/db/upgrade.php
+++ b/mod/assign/submission/comments/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignsubmission_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/comments/lang/en/assignsubmission_comments.php b/mod/assign/submission/comments/lang/en/assignsubmission_comments.php
index 78da642ecbcf0..f8b887cde7427 100644
--- a/mod/assign/submission/comments/lang/en/assignsubmission_comments.php
+++ b/mod/assign/submission/comments/lang/en/assignsubmission_comments.php
@@ -28,6 +28,5 @@
 $string['default'] = 'Enabled by default';
 $string['default_help'] = 'If set, this submission method will be enabled by default for all new assignments.';
 $string['enabled'] = 'Submission comments';
-$string['enabled_help'] = 'If enabled, students can leave comments on their own submission. This can be used to let students alert the marker about which files the master file is in cases of inter-linked files, for instance.
-';
+$string['enabled_help'] = 'If enabled, students can leave comments on their own submission. For example, this can be used for students to specify which is the master file when submitting inter-linked files.';
 $string['pluginname'] = 'Submission comments';
diff --git a/mod/assign/submission/file/db/upgrade.php b/mod/assign/submission/file/db/upgrade.php
index 2f6c544ab256e..ec51258080467 100644
--- a/mod/assign/submission/file/db/upgrade.php
+++ b/mod/assign/submission/file/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignsubmission_file_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/file/locallib.php b/mod/assign/submission/file/locallib.php
index a4153dd95f6be..7ad838afd3cae 100644
--- a/mod/assign/submission/file/locallib.php
+++ b/mod/assign/submission/file/locallib.php
@@ -314,12 +314,18 @@ public function save(stdClass $submission, stdClass $data) {
      * @return boolean
      */
     public function remove(stdClass $submission) {
+        global $DB;
         $fs = get_file_storage();
 
         $fs->delete_area_files($this->assignment->get_context()->id,
                                'assignsubmission_file',
                                ASSIGNSUBMISSION_FILE_FILEAREA,
                                $submission->id);
+
+        $currentsubmission = $this->get_file_submission($submission->id);
+        $currentsubmission->numfiles = 0;
+        $DB->update_record('assignsubmission_file', $currentsubmission);
+
         return true;
     }
 
diff --git a/mod/assign/submission/onlinetext/db/upgrade.php b/mod/assign/submission/onlinetext/db/upgrade.php
index 2b04adaee19bd..8c45377c0c9bb 100644
--- a/mod/assign/submission/onlinetext/db/upgrade.php
+++ b/mod/assign/submission/onlinetext/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignsubmission_onlinetext_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/onlinetext/locallib.php b/mod/assign/submission/onlinetext/locallib.php
index 3013327977f59..3cbb382a6ee69 100644
--- a/mod/assign/submission/onlinetext/locallib.php
+++ b/mod/assign/submission/onlinetext/locallib.php
@@ -599,12 +599,17 @@ public function delete_instance() {
     public function is_empty(stdClass $submission) {
         $onlinetextsubmission = $this->get_onlinetext_submission($submission->id);
         $wordcount = 0;
+        $hasinsertedresources = false;
 
         if (isset($onlinetextsubmission->onlinetext)) {
             $wordcount = count_words(trim($onlinetextsubmission->onlinetext));
+            // Check if the online text submission contains video, audio or image elements
+            // that can be ignored and stripped by count_words().
+            $hasinsertedresources = preg_match('/<\s*((video|audio)[^>]*>(.*?)<\s*\/\s*(video|audio)>)|(img[^>]*>(.*?))/',
+                    trim($onlinetextsubmission->onlinetext));
         }
 
-        return $wordcount == 0;
+        return $wordcount == 0 && !$hasinsertedresources;
     }
 
     /**
@@ -621,12 +626,17 @@ public function submission_is_empty(stdClass $data) {
             return true;
         }
         $wordcount = 0;
+        $hasinsertedresources = false;
 
         if (isset($data->onlinetext_editor['text'])) {
             $wordcount = count_words(trim((string)$data->onlinetext_editor['text']));
+            // Check if the online text submission contains video, audio or image elements
+            // that can be ignored and stripped by count_words().
+            $hasinsertedresources = preg_match('/<\s*((video|audio)[^>]*>(.*?)<\s*\/\s*(video|audio)>)|(img[^>]*>(.*?))/',
+                    trim((string)$data->onlinetext_editor['text']));
         }
 
-        return $wordcount == 0;
+        return $wordcount == 0 && !$hasinsertedresources;
     }
 
     /**
diff --git a/mod/assign/submission/onlinetext/tests/locallib_test.php b/mod/assign/submission/onlinetext/tests/locallib_test.php
index 2448c39318a4c..19af03217a828 100644
--- a/mod/assign/submission/onlinetext/tests/locallib_test.php
+++ b/mod/assign/submission/onlinetext/tests/locallib_test.php
@@ -103,7 +103,10 @@ public function submission_is_empty_testcases() {
             'Empty submission null' => [null, true],
             'Value 0' => [0, false],
             'String 0' => ['0', false],
-            'Text' => ['Ai! laurië lantar lassi súrinen, yéni únótimë ve rámar aldaron!', false]
+            'Text' => ['Ai! laurië lantar lassi súrinen, yéni únótimë ve rámar aldaron!', false],
+            'Image' => ['<img src="test.jpg" />', false],
+            'Video' => ['<video controls="true"><source src="test.mp4"></video>', false],
+            'Audio' => ['<audio controls="true"><source src="test.mp3"></audio>', false],
         ];
     }
 }
diff --git a/mod/assign/templates/grading_app.mustache b/mod/assign/templates/grading_app.mustache
index 60d2ec26a8d6e..f1889cd47f166 100644
--- a/mod/assign/templates/grading_app.mustache
+++ b/mod/assign/templates/grading_app.mustache
@@ -57,6 +57,7 @@
 </div>
 <div data-region="grade-actions-panel">
 <div data-region="grade-actions">
+<div class="tool_usertours-resettourcontainer float-left"></div>
 {{> mod_assign/grading_actions }}
 </div>
 </div>
diff --git a/mod/assign/tests/behat/assign_group_override.feature b/mod/assign/tests/behat/assign_group_override.feature
index 29bb1d6ac9332..d20442f1bc2c5 100644
--- a/mod/assign/tests/behat/assign_group_override.feature
+++ b/mod/assign/tests/behat/assign_group_override.feature
@@ -29,18 +29,13 @@ Feature: Assign group override
       | student1 | G1 |
       | student2 | G2 |
       | student3 | G1 |
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Assignment" to section "1" and I fill the form with:
-      | Assignment name | Test assignment name |
-      | Description | Submit your online text |
-      | assignsubmission_onlinetext_enabled | 1 |
-      | assignsubmission_onlinetext_wordlimit_enabled | 1 |
-      | assignsubmission_onlinetext_wordlimit | 10 |
-      | assignsubmission_file_enabled | 0 |
-      | gradingduedate[enabled]       | 0 |
+    And the following "activities" exist:
+      | activity | name                 | intro                   | course | idnumber | assignsubmission_onlinetext_enabled |
+      | assign   | Test assignment name | Submit your online text | C1     | assign1  | 1                                   |
 
   Scenario: Add, modify then delete a group override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Group overrides" in current page administration
     And I press "Add group override"
@@ -64,6 +59,8 @@ Feature: Assign group override
     And I should not see "Group 1"
 
   Scenario: Duplicate a user override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Group overrides" in current page administration
     And I press "Add group override"
@@ -86,6 +83,8 @@ Feature: Assign group override
     And I should see "Group 2"
 
   Scenario: Allow a group to have a different due date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -122,6 +121,8 @@ Feature: Assign group override
     And I should see "Wednesday, 1 January 2020, 8:00"
 
   Scenario: Allow a group to have a different cut off date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -141,23 +142,25 @@ Feature: Assign group override
       | id_cutoffdate_enabled | 1 |
       | cutoffdate[day]       | 1 |
       | cutoffdate[month]     | January |
-      | cutoffdate[year]      | 2020 |
+      | cutoffdate[year]      | 2030 |
       | cutoffdate[hour]      | 08 |
       | cutoffdate[minute]    | 00 |
     And I press "Save"
-    And I should see "Wednesday, 1 January 2020, 8:00"
+    And I should see "Tuesday, 1 January 2030, 8:00"
     And I log out
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    Then I should not see "You have not made a submission yet"
+    Then I should not see "You have not made a submission yet."
     And I log out
     And I log in as "student1"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should see "You have not made a submission yet"
+    And I should see "You have not made a submission yet."
 
   Scenario: Allow a group to have a different start date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -166,7 +169,7 @@ Feature: Assign group override
       | id_cutoffdate_enabled | 0 |
       | allowsubmissionsfromdate[day]       | 1 |
       | allowsubmissionsfromdate[month]     | January |
-      | allowsubmissionsfromdate[year]      | 2020 |
+      | allowsubmissionsfromdate[year]      | 2030 |
       | allowsubmissionsfromdate[hour]      | 08 |
       | allowsubmissionsfromdate[minute]    | 00 |
     And I press "Save and display"
@@ -186,16 +189,18 @@ Feature: Assign group override
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    Then I should see "This assignment will accept submissions from Wednesday, 1 January 2020, 8:00"
+    Then I should see "This assignment will accept submissions from Tuesday, 1 January 2030, 8:00"
     And I should not see "Add submission"
     And I log out
     And I log in as "student1"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should not see "This assignment will accept submissions from Wednesday, 1 January 2020, 8:00"
+    And I should not see "This assignment will accept submissions from Tuesday, 1 January 2030, 8:00"
 
   @javascript
   Scenario: Add both a user and group override and verify that both are applied correctly
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -204,7 +209,7 @@ Feature: Assign group override
       | id_cutoffdate_enabled | 0 |
       | allowsubmissionsfromdate[day]       | 1 |
       | allowsubmissionsfromdate[month]     | January |
-      | allowsubmissionsfromdate[year]      | 2030 |
+      | allowsubmissionsfromdate[year]      | 2040 |
       | allowsubmissionsfromdate[hour]      | 08 |
       | allowsubmissionsfromdate[minute]    | 00 |
     And I press "Save and display"
@@ -215,11 +220,11 @@ Feature: Assign group override
       | id_allowsubmissionsfromdate_enabled | 1 |
       | allowsubmissionsfromdate[day]       | 1 |
       | allowsubmissionsfromdate[month]     | January |
-      | allowsubmissionsfromdate[year]      | 2020 |
+      | allowsubmissionsfromdate[year]      | 2030 |
       | allowsubmissionsfromdate[hour]      | 08 |
       | allowsubmissionsfromdate[minute]    | 00 |
     And I press "Save"
-    And I should see "Wednesday, 1 January 2020, 8:00"
+    And I should see "Tuesday, 1 January 2030, 8:00"
     And I follow "Test assignment name"
     And I navigate to "User overrides" in current page administration
     And I press "Add user override"
@@ -228,23 +233,98 @@ Feature: Assign group override
       | id_allowsubmissionsfromdate_enabled | 1 |
       | allowsubmissionsfromdate[day]       | 1 |
       | allowsubmissionsfromdate[month]     | January |
-      | allowsubmissionsfromdate[year]      | 2021 |
+      | allowsubmissionsfromdate[year]      | 2031 |
       | allowsubmissionsfromdate[hour]      | 08 |
       | allowsubmissionsfromdate[minute]    | 00 |
     And I press "Save"
-    And I should see "Friday, 1 January 2021, 8:00"
+    And I should see "Wednesday, 1 January 2031, 8:00"
     And I log out
     Then I log in as "student1"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should see "This assignment will accept submissions from Friday, 1 January 2021, 8:00"
+    And I should see "This assignment will accept submissions from Wednesday, 1 January 2031, 8:00"
     And I log out
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should see "This assignment will accept submissions from Tuesday, 1 January 2030, 8:00"
+    And I should see "This assignment will accept submissions from Sunday, 1 January 2040, 8:00"
     And I log out
     And I log in as "student3"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should see "This assignment will accept submissions from Wednesday, 1 January 2020, 8:00"
+    And I should see "This assignment will accept submissions from Tuesday, 1 January 2030, 8:00"
+
+  Scenario: Override a group when teacher is in no group, and does not have accessallgroups permission, and the activity's group mode is "separate groups"
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name         | intro                    | course | idnumber | groupmode |
+      | assign   | Assignment 2 | Assignment 2 description | C1     | assign2  | 1         |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "Group overrides" in current page administration
+    Then I should see "No groups you can access."
+    And the "Add group override" "button" should be disabled
+
+  Scenario: A teacher without accessallgroups permission should only be able to add group override for groups that he/she is a member of,
+        when the activity's group mode is "separate groups"
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name         | intro                    | course | idnumber | groupmode |
+      | assign   | Assignment 2 | Assignment 2 description | C1     | assign2  | 1         |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "Group overrides" in current page administration
+    And I press "Add group override"
+    Then the "Override group" select box should contain "Group 1"
+    And the "Override group" select box should not contain "Group 2"
+
+  Scenario: A teacher without accessallgroups permission should only be able to see the group overrides for groups that he/she is a member of,
+        when the activity's group mode is "separate groups"
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name         | intro                    | course | idnumber | groupmode |
+      | assign   | Assignment 2 | Assignment 2 description | C1     | assign2  | 1         |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+    And I log in as "admin"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "Group overrides" in current page administration
+    And I press "Add group override"
+    And I set the following fields to these values:
+      | Override group                      | Group 1 |
+      | id_allowsubmissionsfromdate_enabled | 1       |
+      | allowsubmissionsfromdate[day]       | 1       |
+      | allowsubmissionsfromdate[month]     | January |
+      | allowsubmissionsfromdate[year]      | 2020    |
+      | allowsubmissionsfromdate[hour]      | 08      |
+      | allowsubmissionsfromdate[minute]    | 00      |
+    And I press "Save and enter another override"
+    And I set the following fields to these values:
+      | Override group                      | Group 2 |
+      | id_allowsubmissionsfromdate_enabled | 1       |
+      | allowsubmissionsfromdate[day]       | 1       |
+      | allowsubmissionsfromdate[month]     | January |
+      | allowsubmissionsfromdate[year]      | 2020    |
+      | allowsubmissionsfromdate[hour]      | 08      |
+      | allowsubmissionsfromdate[minute]    | 00      |
+    And I press "Save"
+    And I log out
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "Group overrides" in current page administration
+    Then I should see "Group 1" in the ".generaltable" "css_element"
+    And I should not see "Group 2" in the ".generaltable" "css_element"
diff --git a/mod/assign/tests/behat/assign_user_override.feature b/mod/assign/tests/behat/assign_user_override.feature
index 9e2bd88661371..ef542ce7e8d2a 100644
--- a/mod/assign/tests/behat/assign_user_override.feature
+++ b/mod/assign/tests/behat/assign_user_override.feature
@@ -1,4 +1,4 @@
-@mod @mod_assign @javascript
+@mod @mod_assign
 Feature: Assign user override
   In order to grant a student special access to an assignment
   As a teacher
@@ -18,18 +18,14 @@ Feature: Assign user override
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
       | student2 | C1 | student |
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Assignment" to section "1" and I fill the form with:
-      | Assignment name | Test assignment name |
-      | Description | Submit your online text |
-      | assignsubmission_onlinetext_enabled | 1 |
-      | assignsubmission_onlinetext_wordlimit_enabled | 1 |
-      | assignsubmission_onlinetext_wordlimit | 10 |
-      | assignsubmission_file_enabled | 0 |
-      | gradingduedate[enabled]       | 0 |
+    And the following "activities" exist:
+      | activity | name                 | intro                   | course | idnumber | assignsubmission_onlinetext_enabled |
+      | assign   | Test assignment name | Submit your online text | C1     | assign1  | 1                                   |
 
+  @javascript
   Scenario: Add, modify then delete a user override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "User overrides" in current page administration
     And I press "Add user override"
@@ -52,7 +48,10 @@ Feature: Assign user override
     And I press "Continue"
     And I should not see "Sam1 Student1"
 
+  @javascript
   Scenario: Duplicate a user override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "User overrides" in current page administration
     And I press "Add user override"
@@ -74,7 +73,10 @@ Feature: Assign user override
     And I should see "Tuesday, 1 January 2030, 8:00"
     And I should see "Sam2 Student2"
 
+  @javascript
   Scenario: Allow a user to have a different due date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -110,7 +112,10 @@ Feature: Assign user override
     And I follow "Test assignment name"
     And I should see "Wednesday, 1 January 2020, 8:00"
 
+  @javascript
   Scenario: Allow a user to have a different cut off date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -130,23 +135,26 @@ Feature: Assign user override
       | id_cutoffdate_enabled | 1 |
       | cutoffdate[day]       | 1 |
       | cutoffdate[month]     | January |
-      | cutoffdate[year]      | 2020 |
+      | cutoffdate[year]      | 2030 |
       | cutoffdate[hour]      | 08 |
       | cutoffdate[minute]    | 00 |
     And I press "Save"
-    And I should see "Wednesday, 1 January 2020, 8:00"
+    And I should see "Tuesday, 1 January 2030, 8:00"
     And I log out
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    Then I should not see "You have not made a submission yet"
+    Then I should not see "You have not made a submission yet."
     And I log out
     And I log in as "student1"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should see "You have not made a submission yet"
+    And I should see "You have not made a submission yet."
 
+  @javascript
   Scenario: Allow a user to have a different start date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test assignment name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -155,7 +163,7 @@ Feature: Assign user override
       | id_cutoffdate_enabled | 0 |
       | allowsubmissionsfromdate[day]       | 1 |
       | allowsubmissionsfromdate[month]     | January |
-      | allowsubmissionsfromdate[year]      | 2020 |
+      | allowsubmissionsfromdate[year]      | 2030 |
       | allowsubmissionsfromdate[hour]      | 08 |
       | allowsubmissionsfromdate[minute]    | 00 |
     And I press "Save and display"
@@ -175,9 +183,97 @@ Feature: Assign user override
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    Then I should see "This assignment will accept submissions from Wednesday, 1 January 2020, 8:00"
+    Then I should see "This assignment will accept submissions from Tuesday, 1 January 2030, 8:00"
     And I log out
     And I log in as "student1"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should not see "This assignment will accept submissions from Wednesday, 1 January 2020, 8:00"
+    And I should not see "This assignment will accept submissions from Tuesday, 1 January 2030, 8:00"
+
+  Scenario: Override a user when teacher is in no group, and does not have accessallgroups permission, and the activity's group mode is "separate groups"
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name         | intro                    | course | idnumber | groupmode |
+      | assign   | Assignment 2 | Assignment 2 description | C1     | assign2  | 1         |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "User overrides" in current page administration
+    Then I should see "No groups you can access."
+    And the "Add user override" "button" should be disabled
+
+  Scenario: A teacher without accessallgroups permission should only be able to add user override for users that he/she shares groups with,
+        when the activity's group mode is "separate groups"
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name         | intro                    | course | idnumber | groupmode |
+      | assign   | Assignment 2 | Assignment 2 description | C1     | assign2  | 1         |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+      | student1 | G1    |
+      | student2 | G2    |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "User overrides" in current page administration
+    And I press "Add user override"
+    Then the "Override user" select box should contain "Sam1 Student1, student1@example.com"
+    And the "Override user" select box should not contain "Sam2 Student2, student2@example.com"
+
+  @javascript
+  Scenario: A teacher without accessallgroups permission should only be able to see the user override for users that he/she shares groups with,
+        when the activity's group mode is "separate groups"
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name         | intro                    | course | idnumber | groupmode |
+      | assign   | Assignment 2 | Assignment 2 description | C1     | assign2  | 1         |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+      | student1 | G1    |
+      | student2 | G2    |
+    And I log in as "admin"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "User overrides" in current page administration
+    And I press "Add user override"
+    And I set the following fields to these values:
+      | Override user                       | Student1 |
+      | id_allowsubmissionsfromdate_enabled | 1       |
+      | allowsubmissionsfromdate[day]       | 1       |
+      | allowsubmissionsfromdate[month]     | January |
+      | allowsubmissionsfromdate[year]      | 2015    |
+      | allowsubmissionsfromdate[hour]      | 08      |
+      | allowsubmissionsfromdate[minute]    | 00      |
+    And I press "Save and enter another override"
+    And I set the following fields to these values:
+      | Override user                       | Student2 |
+      | id_allowsubmissionsfromdate_enabled | 1        |
+      | allowsubmissionsfromdate[day]       | 1        |
+      | allowsubmissionsfromdate[month]     | January  |
+      | allowsubmissionsfromdate[year]      | 2015     |
+      | allowsubmissionsfromdate[hour]      | 08       |
+      | allowsubmissionsfromdate[minute]    | 00       |
+    And I press "Save"
+    And I log out
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Assignment 2"
+    And I navigate to "User overrides" in current page administration
+    Then I should see "Student1" in the ".generaltable" "css_element"
+    And I should not see "Student2" in the ".generaltable" "css_element"
diff --git a/mod/assign/tests/behat/bulk_remove_submissions.feature b/mod/assign/tests/behat/bulk_remove_submissions.feature
new file mode 100644
index 0000000000000..8994e295741db
--- /dev/null
+++ b/mod/assign/tests/behat/bulk_remove_submissions.feature
@@ -0,0 +1,207 @@
+@mod @mod_assign
+Feature: Bulk remove submissions
+  In order to reset the assignment submission of multiple students
+  As a teacher with the capability to edit submissions
+  I need to be able to remove student submissions by bulk
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | category | groupmode |
+      | Course 1 | C1 | 0 | 0 |
+    And the following "users" exist:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
+      | student1 | Student | 1 | student1@example.com |
+      | student2 | Student | 2 | student2@example.com |
+    And the following "course enrolments" exist:
+      | user | course | role |
+      | teacher1 | C1 | editingteacher |
+      | student1 | C1 | student |
+      | student2 | C1 | student |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+
+  @javascript
+  Scenario: Bulk remove submissions should remove the data that was submitted
+    Given I log in as "admin"
+    And I set the following system permissions of "Teacher" role:
+      | capability                     | permission |
+      | mod/assign:editothersubmission | Allow      |
+    And I log out
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "Assignment" to section "1" and I fill the form with:
+      | Assignment name | Test assignment name |
+      | Description | Submit your online text |
+      | assignsubmission_onlinetext_enabled | 1 |
+      | assignsubmission_file_enabled | 0 |
+    And I log out
+    And I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student1 submission |
+    And I press "Save changes"
+    And I log out
+    And I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student2 submission |
+    And I press "Save changes"
+    And I log out
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I navigate to "View all submissions" in current page administration
+    And I should see "I'm the student1 submission"
+    And I should see "I'm the student2 submission"
+    And I set the field "selectall" to "1"
+    When I set the field "operation" to "Remove submission"
+    And I click on "Go" "button" confirming the dialogue
+    Then I should not see "I'm the student1 submission"
+    And I should not see "I'm the student2 submission"
+    And I log out
+    And I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I should not see "I'm the student1 submission"
+    And I log out
+    And I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I should not see "I'm the student2 submission1"
+
+  @javascript
+  Scenario: Bulk remove submissions should be unavailable if the user is missing the editing submission capability
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "Assignment" to section "1" and I fill the form with:
+      | Assignment name | Test assignment name |
+      | Description | Submit your online text |
+      | assignsubmission_onlinetext_enabled | 1 |
+      | assignsubmission_file_enabled | 0 |
+    And I log out
+    And I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student1 submission |
+    And I press "Save changes"
+    And I log out
+    And I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student2 submission |
+    And I press "Save changes"
+    And I log out
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I navigate to "View all submissions" in current page administration
+    And I should see "I'm the student1 submission"
+    And I should see "I'm the student2 submission"
+    And I set the field "selectall" to "1"
+    Then I should not see "Remove submission" in the "Choose operation" "select"
+
+  @javascript
+  Scenario: Notification should be displayed when non-group users are selected for submission bulk removal
+            in separate group mode
+    Given I log in as "admin"
+    And I set the following system permissions of "Teacher" role:
+      | capability                     | permission |
+      | mod/assign:editothersubmission | Allow      |
+    And I log out
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "Assignment" to section "1" and I fill the form with:
+      | Assignment name | Test assignment name |
+      | Description | Submit your online text |
+      | assignsubmission_onlinetext_enabled | 1 |
+      | assignsubmission_file_enabled | 0 |
+      | groupmode | 1 |
+    And I log out
+    And I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student1 submission |
+    And I press "Save changes"
+    And I log out
+    And I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student2 submission |
+    And I press "Save changes"
+    And I log out
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I navigate to "View all submissions" in current page administration
+    And I should see "I'm the student1 submission"
+    And I should see "I'm the student2 submission"
+    And I set the field "selectall" to "1"
+    When I set the field "operation" to "Remove submission"
+    And I click on "Go" "button" confirming the dialogue
+    Then I should see "I'm the student1 submission"
+    And I should see "I'm the student2 submission"
+    And I should see "The submission of Student 1 cannot be removed"
+    And I should see "The submission of Student 2 cannot be removed"
+
+  @javascript
+  Scenario: Bulk remove submission when group users are added to the bulk
+            removing submissions process in separate group mode
+    Given the following "group members" exist:
+      | user     | group   |
+      | student1 | G1 |
+      | student2 | G1 |
+    And I log in as "admin"
+    And I set the following system permissions of "Teacher" role:
+      | capability                     | permission |
+      | mod/assign:editothersubmission | Allow      |
+    And I log out
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "Assignment" to section "1" and I fill the form with:
+      | Assignment name | Test assignment name |
+      | Description | Submit your online text |
+      | assignsubmission_onlinetext_enabled | 1 |
+      | assignsubmission_file_enabled | 0 |
+      | groupmode | 1 |
+    And I log out
+    And I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student1 submission |
+    And I press "Save changes"
+    And I log out
+    And I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I press "Add submission"
+    And I set the following fields to these values:
+      | Online text | I'm the student2 submission |
+    And I press "Save changes"
+    And I log out
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Test assignment name"
+    And I navigate to "View all submissions" in current page administration
+    And I should see "I'm the student1 submission"
+    And I should see "I'm the student2 submission"
+    And I set the field "selectall" to "1"
+    When I set the field "operation" to "Remove submission"
+    And I click on "Go" "button" confirming the dialogue
+    Then I should not see "I'm the student1 submission"
+    And I should not see "I'm the student2 submission"
diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature
index e709e20b1255c..c5138d8f12286 100644
--- a/mod/assign/tests/behat/steps_blind_marking.feature
+++ b/mod/assign/tests/behat/steps_blind_marking.feature
@@ -123,11 +123,11 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
       | id_duedate_enabled | 1 |
       | duedate[day]       | 1 |
       | duedate[month]     | January |
-      | duedate[year]      | 2020 |
+      | duedate[year]      | 2030 |
       | duedate[hour]      | 08 |
       | duedate[minute]    | 00 |
     And I press "Save"
-    And I should see "Wednesday, 1 January 2020, 8:00"
+    And I should see "Tuesday, 1 January 2030, 8:00"
     And I follow "Test assignment name"
     And I navigate to "View all submissions" in current page administration
     And I should see "In review" in the "I'm the student's first submission" "table_row"
diff --git a/mod/assign/tests/events_test.php b/mod/assign/tests/events_test.php
index 9b6eb99fdb3c3..305763947f7dc 100644
--- a/mod/assign/tests/events_test.php
+++ b/mod/assign/tests/events_test.php
@@ -426,24 +426,34 @@ public function test_workflow_state_updated() {
         $assign->testable_process_set_batch_marking_workflow_state($student->id, ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW);
 
         $events = $sink->get_events();
-        $this->assertCount(1, $events);
-        $event = reset($events);
-        $this->assertInstanceOf('\mod_assign\event\workflow_state_updated', $event);
-        $this->assertEquals($assign->get_context(), $event->get_context());
-        $this->assertEquals($assign->get_instance()->id, $event->objectid);
-        $this->assertEquals($student->id, $event->relateduserid);
-        $this->assertEquals($teacher->id, $event->userid);
-        $this->assertEquals(ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW, $event->other['newstate']);
-        $expected = array(
-            $assign->get_course()->id,
-            'assign',
-            'set marking workflow state',
-            'view.php?id=' . $assign->get_course_module()->id,
-            get_string('setmarkingworkflowstateforlog', 'assign', array('id' => $student->id,
-                'fullname' => fullname($student), 'state' => ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW)),
-            $assign->get_course_module()->id
-        );
-        $this->assertEventLegacyLogData($expected, $event);
+        $eventcount = 0;
+        foreach ($events as $event) {
+            if ($event instanceof \mod_assign\event\submission_graded) {
+                $eventcount++;
+                $this->assertInstanceOf('\mod_assign\event\submission_graded', $event);
+                $this->assertEquals($assign->get_context(), $event->get_context());
+            }
+            if ($event instanceof \mod_assign\event\workflow_state_updated) {
+                $eventcount++;
+                $this->assertInstanceOf('\mod_assign\event\workflow_state_updated', $event);
+                $this->assertEquals($assign->get_context(), $event->get_context());
+                $this->assertEquals($assign->get_instance()->id, $event->objectid);
+                $this->assertEquals($student->id, $event->relateduserid);
+                $this->assertEquals($teacher->id, $event->userid);
+                $this->assertEquals(ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW, $event->other['newstate']);
+                $expected = array(
+                    $assign->get_course()->id,
+                    'assign',
+                    'set marking workflow state',
+                    'view.php?id=' . $assign->get_course_module()->id,
+                    get_string('setmarkingworkflowstateforlog', 'assign', array('id' => $student->id,
+                        'fullname' => fullname($student), 'state' => ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW)),
+                    $assign->get_course_module()->id
+                );
+                $this->assertEventLegacyLogData($expected, $event);
+            }
+        }
+        $this->assertEquals(2, $eventcount);
         $sink->close();
 
         // Test setting workflow state in apply_grade_to_user.
diff --git a/mod/assign/tests/externallib_test.php b/mod/assign/tests/externallib_test.php
index 30ebeb5769a98..2f3bcec710ac6 100644
--- a/mod/assign/tests/externallib_test.php
+++ b/mod/assign/tests/externallib_test.php
@@ -140,6 +140,13 @@ public function test_get_assignments() {
 
         $this->resetAfterTest(true);
 
+        // Enable multilang filter to on content and heading.
+        filter_set_global_state('multilang', TEXTFILTER_ON);
+        filter_set_applies_to_strings('multilang', 1);
+        // Set WS filtering.
+        $wssettings = external_settings::get_instance();
+        $wssettings->set_filter(true);
+
         $category = self::getDataGenerator()->create_category(array(
             'name' => 'Test category'
         ));
@@ -166,7 +173,7 @@ public function test_get_assignments() {
         // Create the assignment module with links to a filerecord.
         $assign1 = self::getDataGenerator()->create_module('assign', array(
             'course' => $course1->id,
-            'name' => 'lightwork assignment',
+            'name' => '<span lang="en" class="multilang">English</span><span lang="es" class="multilang">Español</span>',
             'intro' => 'the assignment intro text here <a href="@@PLUGINFILE@@/intro.txt">link</a>',
             'introformat' => FORMAT_HTML,
             'markingworkflow' => 1,
@@ -221,7 +228,7 @@ public function test_get_assignments() {
         $assignment = $course['assignments'][0];
         $this->assertEquals($assign1->id, $assignment['id']);
         $this->assertEquals($course1->id, $assignment['course']);
-        $this->assertEquals('lightwork assignment', $assignment['name']);
+        $this->assertEquals('English', $assignment['name']);
         $this->assertContains('the assignment intro text here', $assignment['intro']);
         $this->assertNotEmpty($assignment['configs']);
         // Check the url of the file attatched.
@@ -249,7 +256,7 @@ public function test_get_assignments() {
         $assignment = $course['assignments'][0];
         $this->assertEquals($assign1->id, $assignment['id']);
         $this->assertEquals($course1->id, $assignment['course']);
-        $this->assertEquals('lightwork assignment', $assignment['name']);
+        $this->assertEquals('English', $assignment['name']);
         $this->assertArrayNotHasKey('intro', $assignment);
         $this->assertArrayNotHasKey('introattachments', $assignment);
         $this->assertEquals(1, $assignment['markingworkflow']);
@@ -287,7 +294,7 @@ public function test_get_assignments() {
         $assignment = $course['assignments'][0];
         $this->assertEquals($assign1->id, $assignment['id']);
         $this->assertEquals($course1->id, $assignment['course']);
-        $this->assertEquals('lightwork assignment', $assignment['name']);
+        $this->assertEquals('English', $assignment['name']);
         $this->assertArrayNotHasKey('intro', $assignment);
         $this->assertArrayNotHasKey('introattachments', $assignment);
         $this->assertEquals(1, $assignment['markingworkflow']);
@@ -2228,6 +2235,65 @@ public function test_get_submission_status_hidden_grader() {
         $this->assertEquals($teacher->id, $result['feedback']['grade']['grader']);
     }
 
+    /**
+     * Test get_submission_status with override for student.
+     */
+    public function test_get_submission_status_with_override() {
+        global $DB;
+
+        $this->resetAfterTest(true);
+
+        list($assign, $instance, $student1, $student2, $teacher, $g1, $g2) = $this->create_submission_for_testing_status();
+
+        $overridedata = new \stdClass();
+        $overridedata->assignid = $assign->get_instance()->id;
+        $overridedata->userid = $student1->id;
+        $overridedata->allowsubmissionsfromdate = time() + YEARSECS;
+        $DB->insert_record('assign_overrides', $overridedata);
+
+        $result = mod_assign_external::get_submission_status($assign->get_instance()->id);
+        // We expect debugging because of the $PAGE object, this won't happen in a normal WS request.
+        $this->assertDebuggingCalled();
+        $result = external_api::clean_returnvalue(mod_assign_external::get_submission_status_returns(), $result);
+
+        $this->assertCount(0, $result['warnings']);
+        $this->assertFalse(isset($result['gradingsummary']));
+        $this->assertFalse(isset($result['feedback']));
+        $this->assertFalse(isset($result['previousattempts']));
+
+        $this->assertTrue($result['lastattempt']['submissionsenabled']);
+        $this->assertFalse($result['lastattempt']['canedit']);  // False because of override.
+        $this->assertFalse($result['lastattempt']['cansubmit']);
+        $this->assertFalse($result['lastattempt']['locked']);
+        $this->assertFalse($result['lastattempt']['graded']);
+        $this->assertEmpty($result['lastattempt']['extensionduedate']);
+        $this->assertFalse($result['lastattempt']['blindmarking']);
+        $this->assertCount(0, $result['lastattempt']['submissiongroupmemberswhoneedtosubmit']);
+        $this->assertEquals('notgraded', $result['lastattempt']['gradingstatus']);
+
+        // Same assignment but user without override.
+        $this->setUser($student2);
+
+        $result = mod_assign_external::get_submission_status($assign->get_instance()->id);
+        $result = external_api::clean_returnvalue(mod_assign_external::get_submission_status_returns(), $result);
+
+        // The submission is now in draft mode.
+        $this->assertCount(0, $result['warnings']);
+        $this->assertFalse(isset($result['gradingsummary']));
+        $this->assertFalse(isset($result['feedback']));
+        $this->assertFalse(isset($result['previousattempts']));
+
+        $this->assertTrue($result['lastattempt']['submissionsenabled']);
+        $this->assertTrue($result['lastattempt']['canedit']);  // True because there is not override for this user.
+        $this->assertFalse($result['lastattempt']['cansubmit']);
+        $this->assertFalse($result['lastattempt']['locked']);
+        $this->assertFalse($result['lastattempt']['graded']);
+        $this->assertEmpty($result['lastattempt']['extensionduedate']);
+        $this->assertFalse($result['lastattempt']['blindmarking']);
+        $this->assertCount(0, $result['lastattempt']['submissiongroupmemberswhoneedtosubmit']);
+        $this->assertEquals('notgraded', $result['lastattempt']['gradingstatus']);
+    }
+
     /**
      * get_participant should throw an excaption if the requested assignment doesn't exist.
      *
diff --git a/mod/assign/tests/feedback_test.php b/mod/assign/tests/feedback_test.php
new file mode 100644
index 0000000000000..ec93ffd85016e
--- /dev/null
+++ b/mod/assign/tests/feedback_test.php
@@ -0,0 +1,162 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Assign feedback unit tests.
+ *
+ * @package     mod_assign
+ * @category    test
+ * @copyright   2019 Ilya Tregubov ilyatregubov@catalyst-au.net
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/mod/assign/locallib.php');
+require_once($CFG->dirroot . '/mod/assign/tests/generator.php');
+
+use \assignfeedback_editpdf\document_services;
+use \assignfeedback_editpdf\combined_document;
+
+/**
+ * Provides the unit tests for feedback.
+ *
+ * @package     mod_assign
+ * @category    test
+ * @copyright   2019 Ilya Tregubov ilyatregubov@catalyst-au.net
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mod_assign_feedback_testcase extends advanced_testcase {
+
+    // Use the generator helper.
+    use mod_assign_test_generator;
+
+    /**
+     * Helper to create a stored file object with the given supplied content.
+     *
+     * @param   int $contextid context id for assigment
+     * @param   int $itemid item id from assigment grade
+     * @param   string $filearea File area
+     * @param   int $timemodified Time modified
+     * @param   string $filecontent The content of the mocked file
+     * @param   string $filename The file name to use in the stored_file
+     * @param   string $filerecord Any overrides to the filerecord
+     * @return  stored_file
+     */
+    protected function create_stored_file($contextid, $itemid, $filearea, $timemodified,
+                                          $filecontent = 'content', $filename = 'combined.pdf', $filerecord = []) {
+        $filerecord = array_merge([
+            'contextid' => $contextid,
+            'component' => 'assignfeedback_editpdf',
+            'filearea'  => $filearea,
+            'itemid'    => $itemid,
+            'filepath'  => '/',
+            'filename'  => $filename,
+            'timemodified' => $timemodified,
+        ], $filerecord);
+
+        $fs = get_file_storage();
+        $file = $fs->create_file_from_string($filerecord, $filecontent);
+
+        return $file;
+    }
+
+    /**
+     * Convenience function to create an instance of an assignment.
+     *
+     * @param array $params Array of parameters to pass to the generator
+     * @return assign The assign class.
+     */
+    protected function create_instance($params = array()) {
+        $generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
+        $instance = $generator->create_instance($params);
+        $cm = get_coursemodule_from_instance('assign', $instance->id);
+        $context = \context_module::instance($cm->id);
+        return new \assign($context, $cm, $params['course']);
+    }
+
+    /**
+     * Test fetching combined.pdf for state checking.
+     */
+    public function test_get_combined_document_for_attempt() {
+
+        $this->resetAfterTest(true);
+
+        $course = $this->getDataGenerator()->create_course();
+
+        $user = $this->getDataGenerator()->create_user();
+        $this->getDataGenerator()->enrol_user($user->id, $course->id, 'student');
+
+        $teacher = $this->getDataGenerator()->create_user();
+        $this->getDataGenerator()->enrol_user($teacher->id, $course->id, 'editingteacher');
+
+        $assign = $this->create_instance([
+            'course' => $course,
+            'name' => 'Assign 1',
+            'attemptreopenmethod' => ASSIGN_ATTEMPT_REOPEN_METHOD_MANUAL,
+            'maxattempts' => 3,
+            'assignsubmission_onlinetext_enabled' => true,
+            'assignfeedback_comments_enabled' => true
+        ]);
+
+        $submission = new \stdClass();
+        $submission->assignment = $assign->get_instance()->id;
+        $submission->userid = $user->id;
+        $submission->timecreated = time();
+        $submission->timemodified = time();
+        $submission->onlinetext_editor = ['text' => 'Submission text',
+            'format' => FORMAT_MOODLE];
+
+        $this->setUser($user);
+        $notices = [];
+        $assign->save_submission($submission, $notices);
+
+        $this->setUser($teacher);
+
+        $grade = '3.14';
+        $teachercommenttext = 'This is better. Thanks.';
+        $data = new \stdClass();
+        $data->attemptnumber = 1;
+        $data->grade = $grade;
+        $data->assignfeedbackcomments_editor = ['text' => $teachercommenttext, 'format' => FORMAT_MOODLE];
+
+        // Give the submission a grade.
+        $assign->save_grade($user->id, $data);
+
+        $grade = $assign->get_user_grade($user->id, true, -1);
+
+        $contextid = $assign->get_context()->id;
+        $itemid = $grade->id;
+
+        // Create combined document in combined area.
+        $this->create_stored_file($contextid, $itemid, 'combined', time());
+
+        $document = document_services::get_combined_document_for_attempt($assign, $user->id, -1);
+        $status = $document->get_status();
+
+        $this->assertEquals($status, combined_document::STATUS_COMPLETE);
+
+        // Create orphaned combined document in partial area.
+        $this->create_stored_file($contextid, $itemid, 'partial', time() - 3600);
+
+        $document = document_services::get_combined_document_for_attempt($assign, $user->id, -1);
+        $status = $document->get_status();
+
+        $this->assertEquals($status, combined_document::STATUS_FAILED);
+    }
+
+}
diff --git a/mod/assign/tests/lib_test.php b/mod/assign/tests/lib_test.php
index 759f534818aee..caf600f638f89 100644
--- a/mod/assign/tests/lib_test.php
+++ b/mod/assign/tests/lib_test.php
@@ -800,6 +800,71 @@ public function test_assign_core_calendar_provide_event_action_duedate_for_stude
         $this->assertNull($actionevent);
     }
 
+    public function test_assign_core_calendar_provide_event_action_already_completed() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $assign = $this->create_instance($course,
+         ['completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS]);
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('assign', $assign->get_instance()->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course, $assign,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_assign_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_assign_core_calendar_provide_event_action_already_completed_for_user() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $assign = $this->create_instance($course,
+         ['completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS]);
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('assign', $assign->get_instance()->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course, $assign,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_assign_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
diff --git a/mod/assign/tests/locallib_test.php b/mod/assign/tests/locallib_test.php
index e2fe5852fa40a..1e6840b61c9be 100644
--- a/mod/assign/tests/locallib_test.php
+++ b/mod/assign/tests/locallib_test.php
@@ -4010,4 +4010,74 @@ public function test_get_filters() {
 
         $this->assertEquals(count($valid), 5);
     }
+
+    /**
+     * Test showing group override duedate for admin
+     */
+    public function test_view_group_override() {
+        global $DB, $PAGE;
+
+        $this->resetAfterTest();
+        $course = $this->getDataGenerator()->create_course();
+
+        $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
+        $group2 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
+
+        $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
+        groups_add_member($group1, $student1);
+        groups_add_member($group1, $teacher);
+
+        $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        groups_add_member($group2, $student2);
+
+        $assign = $this->create_instance($course, [
+                'groupmode' => 1,
+                'duedate' => 1558999899,
+            ]);
+        $instance = $assign->get_instance();
+
+        // Overrides for two groups.
+        $overrides = [
+            (object) [
+                'assignid' => $instance->id,
+                'groupid' => $group1->id,
+                'userid' => null,
+                'sortorder' => 1,
+                'duedate' => 1568990258,
+            ],
+            (object) [
+                'assignid' => $instance->id,
+                'groupid' => $group2->id,
+                'userid' => null,
+                'sortorder' => 2,
+                'duedate' => 1559900258,
+            ],
+        ];
+
+        foreach ($overrides as &$override) {
+            $override->id = $DB->insert_record('assign_overrides', $override);
+        }
+
+        $currenturl = new moodle_url('/mod/assign/view.php', array('id' => $assign->get_course_module()->id));
+        $PAGE->set_url($currenturl);
+        $output1 = '';
+        // Other users should see duedate of the assignment.
+        $this->setUser($student2);
+        $summary = $assign->get_assign_grading_summary_renderable($group1->id);
+        $output1 .= $assign->get_renderer()->render($summary);
+        $this->assertContains('Tuesday, 28 May 2019, 7:31 AM', $output1, '', true);
+
+        $output2 = '';
+        // Teacher should should be able to see all group override duedate.
+        $this->setUser($teacher);
+        $summary = $assign->get_assign_grading_summary_renderable($group1->id);
+        $output2 .= $assign->get_renderer()->render($summary);
+        $this->assertContains('Friday, 20 September 2019, 10:37 PM', $output2, '', true);
+        $summary = $assign->get_assign_grading_summary_renderable($group2->id);
+
+        $output3 = '';
+        $output3 .= $assign->get_renderer()->render($summary);
+        $this->assertContains('Friday, 7 June 2019, 5:37 PM', $output3, '', true);
+    }
 }
diff --git a/mod/assignment/db/upgrade.php b/mod/assignment/db/upgrade.php
index a6187c6f52d6f..a95733d9bd365 100644
--- a/mod/assignment/db/upgrade.php
+++ b/mod/assignment/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_assignment_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/book/classes/external.php b/mod/book/classes/external.php
index 189d2c68e8e17..2047f5a4bfd15 100644
--- a/mod/book/classes/external.php
+++ b/mod/book/classes/external.php
@@ -205,8 +205,9 @@ public static function get_books_by_courses($courseids = array()) {
                 $bookdetails['course']            = $book->course;
                 $bookdetails['name']              = external_format_string($book->name, $context->id);
                 // Format intro.
+                $options = array('noclean' => true);
                 list($bookdetails['intro'], $bookdetails['introformat']) =
-                    external_format_text($book->intro, $book->introformat, $context->id, 'mod_book', 'intro', null);
+                    external_format_text($book->intro, $book->introformat, $context->id, 'mod_book', 'intro', null, $options);
                 $bookdetails['introfiles'] = external_util::get_area_files($context->id, 'mod_book', 'intro', false, false);
                 $bookdetails['numbering']         = $book->numbering;
                 $bookdetails['navstyle']          = $book->navstyle;
diff --git a/mod/book/db/upgrade.php b/mod/book/db/upgrade.php
index eeac64fbd9934..5a08ad22e072b 100644
--- a/mod/book/db/upgrade.php
+++ b/mod/book/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_book_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/book/edit.php b/mod/book/edit.php
index 202665260e33b..367bbe7966d40 100644
--- a/mod/book/edit.php
+++ b/mod/book/edit.php
@@ -137,7 +137,7 @@
 }
 
 echo $OUTPUT->header();
-echo $OUTPUT->heading($book->name);
+echo $OUTPUT->heading(format_string($book->name));
 
 $mform->display();
 
diff --git a/mod/book/lib.php b/mod/book/lib.php
index 0b4887f80ba04..7aab091e09d00 100644
--- a/mod/book/lib.php
+++ b/mod/book/lib.php
@@ -570,7 +570,7 @@ function book_export_contents($cm, $baseurl) {
     $currentchapter = 0;
 
     foreach ($chapters as $chapter) {
-        if ($chapter->hidden) {
+        if ($chapter->hidden && !has_capability('mod/book:viewhiddenchapters', $context)) {
             continue;
         }
 
@@ -579,6 +579,7 @@ function book_export_contents($cm, $baseurl) {
             "title"     => format_string($chapter->title, true, array('context' => $context)),
             "href"      => $chapter->id . "/index.html",
             "level"     => 0,
+            "hidden"    => $chapter->hidden,
             "subitems"  => array()
         );
 
diff --git a/mod/book/locallib.php b/mod/book/locallib.php
index e156976fde9ef..84636d8311c53 100644
--- a/mod/book/locallib.php
+++ b/mod/book/locallib.php
@@ -219,16 +219,16 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
 
     switch ($book->numbering) {
         case BOOK_NUM_NONE:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_none clearfix'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc book_toc_none clearfix'));
             break;
         case BOOK_NUM_NUMBERS:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_numbered clearfix'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc book_toc_numbered clearfix'));
             break;
         case BOOK_NUM_BULLETS:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_bullets clearfix'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc book_toc_bullets clearfix'));
             break;
         case BOOK_NUM_INDENTED:
-            $toc .= html_writer::start_tag('div', array('class' => 'book_toc_indented clearfix'));
+            $toc .= html_writer::start_tag('div', array('class' => 'book_toc book_toc_indented clearfix'));
             break;
     }
 
@@ -244,11 +244,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
             if (!$ch->subchapter) {
 
                 if ($first) {
-                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                    $toc .= html_writer::start_tag('li');
                 } else {
                     $toc .= html_writer::end_tag('ul');
                     $toc .= html_writer::end_tag('li');
-                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                    $toc .= html_writer::start_tag('li');
                 }
 
                 if (!$ch->hidden) {
@@ -267,11 +267,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
             } else {
 
                 if ($first) {
-                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                    $toc .= html_writer::start_tag('li');
                     $toc .= html_writer::start_tag('ul');
-                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                    $toc .= html_writer::start_tag('li');
                 } else {
-                    $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                    $toc .= html_writer::start_tag('li');
                 }
 
                 if (!$ch->hidden) {
@@ -291,15 +291,15 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
                     $titleout = html_writer::tag('span', $title, array('class' => 'dimmed_text'));
                 }
             }
-
+            $toc .= html_writer::start_tag('div', array('class' => 'd-flex'));
             if ($ch->id == $chapter->id) {
-                $toc .= html_writer::tag('strong', $titleout);
+                $toc .= html_writer::tag('strong', $titleout, array('class' => 'text-truncate'));
             } else {
                 $toc .= html_writer::link(new moodle_url('view.php', array('id' => $cm->id, 'chapterid' => $ch->id)), $titleout,
-                    array('title' => $titleunescaped));
+                    array('title' => $titleunescaped, 'class' => 'text-truncate'));
             }
 
-            $toc .= html_writer::start_tag('div', array('class' => 'action-list'));
+            $toc .= html_writer::start_tag('div', array('class' => 'action-list d-flex ml-auto'));
             if ($i != 1) {
                 $toc .= html_writer::link(new moodle_url('move.php', array('id' => $cm->id, 'chapterid' => $ch->id, 'up' => '1', 'sesskey' => $USER->sesskey)),
                         $OUTPUT->pix_icon('t/up', get_string('movechapterup', 'mod_book', $title)),
@@ -341,6 +341,7 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
             $toc .= html_writer::link(new moodle_url('edit.php', array('cmid' => $cm->id, 'pagenum' => $ch->pagenum, 'subchapter' => $ch->subchapter)),
                                             $OUTPUT->pix_icon('add', $buttontitle, 'mod_book'), array('title' => $buttontitle));
             $toc .= html_writer::end_tag('div');
+            $toc .= html_writer::end_tag('div');
 
             if (!$ch->subchapter) {
                 $toc .= html_writer::start_tag('ul');
@@ -365,11 +366,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
                     $ns = 0;
 
                     if ($first) {
-                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                        $toc .= html_writer::start_tag('li');
                     } else {
                         $toc .= html_writer::end_tag('ul');
                         $toc .= html_writer::end_tag('li');
-                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                        $toc .= html_writer::start_tag('li');
                     }
 
                     if ($book->numbering == BOOK_NUM_NUMBERS) {
@@ -379,11 +380,11 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
                     $ns++;
 
                     if ($first) {
-                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                        $toc .= html_writer::start_tag('li');
                         $toc .= html_writer::start_tag('ul');
-                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                        $toc .= html_writer::start_tag('li');
                     } else {
-                        $toc .= html_writer::start_tag('li', array('class' => 'clearfix'));
+                        $toc .= html_writer::start_tag('li');
                     }
 
                     if ($book->numbering == BOOK_NUM_NUMBERS) {
diff --git a/mod/book/styles.css b/mod/book/styles.css
index 01b98dcd718e3..eb646f4e3be2b 100644
--- a/mod/book/styles.css
+++ b/mod/book/styles.css
@@ -20,59 +20,53 @@
 }
 
 /* == Fake toc block == */
-
-.path-mod-book .block_book_toc ul {
-    margin: 0 0 0 5px;
-    padding-left: 0;
-    padding-right: 0;
+.path-mod-book .book_toc .action-list img.smallicon {
+    margin: 0 3px;
 }
 
-.path-mod-book .block_book_toc li {
-    clear: both;
-    list-style: none;
-    margin-top: .5em;
+/* toc style INDENTED*/
+.path-mod-book .book_toc ul {
+    display: flex;
+    flex-direction: column;
 }
-
-.path-mod-book .block_book_toc li li {
-    list-style: none;
+.path-mod-book .book_toc li {
+    flex: 1 1 100%;
 }
-
-.path-mod-book .block_book_toc .action-list {
-    float: right;
+.path-mod-book .book_toc_indented > ul {
+    margin-left: 0;
+    padding-left: 0;
 }
 
-.path-mod-book .block_book_toc .action-list img.smallicon {
-    margin: 0 3px;
+.path-mod-book .book_toc_indented li {
+    list-style: none;
 }
 
-.path-mod-book .book_toc_none ul ul {
+/* toc style BULLETED*/
+.path-mod-book .book_toc_bullets > ul {
     margin-left: 0;
-    margin-right: 0;
+    padding-left: 1.3rem;
 }
-
-/*toc style BULLETS */
-.path-mod-book .book_toc_bullets ul ul {
-    margin-left: 20px;
+.path-mod-book .book_toc_bullets li {
+    list-style: disc;
 }
 
-.path-mod-book .book_toc_bullets li li {
-    list-style: circle;
-}
-
-.path-mod-book .book_toc_bullets li li:before {
-    display: none;
+/* toc style NUMBERED*/
+.path-mod-book .book_toc_numbered > ul {
+    margin-left: 0;
+    padding-left: 0;
 }
 
-/* toc style INDENTED*/
-.path-mod-book .book_toc_indented ul {
-    margin-left: 5px;
+.path-mod-book .book_toc_numbered li {
+    list-style: none;
 }
 
-.path-mod-book .book_toc_indented ul ul {
-    margin-left: 15px;
+/* toc style NONE*/
+.path-mod-book .book_toc_none ul {
+    margin-left: 0;
+    padding-left: 0;
 }
 
-.path-mod-book .book_toc_indented li li {
+.path-mod-book .book_toc_none li {
     list-style: none;
 }
 
diff --git a/mod/book/tests/behat/show_hide_chapters.feature b/mod/book/tests/behat/show_hide_chapters.feature
index 463a179bc0759..651de447cec65 100644
--- a/mod/book/tests/behat/show_hide_chapters.feature
+++ b/mod/book/tests/behat/show_hide_chapters.feature
@@ -58,11 +58,6 @@ Feature: Book activity chapter visibility management
     And I follow "Test book"
     Then the "class" attribute of "a[title='Second chapter']" "css_element" should contain "dimmed_text"
     And the "class" attribute of "a[title='Third chapter']" "css_element" should contain "dimmed_text"
-    And I follow "Next"
-    And I should see "Fourth chapter" in the ".book_content" "css_element"
-    And I follow "Exit book"
-    And I follow "Test book"
-    And I should see "First chapter" in the ".book_content" "css_element"
     And I turn editing mode on
     And I follow "Next"
     And I should see "Second chapter" in the ".book_content" "css_element"
@@ -80,3 +75,8 @@ Feature: Book activity chapter visibility management
     And I follow "Test book"
     And I should not see "Second chapter" in the "Table of contents" "block"
     And I should not see "Third chapter" in the "Table of contents" "block"
+    And I follow "Next"
+    And I should see "Fourth chapter" in the ".book_content" "css_element"
+    And I follow "Exit book"
+    And I follow "Test book"
+    And I should see "First chapter" in the ".book_content" "css_element"
diff --git a/mod/book/tests/lib_test.php b/mod/book/tests/lib_test.php
index 49f740a5b6d17..247f29dda9319 100644
--- a/mod/book/tests/lib_test.php
+++ b/mod/book/tests/lib_test.php
@@ -49,9 +49,13 @@ public function test_export_contents() {
         require_once($CFG->dirroot . '/course/externallib.php');
 
         $user = $this->getDataGenerator()->create_user();
+        $teacher = $this->getDataGenerator()->create_user();
         $course = $this->getDataGenerator()->create_course(array('enablecomment' => 1));
         $studentrole = $DB->get_record('role', array('shortname' => 'student'));
+        $teacherrole = $DB->get_record('role', array('shortname' => 'teacher'));
+
         $this->getDataGenerator()->enrol_user($user->id, $course->id, $studentrole->id);
+        $this->getDataGenerator()->enrol_user($teacher->id, $course->id, $teacherrole->id);
 
         // Test book with 3 chapters.
         $book = $this->getDataGenerator()->create_module('book', array('course' => $course->id));
@@ -87,6 +91,88 @@ public function test_export_contents() {
         // Now, test the function via the external API.
         $contents = core_course_external::get_course_contents($course->id, array());
         $contents = external_api::clean_returnvalue(core_course_external::get_course_contents_returns(), $contents);
+
+        $this->assertCount(4, $contents[0]['modules'][0]['contents']);
+
+        $this->assertEquals('content', $contents[0]['modules'][0]['contents'][0]['type']);
+        $this->assertEquals('structure', $contents[0]['modules'][0]['contents'][0]['filename']);
+
+        $this->assertEquals('file', $contents[0]['modules'][0]['contents'][1]['type']);
+        $this->assertEquals('Chapter 1', $contents[0]['modules'][0]['contents'][1]['content']);
+
+        $this->assertEquals('file', $contents[0]['modules'][0]['contents'][2]['type']);
+        $this->assertEquals('Chapter 2', $contents[0]['modules'][0]['contents'][2]['content']);
+
+        $this->assertEquals('file', $contents[0]['modules'][0]['contents'][3]['type']);
+        $this->assertEquals('Chapter 3', $contents[0]['modules'][0]['contents'][3]['content']);
+
+        $this->assertEquals('book', $contents[0]['modules'][0]['modname']);
+        $this->assertEquals($cm->id, $contents[0]['modules'][0]['id']);
+        $this->assertCount(2, $contents[0]['modules'][0]['contents'][1]['tags']);
+        $this->assertEquals('Cats', $contents[0]['modules'][0]['contents'][1]['tags'][0]['rawname']);
+        $this->assertEquals('Dogs', $contents[0]['modules'][0]['contents'][1]['tags'][1]['rawname']);
+
+        // As a teacher.
+        $this->setUser($teacher);
+
+        $contents = book_export_contents($cm, '');
+        // As a teacher, the hidden chapter must be included in the structure.
+        $this->assertCount(5, $contents);
+
+        $this->assertEquals('structure', $contents[0]['filename']);
+        // Check structure is correct.
+        $foundhiddenchapter = false;
+        $chapters = json_decode($contents[0]['content']);
+        foreach ($chapters as $chapter) {
+            if ($chapter->title == 'Chapter 4' && $chapter->hidden == 1) {
+                $foundhiddenchapter = true;
+            }
+        }
+        $this->assertTrue($foundhiddenchapter);
+
+        $this->assertEquals('index.html', $contents[1]['filename']);
+        $this->assertEquals('Chapter 1', $contents[1]['content']);
+        $this->assertCount(2, $contents[1]['tags']);
+        $this->assertEquals('Cats', $contents[1]['tags'][0]['rawname']);
+        $this->assertEquals($tag->id, $contents[1]['tags'][0]['id']);
+        $this->assertEquals('Dogs', $contents[1]['tags'][1]['rawname']);
+        $this->assertEquals('index.html', $contents[2]['filename']);
+        $this->assertEquals('Chapter 2', $contents[2]['content']);
+        $this->assertEquals('index.html', $contents[3]['filename']);
+        $this->assertEquals('Chapter 3', $contents[3]['content']);
+        $this->assertEquals('index.html', $contents[4]['filename']);
+        $this->assertEquals('Chapter 4', $contents[4]['content']);
+
+        // Now, test the function via the external API.
+        $contents = core_course_external::get_course_contents($course->id, array());
+        $contents = external_api::clean_returnvalue(core_course_external::get_course_contents_returns(), $contents);
+
+        $this->assertCount(5, $contents[0]['modules'][0]['contents']);
+
+        $this->assertEquals('content', $contents[0]['modules'][0]['contents'][0]['type']);
+        $this->assertEquals('structure', $contents[0]['modules'][0]['contents'][0]['filename']);
+        // Check structure is correct.
+        $foundhiddenchapter = false;
+        $chapters = json_decode($contents[0]['modules'][0]['contents'][0]['content']);
+        foreach ($chapters as $chapter) {
+            if ($chapter->title == 'Chapter 4' && $chapter->hidden == 1) {
+                $foundhiddenchapter = true;
+            }
+        }
+        $this->assertTrue($foundhiddenchapter);
+
+        $this->assertEquals('file', $contents[0]['modules'][0]['contents'][1]['type']);
+        $this->assertEquals('Chapter 1', $contents[0]['modules'][0]['contents'][1]['content']);
+
+        $this->assertEquals('file', $contents[0]['modules'][0]['contents'][2]['type']);
+        $this->assertEquals('Chapter 2', $contents[0]['modules'][0]['contents'][2]['content']);
+
+        $this->assertEquals('file', $contents[0]['modules'][0]['contents'][3]['type']);
+        $this->assertEquals('Chapter 3', $contents[0]['modules'][0]['contents'][3]['content']);
+
+        $this->assertEquals('file', $contents[0]['modules'][0]['contents'][4]['type']);
+        $this->assertEquals('Chapter 4', $contents[0]['modules'][0]['contents'][4]['content']);
+
         $this->assertEquals('book', $contents[0]['modules'][0]['modname']);
         $this->assertEquals($cm->id, $contents[0]['modules'][0]['id']);
         $this->assertCount(2, $contents[0]['modules'][0]['contents'][1]['tags']);
diff --git a/mod/book/tool/importhtml/index.php b/mod/book/tool/importhtml/index.php
index df186dd9e1ad0..b0e0d24419adb 100644
--- a/mod/book/tool/importhtml/index.php
+++ b/mod/book/tool/importhtml/index.php
@@ -67,7 +67,7 @@
 
 } else if ($data = $mform->get_data()) {
     echo $OUTPUT->header();
-    echo $OUTPUT->heading($book->name);
+    echo $OUTPUT->heading(format_string($book->name));
     echo $OUTPUT->heading(get_string('importingchapters', 'booktool_importhtml'), 3);
 
     // this is a bloody hack - children do not try this at home!
@@ -85,7 +85,7 @@
 }
 
 echo $OUTPUT->header();
-echo $OUTPUT->heading($book->name);
+echo $OUTPUT->heading(format_string($book->name));
 
 $mform->display();
 
diff --git a/mod/book/view.php b/mod/book/view.php
index f0ad1b934a739..ade0acb522328 100644
--- a/mod/book/view.php
+++ b/mod/book/view.php
@@ -80,7 +80,7 @@
     book_view($book, null, false, $course, $cm, $context);
 
     foreach ($chapters as $ch) {
-        if ($edit) {
+        if ($edit || ($ch->hidden && $viewhidden)) {
             $chapterid = $ch->id;
             break;
         }
@@ -132,7 +132,7 @@
 $navnexttitle = null;
 $last = null;
 foreach ($chapters as $ch) {
-    if (!$edit and $ch->hidden) {
+    if (!$edit and ($ch->hidden && !$viewhidden)) {
         continue;
     }
     if ($last == $chapter->id) {
diff --git a/mod/chat/classes/external.php b/mod/chat/classes/external.php
index 0ef65660cd321..d4012db8b1a32 100644
--- a/mod/chat/classes/external.php
+++ b/mod/chat/classes/external.php
@@ -549,8 +549,9 @@ public static function get_chats_by_courses($courseids = array()) {
                 $chatdetails['course']            = $chat->course;
                 $chatdetails['name']              = external_format_string($chat->name, $chatcontext->id);
                 // Format intro.
+                $options = array('noclean' => true);
                 list($chatdetails['intro'], $chatdetails['introformat']) =
-                    external_format_text($chat->intro, $chat->introformat, $chatcontext->id, 'mod_chat', 'intro', null);
+                    external_format_text($chat->intro, $chat->introformat, $chatcontext->id, 'mod_chat', 'intro', null, $options);
                 $chatdetails['introfiles'] = external_util::get_area_files($chatcontext->id, 'mod_chat', 'intro', false, false);
 
                 if (has_capability('mod/chat:chat', $chatcontext)) {
diff --git a/mod/chat/db/upgrade.php b/mod/chat/db/upgrade.php
index 5351271133c95..a98d1b789777e 100644
--- a/mod/chat/db/upgrade.php
+++ b/mod/chat/db/upgrade.php
@@ -68,5 +68,8 @@ function xmldb_chat_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index bd787088f46a0..75f3b59d0c0db 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -1435,6 +1435,14 @@ function mod_chat_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     $chattime = $DB->get_field('chat', 'chattime', array('id' => $event->instance));
     $usertimezone = core_date::get_user_timezone($user);
     $chattimemidnight = usergetmidnight($chattime, $usertimezone);
diff --git a/mod/chat/tests/lib_test.php b/mod/chat/tests/lib_test.php
index fa7ad53c3780e..7a864cfecb3fa 100644
--- a/mod/chat/tests/lib_test.php
+++ b/mod/chat/tests/lib_test.php
@@ -635,6 +635,69 @@ public function test_chat_get_sessions_multiple() {
         }
     }
 
+    public function test_chat_core_calendar_provide_event_action_already_completed() {
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $chat = $this->getDataGenerator()->create_module('chat', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('chat', $chat->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $chat->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_chat_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_chat_core_calendar_provide_event_action_already_completed_for_user() {
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $chat = $this->getDataGenerator()->create_module('chat', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('chat', $chat->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $chat->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_chat_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
diff --git a/mod/choice/classes/external.php b/mod/choice/classes/external.php
index 8fc4e4cdde063..cdcadd117fd20 100644
--- a/mod/choice/classes/external.php
+++ b/mod/choice/classes/external.php
@@ -502,11 +502,10 @@ public static function get_choices_by_courses($courseids = array()) {
                 $choicedetails['course'] = $choice->course;
                 $choicedetails['name']  = external_format_string($choice->name, $context->id);
                 // Format intro.
+                $options = array('noclean' => true);
                 list($choicedetails['intro'], $choicedetails['introformat']) =
-                    external_format_text($choice->intro, $choice->introformat,
-                                            $context->id, 'mod_choice', 'intro', null);
-                    $choicedetails['introfiles'] = external_util::get_area_files($context->id, 'mod_choice', 'intro', false,
-                                                                                    false);
+                    external_format_text($choice->intro, $choice->introformat, $context->id, 'mod_choice', 'intro', null, $options);
+                $choicedetails['introfiles'] = external_util::get_area_files($context->id, 'mod_choice', 'intro', false, false);
 
                 if (has_capability('mod/choice:choose', $context)) {
                     $choicedetails['publish']  = $choice->publish;
diff --git a/mod/choice/db/upgrade.php b/mod/choice/db/upgrade.php
index 31f2963797031..84abf36993750 100644
--- a/mod/choice/db/upgrade.php
+++ b/mod/choice/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_choice_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index c6704c7cabeea..e971bab012503 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -1239,6 +1239,14 @@ function mod_choice_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     $now = time();
 
     if (!empty($cm->customdata['timeclose']) && $cm->customdata['timeclose'] < $now) {
diff --git a/mod/choice/report.php b/mod/choice/report.php
index 5c3a5f0a6bde0..7810b338c9ec6 100644
--- a/mod/choice/report.php
+++ b/mod/choice/report.php
@@ -68,7 +68,7 @@
         $PAGE->set_title(format_string($choice->name).": $strresponses");
         $PAGE->set_heading($course->fullname);
         echo $OUTPUT->header();
-        echo $OUTPUT->heading($choice->name, 2, null);
+        echo $OUTPUT->heading(format_string($choice->name), 2, null);
         /// Check to see if groups are being used in this choice
         $groupmode = groups_get_activity_groupmode($cm);
         if ($groupmode) {
diff --git a/mod/choice/tests/lib_test.php b/mod/choice/tests/lib_test.php
index 316e0a6dba174..ff4b5ba8b22d8 100644
--- a/mod/choice/tests/lib_test.php
+++ b/mod/choice/tests/lib_test.php
@@ -714,6 +714,71 @@ public function test_choice_core_calendar_provide_event_action_no_time_specified
         $this->assertTrue($actionevent->is_actionable());
     }
 
+    public function test_choice_core_calendar_provide_event_action_already_completed() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $choice = $this->getDataGenerator()->create_module('choice', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('choice', $choice->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $choice->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_choice_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_choice_core_calendar_provide_event_action_already_completed_for_user() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $choice = $this->getDataGenerator()->create_module('choice', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('choice', $choice->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $choice->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_choice_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
diff --git a/mod/data/classes/external.php b/mod/data/classes/external.php
index 649a6336a49b1..4811a6c544542 100644
--- a/mod/data/classes/external.php
+++ b/mod/data/classes/external.php
@@ -125,7 +125,9 @@ public static function get_databases_by_courses($courseids = array()) {
                     }
                 }
                 $exporter = new database_summary_exporter($database, array('context' => $context));
-                $arrdatabases[] = $exporter->export($PAGE->get_renderer('core'));
+                $data = $exporter->export($PAGE->get_renderer('core'));
+                $data->name = external_format_string($data->name, $context);
+                $arrdatabases[] = $data;
             }
         }
 
diff --git a/mod/data/classes/external/database_summary_exporter.php b/mod/data/classes/external/database_summary_exporter.php
index 4499853ac105b..79e522d5b90f6 100644
--- a/mod/data/classes/external/database_summary_exporter.php
+++ b/mod/data/classes/external/database_summary_exporter.php
@@ -237,6 +237,7 @@ protected function get_format_parameters_for_intro() {
         return [
             'component' => 'mod_data',
             'filearea' => 'intro',
+            'options' => array('noclean' => true),
         ];
     }
 }
diff --git a/mod/data/db/upgrade.php b/mod/data/db/upgrade.php
index 96d2f3592400e..a38a100dedc89 100644
--- a/mod/data/db/upgrade.php
+++ b/mod/data/db/upgrade.php
@@ -53,5 +53,25 @@ function xmldb_data_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    if ($oldversion < 2019052001) {
+
+        $columns = $DB->get_columns('data');
+
+        $oldclass = "mod-data-default-template ##approvalstatus##";
+        $newclass = "mod-data-default-template ##approvalstatusclass##";
+
+        // Update existing classes.
+        $DB->replace_all_text('data', $columns['singletemplate'], $oldclass, $newclass);
+        $DB->replace_all_text('data', $columns['listtemplate'], $oldclass, $newclass);
+        $DB->replace_all_text('data', $columns['addtemplate'], $oldclass, $newclass);
+        $DB->replace_all_text('data', $columns['rsstemplate'], $oldclass, $newclass);
+        $DB->replace_all_text('data', $columns['asearchtemplate'], $oldclass, $newclass);
+
+        // Data savepoint reached.
+        upgrade_mod_savepoint(true, 2019052001, 'data');
+    }
     return true;
 }
diff --git a/mod/data/field.php b/mod/data/field.php
index c96261a177117..a11c54ea862d3 100644
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -273,7 +273,7 @@
             get_string('fielddescription', 'data'),
             get_string('action', 'data'),
         );
-        $table->align = array('left','left','left', 'center');
+        $table->align = array('left', 'left', 'left', 'left');
         $table->wrap = array(false,false,false,false);
 
         if ($fff = $DB->get_records('data_fields', array('dataid'=>$data->id),'id')){
diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index af0c94a59f28b..69fd9dbe4ec91 100644
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -60,9 +60,9 @@ function display_add_field($recordid = 0, $formdata = null) {
 
         $text   = '';
         $format = 0;
-        $str = '<div title="' . s($this->field->description) . '">';
-        $str .= '<label for="field_' . $this->field->id . '" class="accesshide">';
-        $str .= html_writer::span($this->field->name);
+        $str = '<div title="' . s($this->field->description) . '" class="d-inline-flex">';
+        $str .= '<label for="field_' . $this->field->id . '">';
+        $str .= html_writer::span($this->field->name, 'accesshide');
         if ($this->field->required) {
             $image = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form'));
             $str .= html_writer::div($image, 'inline-req');
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 37519ceb2fdab..9b3d93d8ff755 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -608,7 +608,7 @@ function data_generate_default_template(&$data, $template, $recordid=0, $form=fa
     if ($fields = $DB->get_records('data_fields', array('dataid'=>$data->id), 'id')) {
 
         $table = new html_table();
-        $table->attributes['class'] = 'mod-data-default-template ##approvalstatus##';
+        $table->attributes['class'] = 'mod-data-default-template ##approvalstatusclass##';
         $table->colclasses = array('template-field', 'template-token');
         $table->data = array();
         foreach ($fields as $field) {
@@ -1507,12 +1507,16 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
         }
 
         $patterns[] = '##approvalstatus##';
+        $patterns[] = '##approvalstatusclass##';
         if (!$data->approval) {
             $replacement[] = '';
+            $replacement[] = '';
         } else if ($record->approved) {
             $replacement[] = get_string('approved', 'data');
+            $replacement[] = 'approved';
         } else {
             $replacement[] = get_string('notapproved', 'data');
+            $replacement[] = 'notapproved';
         }
 
         $patterns[]='##comments##';
diff --git a/mod/data/locallib.php b/mod/data/locallib.php
index db8a7791c1c00..b8bad674fcdfb 100644
--- a/mod/data/locallib.php
+++ b/mod/data/locallib.php
@@ -1421,6 +1421,7 @@ function data_approve_entry($entryid, $approve) {
 
 /**
  * Populate the field contents of a new record with the submitted data.
+ * An event has been previously triggered upon the creation of the new record in data_add_record().
  *
  * @param  stdClass $data           database object
  * @param  stdClass $context        context object
@@ -1449,18 +1450,6 @@ function data_add_fields_contents_to_new_record($data, $context, $recordid, $fie
     foreach ($processeddata->fields as $fieldname => $field) {
         $field->update_content($recordid, $datarecord->$fieldname, $fieldname);
     }
-
-    // Trigger an event for updating this record.
-    $event = \mod_data\event\record_created::create(array(
-        'objectid' => $recordid,
-        'context' => $context,
-        'courseid' => $data->course,
-        'other' => array(
-            'dataid' => $data->id
-        )
-    ));
-    $event->add_record_snapshot('data', $data);
-    $event->trigger();
 }
 
 /**
diff --git a/mod/data/tests/externallib_test.php b/mod/data/tests/externallib_test.php
index f34f0328b8d1e..c49c9be96fb69 100644
--- a/mod/data/tests/externallib_test.php
+++ b/mod/data/tests/externallib_test.php
@@ -122,7 +122,8 @@ public function setUp() {
      * Test get databases by courses
      */
     public function test_mod_data_get_databases_by_courses() {
-        global $DB;
+        global $DB, $CFG;
+        require_once($CFG->libdir . '/externallib.php');
 
         $this->resetAfterTest(true);
 
@@ -141,6 +142,9 @@ public function test_mod_data_get_databases_by_courses() {
         $record = new stdClass();
         $record->introformat = FORMAT_HTML;
         $record->course = $course1->id;
+        // Set multilang text to check that is properly filtered to "en" only.
+        $record->name = '<span lang="en" class="multilang">English</span><span lang="es" class="multilang">Español</span>';
+        $record->intro = '<button>Test with HTML allowed.</button>';
         $database1 = self::getDataGenerator()->create_module('data', $record);
 
         // Second database.
@@ -167,6 +171,14 @@ public function test_mod_data_get_databases_by_courses() {
         }
         $enrol->enrol_user($instance2, $student->id, $studentrole->id);
 
+        // Enable multilang filter to on content and heading.
+        filter_manager::reset_caches();
+        filter_set_global_state('multilang', TEXTFILTER_ON);
+        filter_set_applies_to_strings('multilang', true);
+        // Set WS filtering.
+        $wssettings = external_settings::get_instance();
+        $wssettings->set_filter(true);
+
         // Create what we expect to be returned when querying the two courses.
         // First for the student user.
         $expectedfields = array('id', 'coursemodule', 'course', 'name', 'comments', 'timeavailablefrom',
@@ -191,6 +203,7 @@ public function test_mod_data_get_databases_by_courses() {
             $expected1[$field] = $database1->{$field};
             $expected2[$field] = $database2->{$field};
         }
+        $expected1['name'] = 'English'; // Lang filtered expected.
         $expected1['comments'] = (bool) $expected1['comments'];
         $expected2['comments'] = (bool) $expected2['comments'];
 
diff --git a/mod/data/version.php b/mod/data/version.php
index d3bcc4f12cb5e..d2b5d3febf628 100644
--- a/mod/data/version.php
+++ b/mod/data/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019052000;       // The current module version (Date: YYYYMMDDXX)
+$plugin->version   = 2019052001;       // The current module version (Date: YYYYMMDDXX)
 $plugin->requires  = 2019051100;       // Requires this Moodle version
 $plugin->component = 'mod_data';       // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 0;
diff --git a/mod/feedback/classes/completion.php b/mod/feedback/classes/completion.php
index 7c27de8f148de..f492e3ce51bb4 100644
--- a/mod/feedback/classes/completion.php
+++ b/mod/feedback/classes/completion.php
@@ -178,7 +178,11 @@ protected function can_see_item($item) {
             }
             return null;
         }
-        return $itemobj->compare_value($ditem, $value, $item->dependvalue) ? true : false;
+        $check = $itemobj->compare_value($ditem, $value, $item->dependvalue) ? true : false;
+        if ($check) {
+            return $this->can_see_item($ditem);
+        }
+        return false;
     }
 
     /**
diff --git a/mod/feedback/classes/external/feedback_summary_exporter.php b/mod/feedback/classes/external/feedback_summary_exporter.php
index 2cccd93513104..856b67bc983be 100644
--- a/mod/feedback/classes/external/feedback_summary_exporter.php
+++ b/mod/feedback/classes/external/feedback_summary_exporter.php
@@ -173,6 +173,7 @@ protected function get_format_parameters_for_intro() {
         return [
             'component' => 'mod_feedback',
             'filearea' => 'intro',
+            'options' => array('noclean' => true),
         ];
     }
 
diff --git a/mod/feedback/classes/responses_table.php b/mod/feedback/classes/responses_table.php
index 4327cc06d9081..9ce2b392e57b8 100644
--- a/mod/feedback/classes/responses_table.php
+++ b/mod/feedback/classes/responses_table.php
@@ -157,6 +157,7 @@ protected function init($group = 0) {
         $this->define_headers($tableheaders);
 
         $this->sortable(true, 'lastname', SORT_ASC);
+        $this->no_sorting('groups');
         $this->collapsible(true);
         $this->set_attribute('id', 'showentrytable');
 
@@ -295,6 +296,7 @@ protected function add_all_values_to_output() {
         $columnscount = 0;
         $this->hasmorecolumns = max(0, count($items) - self::TABLEJOINLIMIT);
 
+        $headernamepostfix = !$this->is_downloading();
         // Add feedback response values.
         foreach ($items as $nr => $item) {
             if ($columnscount++ < self::TABLEJOINLIMIT) {
@@ -308,7 +310,7 @@ protected function add_all_values_to_output() {
 
             $tablecolumns[] = "val{$nr}";
             $itemobj = feedback_get_item_class($item->typ);
-            $tableheaders[] = $itemobj->get_display_name($item);
+            $tableheaders[] = $itemobj->get_display_name($item, $headernamepostfix);
         }
 
         // Add 'Delete entry' column.
diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php
index 603521d8d6db3..0ec677a4c7f44 100644
--- a/mod/feedback/db/upgrade.php
+++ b/mod/feedback/db/upgrade.php
@@ -81,5 +81,8 @@ function xmldb_feedback_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php
index 3201d631f5d6c..cf070d2834949 100644
--- a/mod/feedback/lang/en/feedback.php
+++ b/mod/feedback/lang/en/feedback.php
@@ -195,7 +195,7 @@
 $string['no_items_available_yet'] = 'No questions have been set up yet';
 $string['non_anonymous'] = 'User\'s name will be logged and shown with answers';
 $string['non_anonymous_entries'] = 'Non anonymous entries ({$a})';
-$string['non_respondents_students'] = 'Non respondents students ({$a})';
+$string['non_respondents_students'] = 'Non-respondent students ({$a})';
 $string['not_completed_yet'] = 'Not completed yet';
 $string['not_started'] = 'Not started';
 $string['no_templates_available_yet'] = 'No templates available yet';
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 884dd7d37839e..e2a45875b4060 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -1925,10 +1925,23 @@ function feedback_save_tmp_values($feedbackcompletedtmp, $feedbackcompleted) {
         //check if there are depend items
         $item = $DB->get_record('feedback_item', array('id'=>$value->item));
         if ($item->dependitem > 0 && isset($allitems[$item->dependitem])) {
-            $check = feedback_compare_item_value($tmpcplid,
-                                        $allitems[$item->dependitem],
-                                        $item->dependvalue,
-                                        true);
+            $ditem = $allitems[$item->dependitem];
+            while ($ditem !== null) {
+                $check = feedback_compare_item_value($tmpcplid,
+                                            $ditem,
+                                            $item->dependvalue,
+                                            true);
+                if (!$check) {
+                    break;
+                }
+                if ($ditem->dependitem > 0 && isset($allitems[$ditem->dependitem])) {
+                    $item = $ditem;
+                    $ditem = $allitems[$ditem->dependitem];
+                } else {
+                    $ditem = null;
+                }
+            }
+
         } else {
             $check = true;
         }
@@ -3029,6 +3042,14 @@ function mod_feedback_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     $feedbackcompletion = new mod_feedback_completion(null, $cm, 0, false, null, null, $userid);
 
     if (!empty($cm->customdata['timeclose']) && $cm->customdata['timeclose'] < time()) {
diff --git a/mod/feedback/tests/lib_test.php b/mod/feedback/tests/lib_test.php
index a890ace137f21..62c522a58ba51 100644
--- a/mod/feedback/tests/lib_test.php
+++ b/mod/feedback/tests/lib_test.php
@@ -541,6 +541,71 @@ public function test_feedback_core_calendar_provide_event_action_already_submitt
         $this->assertNull($actionevent);
     }
 
+    public function test_feedback_core_calendar_provide_event_action_already_completed() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $feedback = $this->getDataGenerator()->create_module('feedback', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('feedback', $feedback->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $feedback->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_feedback_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_feedback_core_calendar_provide_event_action_already_completed_for_user() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $feedback = $this->getDataGenerator()->create_module('feedback', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('feedback', $feedback->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $feedback->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_feedback_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
diff --git a/mod/folder/classes/external.php b/mod/folder/classes/external.php
index f875c929b534b..81ccfc95ef32f 100644
--- a/mod/folder/classes/external.php
+++ b/mod/folder/classes/external.php
@@ -157,8 +157,9 @@ public static function get_folders_by_courses($courseids = array()) {
                 // Entry to return.
                 $folder->name = external_format_string($folder->name, $context->id);
 
-                list($folder->intro, $folder->introformat) = external_format_text($folder->intro,
-                                                                $folder->introformat, $context->id, 'mod_folder', 'intro', null);
+                $options = array('noclean' => true);
+                list($folder->intro, $folder->introformat) =
+                    external_format_text($folder->intro, $folder->introformat, $context->id, 'mod_folder', 'intro', null, $options);
                 $folder->introfiles = external_util::get_area_files($context->id, 'mod_folder', 'intro', false, false);
 
                 $returnedfolders[] = $folder;
diff --git a/mod/folder/db/upgrade.php b/mod/folder/db/upgrade.php
index d106c21a88826..27c9f55523601 100644
--- a/mod/folder/db/upgrade.php
+++ b/mod/folder/db/upgrade.php
@@ -61,5 +61,8 @@ function xmldb_folder_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/forum/amd/build/posts_list.min.js b/mod/forum/amd/build/posts_list.min.js
index df43413cab250..b888a7fb6b27f 100644
--- a/mod/forum/amd/build/posts_list.min.js
+++ b/mod/forum/amd/build/posts_list.min.js
@@ -1 +1 @@
-define(["jquery","core/templates","core/notification","mod_forum/selectors","mod_forum/inpage_reply"],function(a,b,c,d,e){var f=function(f){f.on("click",d.post.inpageReplyLink,function(f){if(f.preventDefault(),window.location.hash){var g=window.location.href.split("#")[0];history.pushState({},document.title,g)}var h=a(f.currentTarget).parents(d.post.forumCoreContent),i=h.find(d.post.forumSubject),j=a(f.currentTarget).parents(d.post.forumContent),k={postid:a(j).data("post-id"),reply_url:a(f.currentTarget).attr("href"),sesskey:M.cfg.sesskey,parentsubject:i.html(),canreplyprivately:a(f.currentTarget).data("can-reply-privately"),postformat:e.CONTENT_FORMATS.MOODLE};if(j.find(d.post.inpageReplyContent).length){var l=j.find(d.post.inpageReplyContent);l.slideToggle(300),l.is(":visible")&&l.find("textarea").focus()}else b.render("mod_forum/inpage_reply",k).then(function(a,c){return b.appendNodeContents(h,a,c)}).then(function(){return j.find(d.post.inpageReplyContent).slideToggle(300).find("textarea").focus()}).fail(c.exception)})};return{init:function(a){f(a),e.init(a)}}});
\ No newline at end of file
+define(["jquery","core/templates","core/notification","mod_forum/selectors","mod_forum/inpage_reply"],function(a,b,c,d,e){var f=function(f){f.on("click",d.post.inpageReplyLink,function(f){if(f.preventDefault(),window.location.hash){var g=window.location.href.split("#")[0];history.pushState({},document.title,g)}var h=a(f.currentTarget).parents(d.post.forumCoreContent),i=h.find(d.post.forumSubject),j=a(f.currentTarget).parents(d.post.forumContent),k={postid:a(j).data("post-id"),reply_url:a(f.currentTarget).attr("href"),sesskey:M.cfg.sesskey,parentsubject:i.data("replySubject"),canreplyprivately:a(f.currentTarget).data("can-reply-privately"),postformat:e.CONTENT_FORMATS.MOODLE};if(j.find(d.post.inpageReplyContent).length){var l=j.find(d.post.inpageReplyContent);l.slideToggle(300),l.is(":visible")&&l.find("textarea").focus()}else b.render("mod_forum/inpage_reply",k).then(function(a,c){return b.appendNodeContents(h,a,c)}).then(function(){return j.find(d.post.inpageReplyContent).slideToggle(300).find("textarea").focus()}).fail(c.exception)})};return{init:function(a){f(a),e.init(a)}}});
\ No newline at end of file
diff --git a/mod/forum/amd/src/posts_list.js b/mod/forum/amd/src/posts_list.js
index 5e24d7a5baf48..3fbc5933c7370 100644
--- a/mod/forum/amd/src/posts_list.js
+++ b/mod/forum/amd/src/posts_list.js
@@ -59,7 +59,7 @@ define([
                 postid: $(currentRoot).data('post-id'),
                 "reply_url": $(e.currentTarget).attr('href'),
                 sesskey: M.cfg.sesskey,
-                parentsubject: currentSubject.html(),
+                parentsubject: currentSubject.data('replySubject'),
                 canreplyprivately: $(e.currentTarget).data('can-reply-privately'),
                 postformat: InPageReply.CONTENT_FORMATS.MOODLE
             };
diff --git a/mod/forum/backup/moodle2/backup_forum_stepslib.php b/mod/forum/backup/moodle2/backup_forum_stepslib.php
index 75b3456974a87..09498e5af944d 100644
--- a/mod/forum/backup/moodle2/backup_forum_stepslib.php
+++ b/mod/forum/backup/moodle2/backup_forum_stepslib.php
@@ -58,7 +58,7 @@ protected function define_structure() {
         $post = new backup_nested_element('post', array('id'), array(
             'parent', 'userid', 'created', 'modified',
             'mailed', 'subject', 'message', 'messageformat',
-            'messagetrust', 'attachment', 'totalscore', 'mailnow'));
+            'messagetrust', 'attachment', 'totalscore', 'mailnow', 'privatereplyto'));
 
         $tags = new backup_nested_element('poststags');
         $tag = new backup_nested_element('tag', array('id'), array('itemid', 'rawname'));
diff --git a/mod/forum/classes/local/exporters/author.php b/mod/forum/classes/local/exporters/author.php
index 7ac48221d2c00..abc03f9f9e832 100644
--- a/mod/forum/classes/local/exporters/author.php
+++ b/mod/forum/classes/local/exporters/author.php
@@ -140,15 +140,27 @@ protected function get_other_values(renderer_base $output) {
         $author = $this->author;
         $authorcontextid = $this->authorcontextid;
         $urlfactory = $this->related['urlfactory'];
+        $context = $this->related['context'];
+        $forum = $this->related['forum'];
 
         if ($this->canview) {
-            $groups = array_map(function($group) {
-                $imageurl = get_group_picture_url($group, $group->courseid);
+            $groups = array_map(function($group) use ($urlfactory, $context) {
+                $imageurl = null;
+                $groupurl = null;
+                if (!$group->hidepicture) {
+                    $imageurl = get_group_picture_url($group, $group->courseid, true);
+                }
+                if (course_can_view_participants($context)) {
+                    $groupurl = $urlfactory->get_author_group_url($group);
+                }
+
                 return [
                     'id' => $group->id,
                     'name' => $group->name,
                     'urls' => [
-                        'image' => $imageurl ? $imageurl->out(false) : null
+                        'image' => $imageurl ? $imageurl->out(false) : null,
+                        'group' => $groupurl ? $groupurl->out(false) : null
+
                     ]
                 ];
             }, $this->authorgroups);
@@ -158,7 +170,7 @@ protected function get_other_values(renderer_base $output) {
                 'fullname' => $author->get_full_name(),
                 'groups' => $groups,
                 'urls' => [
-                    'profile' => ($urlfactory->get_author_profile_url($author))->out(false),
+                    'profile' => ($urlfactory->get_author_profile_url($author, $forum->get_course_id()))->out(false),
                     'profileimage' => ($urlfactory->get_author_profile_image_url($author, $authorcontextid))->out(false)
                 ]
             ];
@@ -184,7 +196,8 @@ protected function get_other_values(renderer_base $output) {
     protected static function define_related() {
         return [
             'urlfactory' => 'mod_forum\local\factories\url',
-            'context' => 'context'
+            'context' => 'context',
+            'forum' => 'mod_forum\local\entities\forum',
         ];
     }
 }
diff --git a/mod/forum/classes/local/exporters/discussion.php b/mod/forum/classes/local/exporters/discussion.php
index 16d682a1619ea..a008de4a73f53 100644
--- a/mod/forum/classes/local/exporters/discussion.php
+++ b/mod/forum/classes/local/exporters/discussion.php
@@ -179,7 +179,7 @@ protected function get_other_values(renderer_base $output) {
                 ];
 
                 if (!$group->hidepicture) {
-                    $url = get_group_picture_url($group, $forum->get_course_id());
+                    $url = get_group_picture_url($group, $forum->get_course_id(), true);
                     if (!empty($url)) {
                         $groupdata['urls']['picture'] = $url;
                     }
diff --git a/mod/forum/classes/local/exporters/discussion_summary.php b/mod/forum/classes/local/exporters/discussion_summary.php
index 4637cb9b080b1..13a075f0e5a80 100644
--- a/mod/forum/classes/local/exporters/discussion_summary.php
+++ b/mod/forum/classes/local/exporters/discussion_summary.php
@@ -140,6 +140,7 @@ protected function get_other_values(renderer_base $output) {
         $related = [
             'urlfactory' => $this->related['urlfactory'],
             'context' => $this->related['forum']->get_context(),
+            'forum' => $forum,
         ];
 
         $firstpostauthor = new author(
diff --git a/mod/forum/classes/local/exporters/forum.php b/mod/forum/classes/local/exporters/forum.php
index 40d4dd6604520..ad39615922885 100644
--- a/mod/forum/classes/local/exporters/forum.php
+++ b/mod/forum/classes/local/exporters/forum.php
@@ -119,6 +119,7 @@ protected function get_other_values(renderer_base $output) {
             'capabilities' => [
                 'viewdiscussions' => $capabilitymanager->can_view_discussions($user),
                 'create' => $capabilitymanager->can_create_discussions($user, $currentgroup),
+                'selfenrol' => $capabilitymanager->can_self_enrol($user),
                 'subscribe' => $capabilitymanager->can_subscribe_to_forum($user),
             ],
             'urls' => [
diff --git a/mod/forum/classes/local/exporters/post.php b/mod/forum/classes/local/exporters/post.php
index 4528c602d8e25..0d23672d37830 100644
--- a/mod/forum/classes/local/exporters/post.php
+++ b/mod/forum/classes/local/exporters/post.php
@@ -92,6 +92,7 @@ protected static function define_other_properties() {
         return [
             'id' => ['type' => PARAM_INT],
             'subject' => ['type' => PARAM_TEXT],
+            'replysubject' => ['type' => PARAM_TEXT],
             'message' => ['type' => PARAM_RAW],
             'messageformat' => ['type' => PARAM_INT],
             'author' => ['type' => author_exporter::read_properties_definition()],
@@ -146,6 +147,11 @@ protected static function define_other_properties() {
                         'null' => NULL_ALLOWED,
                         'description' => 'Whether the user can reply to the post',
                     ],
+                    'selfenrol' => [
+                        'type' => PARAM_BOOL,
+                        'null' => NULL_ALLOWED,
+                        'description' => 'Whether the user can self enrol into the course',
+                    ],
                     'export' => [
                         'type' => PARAM_BOOL,
                         'null' => NULL_ALLOWED,
@@ -360,6 +366,7 @@ protected function get_other_values(renderer_base $output) {
         $canreply = $capabilitymanager->can_reply_to_post($user, $discussion, $post);
         $canexport = $capabilitymanager->can_export_post($user, $post);
         $cancontrolreadstatus = $capabilitymanager->can_manually_control_post_read_status($user);
+        $canselfenrol = $capabilitymanager->can_self_enrol($user);
         $canreplyprivately = $capabilitymanager->can_reply_privately_to_post($user, $post);
 
         $urlfactory = $this->related['urlfactory'];
@@ -369,7 +376,7 @@ protected function get_other_values(renderer_base $output) {
         $editurl = $canedit ? $urlfactory->get_edit_post_url_from_post($forum, $post) : null;
         $deleteurl = $candelete ? $urlfactory->get_delete_post_url_from_post($post) : null;
         $spliturl = $cansplit ? $urlfactory->get_split_discussion_at_post_url_from_post($post) : null;
-        $replyurl = $canreply ? $urlfactory->get_reply_to_post_url_from_post($post) : null;
+        $replyurl = $canreply || $canselfenrol ? $urlfactory->get_reply_to_post_url_from_post($post) : null;
         $exporturl = $canexport ? $urlfactory->get_export_post_url_from_post($post) : null;
         $markasreadurl = $cancontrolreadstatus ? $urlfactory->get_mark_post_as_read_url_from_post($post) : null;
         $markasunreadurl = $cancontrolreadstatus ? $urlfactory->get_mark_post_as_unread_url_from_post($post) : null;
@@ -401,9 +408,16 @@ protected function get_other_values(renderer_base $output) {
             }
         }
 
+        $replysubject = $subject;
+        $strre = get_string('re', 'forum');
+        if (!(substr($replysubject, 0, strlen($strre)) == $strre)) {
+            $replysubject = "{$strre} {$replysubject}";
+        }
+
         return [
             'id' => $post->get_id(),
             'subject' => $subject,
+            'replysubject' => $replysubject,
             'message' => $message,
             'messageformat' => $post->get_message_format(),
             'author' => $exportedauthor,
@@ -424,7 +438,8 @@ protected function get_other_values(renderer_base $output) {
                 'reply' => $canreply,
                 'export' => $canexport,
                 'controlreadstatus' => $cancontrolreadstatus,
-                'canreplyprivately' => $canreplyprivately
+                'canreplyprivately' => $canreplyprivately,
+                'selfenrol' => $canselfenrol
             ],
             'urls' => [
                 'view' => $viewurl ? $viewurl->out(false) : null,
diff --git a/mod/forum/classes/local/factories/renderer.php b/mod/forum/classes/local/factories/renderer.php
index a8a7b0d3fa422..ec9fefa26d63a 100644
--- a/mod/forum/classes/local/factories/renderer.php
+++ b/mod/forum/classes/local/factories/renderer.php
@@ -277,7 +277,7 @@ public function get_posts_search_results_renderer(array $searchterms) : posts_re
         return new posts_renderer(
             $this->rendererbase,
             $this->builderfactory->get_exported_posts_builder(),
-            'mod_forum/forum_posts_with_context_links',
+            'mod_forum/forum_search_results',
             // Post process the exported posts to add the highlighting of the search terms to the post
             // and also the additional context links in the subject.
             function($exportedposts, $forumsbyid, $discussionsbyid) use ($searchterms, $urlfactory) {
@@ -481,11 +481,24 @@ function($discussions, $user, $forum) use ($capabilitymanager) {
                         $discussionentriesids,
                         $canseeanyprivatereply
                     );
+                $forumdatamapper = $this->legacydatamapperfactory->get_forum_data_mapper();
+                $forumrecord = $forumdatamapper->to_legacy_object($forum);
+                if (forum_tp_is_tracked($forumrecord, $user)) {
+                    $discussionunreadscount = $postvault->get_unread_count_for_discussion_ids(
+                            $user,
+                            $discussionentriesids,
+                            $canseeanyprivatereply
+                    );
+                } else {
+                    $discussionunreadscount = [];
+                }
 
-                array_walk($exportedposts['posts'], function($post) use ($discussionrepliescount) {
+                array_walk($exportedposts['posts'], function($post) use ($discussionrepliescount, $discussionunreadscount) {
                     $post->discussionrepliescount = $discussionrepliescount[$post->discussionid] ?? 0;
+                    $post->discussionunreadscount = $discussionunreadscount[$post->discussionid] ?? 0;
                     // TODO: Find a better solution due to language differences when defining the singular and plural form.
                     $post->isreplyplural = $post->discussionrepliescount != 1 ? true : false;
+                    $post->isunreadplural = $post->discussionunreadscount != 1 ? true : false;
                 });
 
                 $exportedposts['state']['hasdiscussions'] = $exportedposts['posts'] ? true : false;
diff --git a/mod/forum/classes/local/factories/url.php b/mod/forum/classes/local/factories/url.php
index ab0fc75b0569c..caae3d711efcc 100644
--- a/mod/forum/classes/local/factories/url.php
+++ b/mod/forum/classes/local/factories/url.php
@@ -394,11 +394,13 @@ public function get_export_attachment_url_from_post_and_attachment(post_entity $
      * Get the url to view an author's profile.
      *
      * @param author_entity $author The author
+     * @param int $courseid The course id
      * @return moodle_url
      */
-    public function get_author_profile_url(author_entity $author) : moodle_url {
+    public function get_author_profile_url(author_entity $author, int $courseid) : moodle_url {
         return new moodle_url('/user/view.php', [
-            'id' => $author->get_id()
+            'id' => $author->get_id(),
+            'course' => $courseid
         ]);
     }
 
@@ -427,6 +429,18 @@ public function get_author_profile_image_url(
         return $userpicture->get_url($PAGE);
     }
 
+    /**
+     * Get the url to view an author's group.
+     *
+     * @param \stdClass $group The group
+     * @return moodle_url
+     */
+    public function get_author_group_url(\stdClass $group) : moodle_url {
+        return new moodle_url('/user/index.php', [
+                'id' => $group->courseid,
+                'group' => $group->id
+        ]);
+    }
     /**
      * Get the url to mark a discussion as read.
      *
diff --git a/mod/forum/classes/local/managers/capability.php b/mod/forum/classes/local/managers/capability.php
index 76ba7c127dc2f..bebb27798adbf 100644
--- a/mod/forum/classes/local/managers/capability.php
+++ b/mod/forum/classes/local/managers/capability.php
@@ -60,6 +60,8 @@ class capability {
     private $forumrecord;
     /** @var context $context Module context for the forum */
     private $context;
+    /** @var array $canviewpostcache Cache of discussion posts that can be viewed by a user. */
+    protected $canviewpostcache = [];
 
     /**
      * Constructor.
@@ -360,12 +362,23 @@ public function can_view_post(stdClass $user, discussion_entity $discussion, pos
             return false;
         }
 
+        // Return cached can view if possible.
+        if (isset($this->canviewpostcache[$user->id][$post->get_id()])) {
+            return $this->canviewpostcache[$user->id][$post->get_id()];
+        }
+
+        // Otherwise, check if the user can see this post.
         $forum = $this->get_forum();
         $forumrecord = $this->get_forum_record();
         $discussionrecord = $this->get_discussion_record($discussion);
         $postrecord = $this->get_post_record($post);
         $coursemodule = $forum->get_course_module_record();
-        return forum_user_can_see_post($forumrecord, $discussionrecord, $postrecord, $user, $coursemodule, false);
+        $canviewpost = forum_user_can_see_post($forumrecord, $discussionrecord, $postrecord, $user, $coursemodule, false);
+
+        // Then cache the result before returning.
+        $this->canviewpostcache[$user->id][$post->get_id()] = $canviewpost;
+
+        return $canviewpost;
     }
 
     /**
@@ -484,6 +497,9 @@ public function can_reply_to_post(stdClass $user, discussion_entity $discussion,
         if ($post->is_private_reply()) {
             // It is not possible to reply to a private reply.
             return false;
+        } else if (!$this->can_view_post($user, $discussion, $post)) {
+            // If the user cannot view the post in the first place, the user should not be able to reply to the post.
+            return false;
         }
 
         return $this->can_post_in_discussion($user, $discussion);
@@ -607,4 +623,30 @@ public function can_manage_forum(stdClass $user) {
     public function can_manage_tags(stdClass $user) : bool {
         return has_capability('moodle/tag:manage', context_system::instance(), $user);
     }
+
+    /**
+     * Checks whether the user can self enrol into the course.
+     * Mimics the checks on the add button in deprecatedlib/forum_print_latest_discussions
+     *
+     * @param stdClass $user
+     * @return bool
+     */
+    public function can_self_enrol(stdClass $user) : bool {
+        $canstart = false;
+
+        if ($this->forum->get_type() != 'news') {
+            if (isguestuser($user) or !isloggedin()) {
+                $canstart = true;
+            }
+
+            if (!is_enrolled($this->context) and !is_viewing($this->context)) {
+                 // Allow guests and not-logged-in to see the button - they are prompted to log in after clicking the link,
+                 // Normal users with temporary guest access see this button too, they are asked to enrol instead,
+                 // Do not show the button to users with suspended enrolments here.
+                $canstart = enrol_selfenrol_available($this->forum->get_course_id());
+            }
+        }
+
+        return $canstart;
+    }
 }
diff --git a/mod/forum/classes/local/renderers/discussion.php b/mod/forum/classes/local/renderers/discussion.php
index 084122a7af7a3..de8d4128a973c 100644
--- a/mod/forum/classes/local/renderers/discussion.php
+++ b/mod/forum/classes/local/renderers/discussion.php
@@ -183,9 +183,15 @@ public function render(
             $exporteddiscussion = $this->get_exported_discussion($user);
         }
 
+        $hasanyactions = false;
+        $hasanyactions = $hasanyactions || $capabilitymanager->can_favourite_discussion($user);
+        $hasanyactions = $hasanyactions || $capabilitymanager->can_pin_discussions($user);
+        $hasanyactions = $hasanyactions || $capabilitymanager->can_manage_forum($user);
+
         $exporteddiscussion = array_merge($exporteddiscussion, [
             'notifications' => $this->get_notifications($user),
             'html' => [
+                'hasanyactions' => $hasanyactions,
                 'posts' => $this->postsrenderer->render($user, [$this->forum], [$this->discussion], $posts),
                 'modeselectorform' => $this->get_display_mode_selector_html($displaymode),
                 'subscribe' => null,
@@ -321,6 +327,9 @@ private function get_move_discussion_html() : ?string {
                 $select = new url_select($forummenu, '',
                         ['/mod/forum/discuss.php?d=' . $discussion->get_id() => get_string("movethisdiscussionto", "forum")],
                         'forummenu', get_string('move'));
+                $select->set_label(get_string('movethisdiscussionlabel', 'mod_forum'), [
+                    'class' => 'sr-only',
+                ]);
                 $html .= $this->renderer->render($select);
                 $html .= "</div>";
                 return $html;
diff --git a/mod/forum/classes/local/renderers/discussion_list.php b/mod/forum/classes/local/renderers/discussion_list.php
index ef136a35c0788..24879b1c2bb93 100644
--- a/mod/forum/classes/local/renderers/discussion_list.php
+++ b/mod/forum/classes/local/renderers/discussion_list.php
@@ -160,8 +160,15 @@ public function render(stdClass $user, \cm_info $cm, ?int $groupid, ?int $sortor
         // Get all forum discussion summaries.
         $discussions = mod_forum_get_discussion_summaries($forum, $user, $groupid, $sortorder, $pageno, $pagesize);
 
+        $capabilitymanager = $this->capabilitymanager;
+        $hasanyactions = false;
+        $hasanyactions = $hasanyactions || $capabilitymanager->can_favourite_discussion($user);
+        $hasanyactions = $hasanyactions || $capabilitymanager->can_pin_discussions($user);
+        $hasanyactions = $hasanyactions || $capabilitymanager->can_manage_forum($user);
+
         $forumview = [
             'forum' => (array) $forumexporter->export($this->renderer),
+            'hasanyactions' => $hasanyactions,
             'groupchangemenu' => groups_print_activity_menu(
                 $cm,
                 $this->urlfactory->get_forum_view_url_from_forum($forum),
diff --git a/mod/forum/classes/output/big_search_form.php b/mod/forum/classes/output/big_search_form.php
index b4ae556b0651c..919e46a180058 100644
--- a/mod/forum/classes/output/big_search_form.php
+++ b/mod/forum/classes/output/big_search_form.php
@@ -214,17 +214,19 @@ public function export_for_template(renderer_base $output) {
             $dateto = time() + HOURSECS;
         }
 
-        $data->datefromfields = html_writer::select_time('days', 'fromday', $datefrom)
-                              . html_writer::select_time('months', 'frommonth', $datefrom)
-                              . html_writer::select_time('years', 'fromyear', $datefrom)
-                              . html_writer::select_time('hours', 'fromhour', $datefrom)
-                              . html_writer::select_time('minutes', 'fromminute', $datefrom);
-
-        $data->datetofields = html_writer::select_time('days', 'today', $dateto)
-                            . html_writer::select_time('months', 'tomonth', $dateto)
-                            . html_writer::select_time('years', 'toyear', $dateto)
-                            . html_writer::select_time('hours', 'tohour', $dateto)
-                            . html_writer::select_time('minutes', 'tominute', $dateto);
+        $data->datefromfields = html_writer::div(html_writer::select_time('days', 'fromday', $datefrom), 'form-group fitem ml-2')
+                              . html_writer::div(html_writer::select_time('months', 'frommonth', $datefrom),
+                           'form-group fitem ml-2')
+                              . html_writer::div(html_writer::select_time('years', 'fromyear', $datefrom), 'form-group fitem ml-2')
+                              . html_writer::div(html_writer::select_time('hours', 'fromhour', $datefrom), 'form-group fitem ml-2')
+                              . html_writer::div(html_writer::select_time('minutes', 'fromminute', $datefrom),
+                           'form-group fitem ml-2');
+
+        $data->datetofields = html_writer::div(html_writer::select_time('days', 'today', $dateto), 'form-group fitem ml-2')
+                            . html_writer::div(html_writer::select_time('months', 'tomonth', $dateto), 'form-group fitem ml-2')
+                            . html_writer::div(html_writer::select_time('years', 'toyear', $dateto), 'form-group fitem ml-2')
+                            . html_writer::div(html_writer::select_time('hours', 'tohour', $dateto), 'form-group fitem ml-2')
+                            . html_writer::div(html_writer::select_time('minutes', 'tominute', $dateto), 'form-group fitem ml-2');
 
         if ($this->forumid && !empty($this->forumoptions)) {
             foreach ($this->forumoptions as $index => $option) {
diff --git a/mod/forum/classes/post_form.php b/mod/forum/classes/post_form.php
index a2b20e172d4a8..948468176fd7a 100644
--- a/mod/forum/classes/post_form.php
+++ b/mod/forum/classes/post_form.php
@@ -291,7 +291,7 @@ function definition() {
                 // Additional attribs to handle collapsible div.
                 ['data-toggle' => 'collapse', 'data-target' => "#collapseAddForm"]);
             $buttonarray[] = &$mform->createElement('submit', 'advancedadddiscussion',
-                get_string('advanced'), null, null, ['customclassoverride' => 'btn-link']);
+                get_string('showadvancededitor'), null, null, ['customclassoverride' => 'btn-link']);
 
             $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
             $mform->closeHeaderBefore('buttonar');
diff --git a/mod/forum/classes/subscriptions.php b/mod/forum/classes/subscriptions.php
index 74181b6e98207..ca4c7df2f90cf 100644
--- a/mod/forum/classes/subscriptions.php
+++ b/mod/forum/classes/subscriptions.php
@@ -272,7 +272,7 @@ public static function get_potential_subscribers($context, $groupid, $fields, $s
         $sql = "SELECT $fields
                 FROM {user} u
                 JOIN ($esql) je ON je.id = u.id
-               WHERE u.auth <> 'nologin' AND u.suspended = 0
+               WHERE u.auth <> 'nologin' AND u.suspended = 0 AND u.confirmed = 1
             ORDER BY $sort";
 
         return $DB->get_records_sql($sql, $params);
@@ -443,7 +443,7 @@ public static function fetch_subscribed_users($forum, $groupid = 0, $context = n
                         ) subscriptions
                         JOIN {user} u ON u.id = subscriptions.userid
                         JOIN ($esql) je ON je.id = u.id
-                        WHERE u.auth <> 'nologin' AND u.suspended = 0
+                        WHERE u.auth <> 'nologin' AND u.suspended = 0 AND u.confirmed = 1
                         ORDER BY u.email ASC";
 
             } else {
@@ -452,7 +452,7 @@ public static function fetch_subscribed_users($forum, $groupid = 0, $context = n
                         JOIN ($esql) je ON je.id = u.id
                         JOIN {forum_subscriptions} s ON s.userid = u.id
                         WHERE
-                          s.forum = :forumid AND u.auth <> 'nologin' AND u.suspended = 0
+                          s.forum = :forumid AND u.auth <> 'nologin' AND u.suspended = 0 AND u.confirmed = 1
                         ORDER BY u.email ASC";
             }
             $results = $DB->get_records_sql($sql, $params);
@@ -514,9 +514,12 @@ public static function fill_discussion_subscription_cache($forumid, $userid = nu
                         'userid' => $userid,
                         'forum' => $forumid,
                     ), null, 'id, discussion, preference');
+
+                    self::$forumdiscussioncache[$userid][$forumid] = array();
                     foreach ($subscriptions as $id => $data) {
                         self::add_to_discussion_cache($forumid, $userid, $data->discussion, $data->preference);
                     }
+
                     $subscriptions->close();
                 }
             } else {
diff --git a/mod/forum/classes/task/cron_task.php b/mod/forum/classes/task/cron_task.php
index ca3b41e3a8e08..e3627c551c4bb 100644
--- a/mod/forum/classes/task/cron_task.php
+++ b/mod/forum/classes/task/cron_task.php
@@ -338,6 +338,11 @@ protected function queue_user_tasks() {
                 $DB->insert_records('forum_queue', $digestpostdata);
                 $digesttime = usergetmidnight($timenow, $sitetimezone) + ($CFG->digestmailtime * 3600);
 
+                if ($digesttime < $timenow) {
+                    // Digest time is in the past. Get a new time for tomorrow.
+                    $digesttime = usergetmidnight($timenow + DAYSECS, $sitetimezone) + ($CFG->digestmailtime * 3600);
+                }
+
                 $task = new \mod_forum\task\send_user_digests();
                 $task->set_userid($user->id);
                 $task->set_component('mod_forum');
diff --git a/mod/forum/classes/task/send_user_digests.php b/mod/forum/classes/task/send_user_digests.php
index 148afc5e0e185..a625333b526ff 100644
--- a/mod/forum/classes/task/send_user_digests.php
+++ b/mod/forum/classes/task/send_user_digests.php
@@ -200,7 +200,7 @@ public function execute() {
             }
 
             if (!isset($this->viewfullnames[$forum->id])) {
-                $this->viewfullnames = has_capability('moodle/site:viewfullnames', $modcontext, $this->recipient->id);
+                $this->viewfullnames[$forum->id] = has_capability('moodle/site:viewfullnames', $modcontext, $this->recipient->id);
             }
 
             // Set the discussion storage values.
diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index 7addc739bc454..e91f06180be58 100644
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -154,5 +154,27 @@ function xmldb_forum_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2019040402, 'forum');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    if ($oldversion < 2019052001) {
+        $sql = "SELECT d.id AS discussionid, p.userid AS correctuser
+                FROM {forum_discussions} d
+                INNER JOIN {forum_posts} p ON p.id = d.firstpost
+                WHERE d.userid <> p.userid";
+        $recordset = $DB->get_recordset_sql($sql);
+        foreach ($recordset as $record) {
+            $object = new stdClass();
+            $object->id = $record->discussionid;
+            $object->userid = $record->correctuser;
+            $DB->update_record('forum_discussions', $object);
+        }
+
+        $recordset->close();
+
+        // Forum savepoint reached.
+        upgrade_mod_savepoint(true, 2019052001, 'forum');
+    }
+
     return true;
 }
diff --git a/mod/forum/externallib.php b/mod/forum/externallib.php
index 37f09d7b9ddd7..2be13db3ff640 100644
--- a/mod/forum/externallib.php
+++ b/mod/forum/externallib.php
@@ -93,8 +93,9 @@ public static function get_forums_by_courses($courseids = array()) {
 
                 $forum->name = external_format_string($forum->name, $context->id);
                 // Format the intro before being returning using the format setting.
-                list($forum->intro, $forum->introformat) = external_format_text($forum->intro, $forum->introformat,
-                                                                                $context->id, 'mod_forum', 'intro', null);
+                $options = array('noclean' => true);
+                list($forum->intro, $forum->introformat) =
+                    external_format_text($forum->intro, $forum->introformat, $context->id, 'mod_forum', 'intro', null, $options);
                 $forum->introfiles = external_util::get_area_files($context->id, 'mod_forum', 'intro', false, false);
                 // Discussions count. This function does static request cache.
                 $forum->numdiscussions = forum_count_discussions($forum, $cm, $course);
@@ -413,8 +414,10 @@ public static function get_forum_discussion_posts($discussionid, $sortby = "crea
 
             $post->subject = external_format_string($post->subject, $modcontext->id);
             // Rewrite embedded images URLs.
+            $options = array('trusted' => $post->messagetrust);
             list($post->message, $post->messageformat) =
-                external_format_text($post->message, $post->messageformat, $modcontext->id, 'mod_forum', 'post', $post->id);
+                external_format_text($post->message, $post->messageformat, $modcontext->id, 'mod_forum', 'post', $post->id,
+                    $options);
 
             // List attachments.
             if (!empty($post->attachment)) {
@@ -626,9 +629,10 @@ public static function get_forum_discussions_paginated($forumid, $sortby = 'time
                 $discussion->name = external_format_string($discussion->name, $modcontext->id);
                 $discussion->subject = external_format_string($discussion->subject, $modcontext->id);
                 // Rewrite embedded images URLs.
+                $options = array('trusted' => $discussion->messagetrust);
                 list($discussion->message, $discussion->messageformat) =
                     external_format_text($discussion->message, $discussion->messageformat,
-                                            $modcontext->id, 'mod_forum', 'post', $discussion->id);
+                                            $modcontext->id, 'mod_forum', 'post', $discussion->id, $options);
 
                 // List attachments.
                 if (!empty($discussion->attachment)) {
@@ -925,9 +929,10 @@ public static function get_forum_discussions(int $forumid, ?int $sortorder = -1,
                 $discussionobject->name = external_format_string($discussion->get_name(), $modcontext->id);
                 $discussionobject->subject = external_format_string($discussionobject->subject, $modcontext->id);
                 // Rewrite embedded images URLs.
+                $options = array('trusted' => $discussionobject->messagetrust);
                 list($discussionobject->message, $discussionobject->messageformat) =
                     external_format_text($discussionobject->message, $discussionobject->messageformat,
-                        $modcontext->id, 'mod_forum', 'post', $discussionobject->id);
+                        $modcontext->id, 'mod_forum', 'post', $discussionobject->id, $options);
 
                 // List attachments.
                 if (!empty($discussionobject->attachment)) {
@@ -1257,9 +1262,13 @@ public static function add_discussion_post($postid, $subject, $message, $options
         $context = context_module::instance($cm->id);
         self::validate_context($context);
 
+        $coursecontext = \context_course::instance($forum->get_course_id());
+        $discussionsubscribe = \mod_forum\subscriptions::get_user_default_subscription($forumrecord, $coursecontext,
+            $cm, null);
+
         // Validate options.
         $options = array(
-            'discussionsubscribe' => true,
+            'discussionsubscribe' => $discussionsubscribe,
             'private'             => false,
             'inlineattachmentsid' => 0,
             'attachmentsid' => null,
@@ -1306,7 +1315,7 @@ public static function add_discussion_post($postid, $subject, $message, $options
             $preferredformat = editors_get_preferred_format();
             // If the post is not HTML and the preferred format is HTML, convert to it.
             if ($params['messageformat'] != FORMAT_HTML and $preferredformat == FORMAT_HTML) {
-                $params['message'] = format_text($params['message'], $params['messageformat'], ['context' => $context]);
+                $params['message'] = format_text($params['message'], $params['messageformat'], ['filter' => false]);
             }
             $params['messageformat'] = $preferredformat;
         }
@@ -1350,9 +1359,11 @@ public static function add_discussion_post($postid, $subject, $message, $options
                 $completion->update_state($cm, COMPLETION_COMPLETE);
             }
 
-            $settings = new stdClass();
-            $settings->discussionsubscribe = $options['discussionsubscribe'];
-            forum_post_subscription($settings, $forumrecord, $discussionrecord);
+            if ($options['discussionsubscribe']) {
+                $settings = new stdClass();
+                $settings->discussionsubscribe = $options['discussionsubscribe'];
+                forum_post_subscription($settings, $forumrecord, $discussionrecord);
+            }
         } else {
             throw new moodle_exception('couldnotadd', 'forum');
         }
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index 12b78249fd590..a2dc2282ccf84 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -155,12 +155,12 @@
 $string['disallowsubscription_help'] = 'This forum has been configured so that you cannot subscribe to discussions.';
 $string['disallowsubscribeteacher'] = 'Subscriptions not allowed (except for teachers)';
 $string['discussion'] = 'Discussion';
-$string['discussionlistsortbycreatedasc'] = 'Sort the discussions list by the creation date in ascending order';
-$string['discussionlistsortbycreateddesc'] = 'Sort the discussions list by the creation date in descending order';
-$string['discussionlistsortbylastpostdesc'] = 'Sort the discussions list by the creation date of the last post in descending order';
-$string['discussionlistsortbylastpostasc'] = 'Sort the discussions list by the creation date of the last post in ascending order';
-$string['discussionlistsortbyrepliesasc'] = 'Sort the discussions list by the number of replies in ascending order';
-$string['discussionlistsortbyrepliesdesc'] = 'Sort the discussions list by the number of replies in descending order';
+$string['discussionlistsortbycreatedasc'] = 'Sort by creation date in ascending order';
+$string['discussionlistsortbycreateddesc'] = 'Sort by creation date in descending order';
+$string['discussionlistsortbylastpostdesc'] = 'Sort by last post creation date in descending order';
+$string['discussionlistsortbylastpostasc'] = 'Sort by last post creation date in ascending order';
+$string['discussionlistsortbyrepliesasc'] = 'Sort by number of replies in ascending order';
+$string['discussionlistsortbyrepliesdesc'] = 'Sort by number of replies in descending order';
 $string['discussionlocked'] = 'This discussion has been locked so you can no longer reply to it.';
 $string['discussionlockingheader'] = 'Discussion locking';
 $string['discussionlockingdisabled'] = 'Do not lock discussions';
@@ -183,6 +183,7 @@
 $string['discussionsstartedbyuserincourse'] = 'Discussions started by {$a->fullname} in {$a->coursename}';
 $string['discussionunpin'] = 'Unpin';
 $string['discussthistopic'] = 'Discuss this topic';
+$string['discusstopicname'] = 'Discuss the topic: {$a}';
 $string['displayend'] = 'Display end';
 $string['displayend_help'] = 'This setting specifies whether a forum post should be hidden after a certain date. Note that administrators can always view forum posts.';
 $string['displaymode'] = 'Display mode';
@@ -390,6 +391,7 @@
 $string['modulenameplural'] = 'Forums';
 $string['more'] = 'more';
 $string['movedmarker'] = '(Moved)';
+$string['movethisdiscussionlabel'] = 'Move the current discussion to the specified forum';
 $string['movethisdiscussionto'] = 'Move this discussion to ...';
 $string['mustprovidediscussionorpost'] = 'You must provide either a discussion id or post id to export';
 $string['myprofileownpost'] = 'My forum posts';
@@ -460,8 +462,8 @@
 $string['postadded'] = '<p>Your post was successfully added.</p> <p>You have {$a} to edit it if you want to make any changes.</p>';
 $string['postaddedsuccess'] = 'Your post was successfully added.';
 $string['postaddedtimeleft'] = 'You have {$a} to edit it if you want to make any changes.';
-$string['postbymailsuccess'] = 'Congratulations, your forum post with subject "{$a->subject}" was successfully added. You can view it at {$a->discussionurl}.';
-$string['postbymailsuccess_html'] = 'Congratulations, your <a href="{$a->discussionurl}">forum post</a> with subject "{$a->subject}" was successfully posted.';
+$string['postbymailsuccess'] = 'Your reply "{$a->subject}" was successfully posted: {$a->discussionurl}';
+$string['postbymailsuccess_html'] = 'Your reply <a href="{$a->discussionurl}">{$a->subject}</a> was successfully posted.';
 $string['postbyuser'] = '{$a->post} by {$a->user}';
 $string['postincontext'] = 'See this post in context';
 $string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
@@ -591,7 +593,7 @@
 $string['seeallposts'] = 'See all posts made by this user';
 $string['settings'] = 'Settings';
 $string['shortpost'] = 'Short post';
-$string['showingcountoftotaldiscussions'] = 'Showing {$a->count} of {$a->total} discussions';
+$string['showingcountoftotaldiscussions'] = 'List of discussions. Showing {$a->count} of {$a->total} discussions';
 $string['showsubscribers'] = 'Show/edit current subscribers';
 $string['singleforum'] = 'A single simple discussion';
 $string['smallmessage'] = '{$a->user} posted in {$a->forumname}';
@@ -632,6 +634,7 @@
 $string['timedposts'] = 'Timed posts';
 $string['timedvisible'] = 'Timed status: Visible to all users';
 $string['timestartenderror'] = 'Display end date cannot be earlier than the start date';
+$string['togglediscussionmenu'] = 'Toggle the discussion menu';
 $string['trackforum'] = 'Track unread posts';
 $string['trackreadposts_header'] = 'Forum tracking';
 $string['tracking'] = 'Track';
@@ -641,7 +644,7 @@
 $string['trackingtype'] = 'Read tracking';
 $string['trackingtype_help'] = 'Read tracking enables participants to easily check which posts they have not yet seen by highlighting any new posts.
 
-If set to optional, participants can choose whether to turn tracking on or off via a link in the administration block. (Users must also enable forum tracking in their forum preferences.)
+If set to optional, participants can choose whether to turn tracking on or off via a link in the actions menu or administration block, depending on the theme. (Users must also enable forum tracking in their forum preferences.)
 
 If \'Allow forced read tracking\' is enabled in the site administration, then a further option is available - forced. This means that tracking is always on, regardless of users\' forum preferences.';
 $string['unlockdiscussion'] = 'Unlock this discussion';
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 77631482ac1bf..7af5707bbffec 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -773,13 +773,22 @@ function forum_print_overview($courses,&$htmlarray) {
  * @return bool success
  */
 function forum_print_recent_activity($course, $viewfullnames, $timestart) {
-    global $CFG, $USER, $DB, $OUTPUT;
+    global $USER, $DB, $OUTPUT;
 
     // do not use log table if possible, it may be huge and is expensive to join with other tables
 
     $allnamefields = user_picture::fields('u', null, 'duserid');
-    if (!$posts = $DB->get_records_sql("SELECT p.*, f.type AS forumtype, d.forum, d.groupid,
-                                              d.timestart, d.timeend, $allnamefields
+    if (!$posts = $DB->get_records_sql("SELECT p.*,
+                                              f.course, f.type AS forumtype, f.name AS forumname, f.intro, f.introformat, f.duedate,
+                                              f.cutoffdate, f.assessed AS forumassessed, f.assesstimestart, f.assesstimefinish,
+                                              f.scale, f.maxbytes, f.maxattachments, f.forcesubscribe,
+                                              f.trackingtype, f.rsstype, f.rssarticles, f.timemodified, f.warnafter, f.blockafter,
+                                              f.blockperiod, f.completiondiscussions, f.completionreplies, f.completionposts,
+                                              f.displaywordcount, f.lockdiscussionafter,
+                                              d.name AS discussionname, d.firstpost, d.userid AS discussionstarter,
+                                              d.assessed AS discussionassessed, d.timemodified, d.usermodified, d.forum, d.groupid,
+                                              d.timestart, d.timeend, d.pinned, d.timelocked,
+                                              $allnamefields
                                          FROM {forum_posts} p
                                               JOIN {forum_discussions} d ON d.id = p.discussion
                                               JOIN {forum} f             ON f.id = d.forum
@@ -791,12 +800,14 @@ function forum_print_recent_activity($course, $viewfullnames, $timestart) {
 
     $modinfo = get_fast_modinfo($course);
 
-    $groupmodes = array();
-    $cms    = array();
-
     $strftimerecent = get_string('strftimerecent');
 
-    $printposts = array();
+    $managerfactory = mod_forum\local\container::get_manager_factory();
+    $entityfactory = mod_forum\local\container::get_entity_factory();
+
+    $discussions = [];
+    $capmanagers = [];
+    $printposts = [];
     foreach ($posts as $post) {
         if (!isset($modinfo->instances['forum'][$post->forum])) {
             // not visible
@@ -806,28 +817,79 @@ function forum_print_recent_activity($course, $viewfullnames, $timestart) {
         if (!$cm->uservisible) {
             continue;
         }
-        $context = context_module::instance($cm->id);
 
-        if (!has_capability('mod/forum:viewdiscussion', $context)) {
-            continue;
+        // Get the discussion. Cache if not yet available.
+        if (!isset($discussions[$post->discussion])) {
+            // Build the discussion record object from the post data.
+            $discussionrecord = (object)[
+                'id' => $post->discussion,
+                'course' => $post->course,
+                'forum' => $post->forum,
+                'name' => $post->discussionname,
+                'firstpost' => $post->firstpost,
+                'userid' => $post->discussionstarter,
+                'groupid' => $post->groupid,
+                'assessed' => $post->discussionassessed,
+                'timemodified' => $post->timemodified,
+                'usermodified' => $post->usermodified,
+                'timestart' => $post->timestart,
+                'timeend' => $post->timeend,
+                'pinned' => $post->pinned,
+                'timelocked' => $post->timelocked
+            ];
+            // Build the discussion entity from the factory and cache it.
+            $discussions[$post->discussion] = $entityfactory->get_discussion_from_stdclass($discussionrecord);
         }
+        $discussionentity = $discussions[$post->discussion];
 
-        if (!empty($CFG->forum_enabletimedposts) and $USER->id != $post->duserid
-          and (($post->timestart > 0 and $post->timestart > time()) or ($post->timeend > 0 and $post->timeend < time()))) {
-            if (!has_capability('mod/forum:viewhiddentimedposts', $context)) {
-                continue;
-            }
+        // Get the capability manager. Cache if not yet available.
+        if (!isset($capmanagers[$post->forum])) {
+            $context = context_module::instance($cm->id);
+            $coursemodule = $cm->get_course_module_record();
+            // Build the forum record object from the post data.
+            $forumrecord = (object)[
+                'id' => $post->forum,
+                'course' => $post->course,
+                'type' => $post->forumtype,
+                'name' => $post->forumname,
+                'intro' => $post->intro,
+                'introformat' => $post->introformat,
+                'duedate' => $post->duedate,
+                'cutoffdate' => $post->cutoffdate,
+                'assessed' => $post->forumassessed,
+                'assesstimestart' => $post->assesstimestart,
+                'assesstimefinish' => $post->assesstimefinish,
+                'scale' => $post->scale,
+                'maxbytes' => $post->maxbytes,
+                'maxattachments' => $post->maxattachments,
+                'forcesubscribe' => $post->forcesubscribe,
+                'trackingtype' => $post->trackingtype,
+                'rsstype' => $post->rsstype,
+                'rssarticles' => $post->rssarticles,
+                'timemodified' => $post->timemodified,
+                'warnafter' => $post->warnafter,
+                'blockafter' => $post->blockafter,
+                'blockperiod' => $post->blockperiod,
+                'completiondiscussions' => $post->completiondiscussions,
+                'completionreplies' => $post->completionreplies,
+                'completionposts' => $post->completionposts,
+                'displaywordcount' => $post->displaywordcount,
+                'lockdiscussionafter' => $post->lockdiscussionafter,
+            ];
+            // Build the forum entity from the factory.
+            $forumentity = $entityfactory->get_forum_from_stdclass($forumrecord, $context, $coursemodule, $course);
+            // Get the capability manager of this forum and cache it.
+            $capmanagers[$post->forum] = $managerfactory->get_capability_manager($forumentity);
         }
+        $capabilitymanager = $capmanagers[$post->forum];
 
-        if (!forum_post_is_visible_privately($post, $cm)) {
-            continue;
-        }
+        // Get the post entity.
+        $postentity = $entityfactory->get_post_from_stdclass($post);
 
-        // Check that the user can see the discussion.
-        if (forum_is_user_group_discussion($cm, $post->groupid)) {
+        // Check if the user can view the post.
+        if ($capabilitymanager->can_view_post($USER, $discussionentity, $postentity)) {
             $printposts[] = $post;
         }
-
     }
     unset($posts);
 
diff --git a/mod/forum/post.php b/mod/forum/post.php
index ec2fa0522755c..2b6eb40951fb4 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -35,6 +35,8 @@
 $confirm = optional_param('confirm', 0, PARAM_INT);
 $groupid = optional_param('groupid', null, PARAM_INT);
 $subject = optional_param('subject', '', PARAM_TEXT);
+
+// Values posted via the inpage reply form.
 $prefilledpost = optional_param('post', '', PARAM_TEXT);
 $prefilledpostformat = optional_param('postformat', FORMAT_MOODLE, PARAM_INT);
 $prefilledprivatereply = optional_param('privatereply', false, PARAM_BOOL);
@@ -154,7 +156,7 @@
                 $urlfactory->get_course_url_from_forum($forumentity),
                 get_string('activityiscurrentlyhidden'),
                 null,
-                \core\output\notice::NOTIFY_ERROR
+                \core\output\notification::NOTIFY_ERROR
             );
     }
 
@@ -385,7 +387,7 @@
                 $urlfactory->get_discussion_view_url_from_discussion($discussionentity),
                 get_string('cannotdeletepost', 'forum'),
                 null,
-                \core\output\notice::NOTIFY_ERROR
+                \core\output\notification::NOTIFY_ERROR
             );
     }
 
@@ -401,14 +403,14 @@
                     $urlfactory->get_discussion_view_url_from_discussion($discussionentity),
                     get_string('couldnotdeleteratings', 'rating'),
                     null,
-                    \core\output\notice::NOTIFY_ERROR
+                    \core\output\notification::NOTIFY_ERROR
                 );
         } else if ($replycount && !has_capability('mod/forum:deleteanypost', $modcontext)) {
             redirect(
                     $urlfactory->get_discussion_view_url_from_discussion($discussionentity),
-                    get_string('couldnotdeletereplies', 'rating'),
+                    get_string('couldnotdeletereplies', 'forum'),
                     null,
-                    \core\output\notice::NOTIFY_ERROR
+                    \core\output\notification::NOTIFY_ERROR
                 );
         } else {
             if (!$postentity->has_parent()) {
@@ -416,9 +418,9 @@
                 if ($forum->type == 'single') {
                     redirect(
                             $urlfactory->get_discussion_view_url_from_discussion($discussionentity),
-                            get_string('cannotdeletediscussioninsinglediscussion', 'rating'),
+                            get_string('cannotdeletediscussioninsinglediscussion', 'forum'),
                             null,
-                            \core\output\notice::NOTIFY_ERROR
+                            \core\output\notification::NOTIFY_ERROR
                         );
                 }
                 forum_delete_discussion($discussion, false, $course, $cm, $forum);
@@ -450,7 +452,7 @@
                             $urlfactory->get_discussion_view_url_from_post($postentity),
                             get_string('errorwhiledelete', 'forum'),
                             null,
-                            \core\output\notice::NOTIFY_ERROR
+                            \core\output\notification::NOTIFY_ERROR
                         );
                 }
 
@@ -483,9 +485,9 @@
             if (!has_capability('mod/forum:deleteanypost', $modcontext)) {
                 redirect(
                         forum_go_back_to($urlfactory->get_view_post_url_from_post($postentity)),
-                        get_string('couldnotdeletereplies', 'rating'),
+                        get_string('couldnotdeletereplies', 'forum'),
                         null,
-                        \core\output\notice::NOTIFY_ERROR
+                        \core\output\notification::NOTIFY_ERROR
                     );
             }
 
@@ -588,7 +590,7 @@
         $newdiscussion->forum        = $discussion->forum;
         $newdiscussion->name         = $name;
         $newdiscussion->firstpost    = $post->id;
-        $newdiscussion->userid       = $discussion->userid;
+        $newdiscussion->userid       = $post->userid;
         $newdiscussion->groupid      = $discussion->groupid;
         $newdiscussion->assessed     = $discussion->assessed;
         $newdiscussion->usermodified = $post->userid;
@@ -778,6 +780,25 @@
     (isset($discussion->id) ? array('discussion' => $discussion->id) : array())
 );
 
+// If we are being redirected via a no_submit_button press OR if the message is being prefilled.
+// then set the initial 'dirty' state.
+// - A prefilled post will exist when being redirected from the inpage reply form.
+// - A no_submit_button press occurs when being redirected from the inpage add new discussion post form.
+$dirty = $prefilledpost ? true : false;
+if ($mformpost->no_submit_button_pressed()) {
+    $data = $mformpost->get_submitted_data();
+
+    // If a no submit button has been pressed but the default values haven't been then reset the form change.
+    if (!$dirty && isset($data->message['text']) && !empty(trim($data->message['text']))) {
+        $dirty = true;
+    }
+
+    if (!$dirty && isset($data->message['message']) && !empty(trim($data->message['message']))) {
+        $dirty = true;
+    }
+}
+$mformpost->set_initial_dirty_state($dirty);
+
 if ($mformpost->is_cancelled()) {
     if (!isset($discussion->id) || $forum->type === 'single') {
         // Single forums don't have a discussion page.
diff --git a/mod/forum/renderer.php b/mod/forum/renderer.php
index 74c2d017aca8e..733b558f8ec1f 100644
--- a/mod/forum/renderer.php
+++ b/mod/forum/renderer.php
@@ -48,15 +48,17 @@ public function neighbouring_discussion_navigation($prev, $next) {
             if ($prev) {
                 $url = new moodle_url('/mod/forum/discuss.php', array('d' => $prev->id));
                 $html .= html_writer::start_tag('li', array('class' => 'prev-discussion'));
-                $html .= html_writer::link($url, format_string($prev->name),
-                    array('aria-label' => get_string('prevdiscussiona', 'mod_forum', format_string($prev->name))));
+                $html .= html_writer::link($url, $this->output->larrow() . ' ' . format_string($prev->name),
+                    array('aria-label' => get_string('prevdiscussiona', 'mod_forum', format_string($prev->name)),
+                    'class' => 'btn btn-link'));
                 $html .= html_writer::end_tag('li');
             }
             if ($next) {
                 $url = new moodle_url('/mod/forum/discuss.php', array('d' => $next->id));
                 $html .= html_writer::start_tag('li', array('class' => 'next-discussion'));
-                $html .= html_writer::link($url, format_string($next->name),
-                    array('aria-label' => get_string('nextdiscussiona', 'mod_forum', format_string($next->name))));
+                $html .= html_writer::link($url, format_string($next->name) . ' ' . $this->output->rarrow(),
+                    array('aria-label' => get_string('nextdiscussiona', 'mod_forum', format_string($next->name)),
+                    'class' => 'btn btn-link'));
                 $html .= html_writer::end_tag('li');
             }
             $html .= html_writer::end_tag('ul');
diff --git a/mod/forum/styles.css b/mod/forum/styles.css
index c7f31dd9a452b..43cb738229e3a 100644
--- a/mod/forum/styles.css
+++ b/mod/forum/styles.css
@@ -216,7 +216,8 @@
     margin: 5px 0;
 }
 
-.discussion-list .userpicture {
+.discussion-list .userpicture,
+.discussion-list .grouppicture {
     height: 35px;
     width: 35px;
 }
@@ -272,22 +273,7 @@ span.unread {
 .path-mod-forum .discussion-nav ul {
     margin: 0;
     list-style: none;
-}
-
-.path-mod-forum .discussion-nav .prev-discussion:before {
-    /*rtl:raw:
-    content: ' ► ';
-    */
-    /*rtl:remove*/
-    content: ' ◄ ';
-}
-
-.path-mod-forum .discussion-nav .next-discussion:after {
-    /*rtl:raw:
-    content: ' ◄ ';
-    */
-    /*rtl:remove*/
-    content: ' ► ';
+    padding-left: 0;
 }
 
 .path-mod-forum .discussion-nav .next-discussion {
diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 0c5fbdbedbc2c..8d8b8f9c49d57 100644
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -39,7 +39,7 @@
 $user           = optional_param('user', 0, PARAM_INT);        // The userid of the user to subscribe, defaults to $USER.
 $discussionid   = optional_param('d', null, PARAM_INT);        // The discussionid to subscribe.
 $sesskey        = optional_param('sesskey', null, PARAM_RAW);
-$returnurl      = optional_param('returnurl', null, PARAM_RAW);
+$returnurl      = optional_param('returnurl', null, PARAM_LOCALURL);
 
 $url = new moodle_url('/mod/forum/subscribe.php', array('id'=>$id));
 if (!is_null($mode)) {
diff --git a/mod/forum/templates/big_search_form.mustache b/mod/forum/templates/big_search_form.mustache
index 5c05e5c7edc7a..4ac32ec27992d 100644
--- a/mod/forum/templates/big_search_form.mustache
+++ b/mod/forum/templates/big_search_form.mustache
@@ -51,10 +51,10 @@
     {{#str}}searchforumintro, forum{{/str}}
 </div>
 <div class="box generalbox boxaligncenter">
-    <form id="searchform" action="{{actionurl}}" method="get">
+    <form id="searchform" class="mform" action="{{actionurl}}" method="get">
         <table class="searchbox table table-striped" id="form">
             <tr>
-                <td class="c0 text-xs-right">
+                <td class="c0 text-xs-right align-bottom">
                     <label for="words">{{#str}}searchwords, forum{{/str}}</label>
                     <input type="hidden" value="{{courseid}}" name="id">
                 </td>
@@ -63,7 +63,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="c0 text-xs-right">
+                <td class="c0 text-xs-right align-bottom">
                     <label for="phrase">{{#str}}searchphrase, forum{{/str}}</label>
                 </td>
                 <td class="c1">
@@ -71,7 +71,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="c0 text-xs-right">
+                <td class="c0 text-xs-right align-bottom">
                     <label for="notwords">{{#str}}searchnotwords, forum{{/str}}</label>
                 </td>
                 <td class="c1">
@@ -80,7 +80,7 @@
             </tr>
             {{#showfullwords}}
                 <tr>
-                    <td class="c0 text-xs-right">
+                    <td class="c0 text-xs-right align-bottom">
                         <label for="fullwords">{{#str}}searchfullwords, forum{{/str}}</label>
                     </td>
                     <td class="c1">
@@ -89,12 +89,14 @@
                 </tr>
             {{/showfullwords}}
             <tr>
-                <td class="c0 text-xs-right">
-                    {{#str}}searchdatefrom, forum{{/str}}
+                <td class="c0 text-xs-right align-bottom">
+                    <label for="timefromrestrict">{{#str}}searchdatefrom, forum{{/str}}</label>
                 </td>
                 <td class="c1 text-nowrap form-inline">
-                    <input type="checkbox" name="timefromrestrict" value="1" {{#datefromchecked}}checked{{/datefromchecked}}>
-                    {{{datefromfields}}}
+                    <div class="fdate_time_selector d-flex flex-wrap align-items-center">
+                        <input type="checkbox" name="timefromrestrict" value="1" {{#datefromchecked}}checked{{/datefromchecked}}>
+                        {{{datefromfields}}}
+                    </div>
                     <input type="hidden" name="hfromday" value="0">
                     <input type="hidden" name="hfrommonth" value="0">
                     <input type="hidden" name="hfromyear" value="0">
@@ -103,12 +105,14 @@
                 </td>
             </tr>
             <tr>
-                <td class="c0 text-xs-right">
-                    {{#str}}searchdateto, forum{{/str}}
+                <td class="c0 text-xs-right align-bottom">
+                    <label for="timetorestrict">{{#str}}searchdateto, forum{{/str}}</label>
                 </td>
                 <td class="c1 text-nowrap form-inline">
-                    <input type="checkbox" name="timetorestrict" value="1" {{#datetochecked}}checked{{/datetochecked}}>
-                    {{{datetofields}}}
+                    <div class="fdate_time_selector d-flex flex-wrap align-items-center">
+                        <input type="checkbox" name="timetorestrict" value="1" {{#datetochecked}}checked{{/datetochecked}}>
+                        {{{datetofields}}}
+                    </div>
                     <input type="hidden" name="htoday" value="0">
                     <input type="hidden" name="htomonth" value="0">
                     <input type="hidden" name="htoyear" value="0">
@@ -117,11 +121,11 @@
                 </td>
             </tr>
             <tr>
-                <td class="c0 text-xs-right">
+                <td class="c0 text-xs-right align-bottom">
                     <label for="menuforumid">{{#str}}searchwhichforums, forum{{/str}}</label>
                 </td>
                 <td class="c1">
-                    <select name="forumid" id="menuforumid" class="form-control">
+                    <select name="forumid" id="menuforumid" class="form-control custom-select">
                         {{#forumoptions}}
                             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
                         {{/forumoptions}}
@@ -129,7 +133,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="c0 text-xs-right">
+                <td class="c0 text-xs-right align-bottom">
                     <label for="subject">{{#str}}searchsubject, forum{{/str}}</label>
                 </td>
                 <td class="c1">
@@ -137,7 +141,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="c0 text-xs-right">
+                <td class="c0 text-xs-right align-bottom">
                     <label for="user">{{#str}}searchuser, forum{{/str}}</label>
                 </td>
                 <td class="c1">
@@ -147,7 +151,7 @@
             {{#tagsenabled}}
                 <tr>
                     <td class="c0">
-                        <label for="tags">{{#str}}searchtags, forum{{/str}}</label>
+                        <label for="tags" class="mt-1">{{#str}}searchtags, forum{{/str}}</label>
                     </td>
                     <td class="c1">
                         <select class="custom-select" name="tags[]"
diff --git a/mod/forum/templates/discussion_list.mustache b/mod/forum/templates/discussion_list.mustache
index 60e3704d270f0..d55339d64cd0b 100644
--- a/mod/forum/templates/discussion_list.mustache
+++ b/mod/forum/templates/discussion_list.mustache
@@ -51,20 +51,28 @@
             </div>
         </div>
     {{/forum.capabilities.create}}
+    {{^forum.capabilities.create}}
+        {{#forum.capabilities.selfenrol}}
+            <div class="p-t-1 p-b-1">
+                <a class="btn btn-primary" href="{{forum.urls.create}}">
+                    {{$discussion_create_text}}
+                        {{#str}}addanewdiscussion, forum{{/str}}
+                    {{/discussion_create_text}}
+                </a>
+            </div>
+        {{/forum.capabilities.selfenrol}}
+    {{/forum.capabilities.create}}
+
 
     {{#state.hasdiscussions}}
         {{$discussion_top_pagination}}
             {{{ pagination }}}
         {{/discussion_top_pagination}}
         {{$discussion_list_output}}
-            <span id="discussion-table-description-{{uniqid}}" class="sr-only">
-                {{#str}} showingcountoftotaldiscussions, mod_forum, {"count": "{{visiblediscussioncount}}", "total":"{{totaldiscussioncount}}"} {{/str}}
-            </span>
-            <table
-                class="table table-hover table-striped discussion-list"
-                aria-label='{{#str}} showingcountoftotaldiscussions, mod_forum, {"count": "{{visiblediscussioncount}}", "total":"{{totaldiscussioncount}}"} {{/str}}'
-                aria-describedby="discussion-table-description-{{uniqid}}"
-            >
+            <table class="table table-hover table-striped discussion-list">
+                <caption id="discussion-table-description-{{uniqid}}" class="sr-only">
+                    {{#str}} showingcountoftotaldiscussions, mod_forum, {"count": "{{visiblediscussioncount}}", "total":"{{totaldiscussioncount}}"} {{/str}}
+                </caption>
                 {{$discussion_list_header}}
                 <thead>
                     <tr>
@@ -123,9 +131,7 @@
                             {{/state.sortorder.iscreateddesc}}
                         </th>
                         <th scope="col">&nbsp;</th>
-                        {{#forum.capabilities.subscribe}}
-                            <th scope="col" class="discussionsubscription"></th>
-                        {{/forum.capabilities.subscribe}}
+                        <th scope="col" class="discussionsubscription"></th>
                     </tr>
                 </thead>
                 {{/discussion_list_header}}
@@ -134,7 +140,7 @@
                     {{#summaries}}
                         <!-- The discussion class is only required for behat tests to identify the row -->
                         <tr class="discussion {{#discussion.timed}}{{#istimed}}{{^visible}}dimmed_text{{/visible}}{{/istimed}}{{/discussion.timed}}">
-                            <td scope="col" class="pinned p-0 text-center align-middle">
+                            <td class="pinned p-0 text-center align-middle">
                                 {{#discussion.pinned}}
                                     {{#pix}}i/pinned, mod_forum, {{#str}}discussionpinned, mod_forum{{/str}}{{/pix}}
                                 {{/discussion.pinned}}
@@ -144,10 +150,10 @@
                                     {{/discussion}}
                                 {{/discussion.pinned}}
                             </td>
-                            <td scope="col" class="topic p-0 align-middle">
+                            <td class="topic p-0 align-middle">
                                 <a class="p-3 p-l-0 w-100 h-100 d-block" href="{{discussion.urls.view}}">{{{discussion.name}}}</a>
                             </td>
-                            <td scope="col" class="author align-middle">
+                            <td class="author align-middle">
                                 {{#firstpostauthor}}
                                     <div class="d-flex flex-row">
                                         <div class="align-middle p-0">
@@ -155,6 +161,7 @@
                                                 class="rounded-circle userpicture"
                                                 src="{{urls.profileimage}}"
                                                 alt="{{#str}}pictureof, moodle, {{fullname}}{{/str}}"
+                                                title="{{#str}}pictureof, moodle, {{fullname}}{{/str}}"
                                             >
                                         </div>
                                         <div class="align-middle p-2">
@@ -164,21 +171,28 @@
                                 {{/firstpostauthor}}
                             </td>
                             {{#forum.state.groupmode}}
-                                <td scope="col" class="group">
+                                <td class="group align-middle">
                                     {{#discussion.group}}
                                         {{#urls.picture}}
                                             {{#urls.userlist}}
-                                                <a href="{{{urls.userlist}}}">
-                                                    <img class="border rounded h-auto rounded-circle" src="{{{urls.picture}}}">
+                                                <a href="{{{urls.userlist}}}" role="button" aria-label='{{#str}} memberofgroup, group, {{name}}{{/str}}'>
+                                                    <img alt="{{#str}} pictureof, core, {{name}} {{/str}}"
+                                                         aria-hidden="true"
+                                                         class="border rounded h-auto rounded-circle grouppicture"
+                                                         src="{{{urls.picture}}}"
+                                                         title="{{#str}} pictureof, core, {{name}} {{/str}}">
                                                 </a>
                                             {{/urls.userlist}}
                                             {{^urls.userlist}}
-                                                <img class="border rounded h-auto rounded-circle" src="{{{urls.picture}}}">
+                                                <img alt="{{#str}} pictureof, core, {{name}} {{/str}}"
+                                                     class="border rounded h-auto rounded-circle grouppicture"
+                                                     src="{{{urls.picture}}}"
+                                                     title="{{#str}} pictureof, core, {{name}} {{/str}}">
                                             {{/urls.userlist}}
                                         {{/urls.picture}}
                                         {{^urls.picture}}
                                             {{#urls.userlist}}
-                                                <a href="{{{urls.userlist}}}">{{name}}</a>
+                                                <a href="{{{urls.userlist}}}" aria-label='{{#str}} memberofgroup, group, {{name}}{{/str}}'>{{name}}</a>
                                             {{/urls.userlist}}
                                             {{^urls.userlist}}
                                                 {{name}}
@@ -188,19 +202,19 @@
                                 </td>
                             {{/forum.state.groupmode}}
                             {{#forum.capabilities.viewdiscussions}}
-                                <td scope="col" class="p-0 text-center align-middle">
+                                <td class="p-0 text-center align-middle">
                                     <a href="{{discussion.urls.view}}" class="p-3 w-100 h-100 d-block">
                                         {{replies}}
                                     </a>
                                 </td>
                                 {{#forum.userstate.tracked}}
-                                    <td scope="col" class="p-0 text-center align-middle">
+                                    <td class="p-0 text-center align-middle">
                                         {{#unread}}
                                             {{! TODO Rewrite as AJAX}}
-                                            <div class="p-3 w-100 h-100 d-block">
+                                            <span class="p-1 w-100 h-100 d-block unread">
                                                 <a href="{{{discussion.urls.viewfirstunread}}}">{{unread}}</a>
                                                 <a href="{{{discussion.urls.markasread}}}">{{#pix}}t/markasread, core, {{#str}}markalldread, mod_forum{{/str}}{{/pix}}</a>
-                                            </div>
+                                            </span>
                                         {{/unread}}
                                         {{^unread}}
                                             <span class="p-3 w-100 h-100 d-block">
@@ -210,7 +224,7 @@
                                     </td>
                                 {{/forum.userstate.tracked}}
                             {{/forum.capabilities.viewdiscussions}}
-                            <td scope="col" class="text-left">
+                            <td class="text-left align-middle">
                                 {{! TODO Check q&a, eachuser }}
                                 {{#latestpostid}}
                                     <div class="d-flex flex-row">
@@ -220,6 +234,7 @@
                                                     class="rounded-circle userpicture"
                                                     src="{{latestpostauthor.urls.profileimage}}"
                                                     alt="{{#str}}pictureof, moodle, {{latestpostauthor.fullname}}{{/str}}"
+                                                    title="{{#str}}pictureof, moodle, {{latestpostauthor.fullname}}{{/str}}"
                                                 >
                                             </a>
                                         </div>
@@ -236,10 +251,10 @@
                                     </div>
                                 {{/latestpostid}}
                             </td>
-                            <td scope="col" class="text-left align-middle">
+                            <td class="text-left align-middle">
                                 {{#userdate}}{{discussion.times.created}}, {{#str}}strftimerecentfull{{/str}}{{/userdate}}
                             </td>
-                            <td scope="col" class="timed p-0 text-center align-middle">
+                            <td class="timed p-0 text-center align-middle">
                                 {{#discussion.timed.istimed}}
                                 <div class="timedpost">
                                     {{#pix}}
@@ -260,18 +275,22 @@
                                 </div>
                                 {{/discussion.timed.istimed}}
                             </td>
-                            <td scope="col" class="p-0 align-middle" data-container="discussion-summary-actions">
+                            <td class="p-0 align-middle" data-container="discussion-summary-actions">
                                 {{#discussion}}
                                     <div class="d-flex flex-wrap justify-content-end pr-4">
                                         <div class="pt-1 mt-2  {{^discussion.locked}}hidden{{/discussion.locked}}" data-region="locked-icon">
                                             <span class="btn" >{{#pix}}i/lock, core, {{#str}}locked, forum{{/str}}{{/pix}}</span>
                                         </div>
+                                        {{#forum.capabilities.subscribe}}
                                         <div>
                                             {{> mod_forum/discussion_subscription_toggle}}
                                         </div>
+                                        {{/forum.capabilities.subscribe}}
+                                        {{#hasanyactions}}
                                         <div class="mt-3" data-container='discussion-tools'>
                                             {{> mod_forum/forum_action_menu}}
                                         </div>
+                                        {{/hasanyactions}}
                                     </div>
                                 {{/discussion}}
                             </td>
diff --git a/mod/forum/templates/forum_action_menu.mustache b/mod/forum/templates/forum_action_menu.mustache
index 34eedee97775e..4df8a01618723 100644
--- a/mod/forum/templates/forum_action_menu.mustache
+++ b/mod/forum/templates/forum_action_menu.mustache
@@ -32,6 +32,7 @@
         aria-haspopup="true"
         tabindex="0"
         aria-controls="forum-action-menu-{{id}}-menu"
+        aria-label="{{#str}}togglediscussionmenu, mod_forum{{/str}}"
         aria-expanded="false">
         {{#settings.togglemoreicon}}
             {{#pix}} i/moremenu, core{{/pix}}
diff --git a/mod/forum/templates/forum_discussion.mustache b/mod/forum/templates/forum_discussion.mustache
index f4d37ff11016a..8d661ff164876 100644
--- a/mod/forum/templates/forum_discussion.mustache
+++ b/mod/forum/templates/forum_discussion.mustache
@@ -32,6 +32,7 @@
 
 <div id="discussion-container-{{uniqid}}" data-content="forum-discussion">
 {{#html}}
+    {{#hasanyactions}}
     <div class="d-flex flex-wrap flex-row-reverse m-b-1 text-right" data-container="discussion-tools">
 
         <div class="pl-1">
@@ -41,6 +42,7 @@
         </div>
         <div class="pl-1">{{{subscribe}}}</div>
     </div>
+    {{/hasanyactions}}
     {{{neighbourlinks}}}
 
     <div class="d-flex flex-wrap mb-1">
diff --git a/mod/forum/templates/forum_discussion_favourite_toggle.mustache b/mod/forum/templates/forum_discussion_favourite_toggle.mustache
index 7b0eaa0481871..79fef67ccb67f 100644
--- a/mod/forum/templates/forum_discussion_favourite_toggle.mustache
+++ b/mod/forum/templates/forum_discussion_favourite_toggle.mustache
@@ -31,7 +31,7 @@
 }}
 {{< mod_forum/discussion_favourite_toggle }}
     {{$classes}}btn btn-link{{/classes}}
-    {{$role}}{{/role}}
+    {{$role}}button{{/role}}
     {{$favouritecontent}}
         {{#userstate.favourited}}
             {{#pix}}t/star, mod_forum, {{#str}}removefromfavourites, mod_forum{{/str}}{{/pix}}
diff --git a/mod/forum/templates/forum_discussion_post.mustache b/mod/forum/templates/forum_discussion_post.mustache
index e5a8e1d1c4812..1187cb7c2aff4 100644
--- a/mod/forum/templates/forum_discussion_post.mustache
+++ b/mod/forum/templates/forum_discussion_post.mustache
@@ -36,7 +36,7 @@
     data-region="post"
     data-target="{{id}}-target"
     tabindex="0"
-    aria-labelledby="post-header-{{id}}"
+    aria-labelledby="post-header-{{id}}-{{uniqid}}"
     aria-describedby="post-content-{{id}}"
 >
     <!-- The firstpost and starter classes below aren't used for anything other than to identify the first post in behat -->
@@ -48,7 +48,7 @@
         {{#isfirstunread}}<a id="unread" aria-hidden="true"></a>{{/isfirstunread}}
 
         <div class="d-flex flex-column w-100"  data-region-content="forum-post-core">
-            <header  class="mb-2 header row d-flex">
+            <header id="post-header-{{id}}-{{uniqid}}" class="mb-2 header row d-flex">
                 {{^isdeleted}}
                     {{#author}}
                         <div class="mr-2" style="width: 45px;">
@@ -58,6 +58,7 @@
                                     src="{{{.}}}"
                                     alt="{{#str}} pictureof, core, {{author.fullname}} {{/str}}"
                                     aria-hidden="true"
+                                    title="{{#str}} pictureof, core, {{author.fullname}} {{/str}}"
                                 >
                             {{/urls.profileimage}}
                         </div>
@@ -67,7 +68,13 @@
                     {{#parentauthorname}}
                         <span class="sr-only">{{#str}} inreplyto, mod_forum, {{.}} {{/str}}</span>
                     {{/parentauthorname}}
-                    <h3 class="h6 font-weight-bold mb-0" data-region-content="forum-post-core-subject">{{$subject}}{{{subject}}}{{/subject}}</h3>
+                    {{$subjectheading}}
+                        <h3 {{!
+                            }}class="h6 font-weight-bold mb-0" {{!
+                            }}data-region-content="forum-post-core-subject" {{!
+                            }}data-reply-subject="{{replysubject}}" {{!
+                            }}>{{$subject}}{{{subject}}}{{/subject}}</h3>
+                    {{/subjectheading}}
                     {{^isdeleted}}
                         <address tabindex="-1">
                             {{#html.authorsubheading}}{{{.}}}{{/html.authorsubheading}}
@@ -94,14 +101,28 @@
                     {{#author}}
                         <div class="mr-2 author-groups-container" style="width: 45px; flex-shrink: 0">
                             {{#groups}}
-                                {{#urls.image}}
-                                    <img
-                                        class="rounded-circle w-100"
-                                        src="{{{.}}}"
-                                        alt="{{#str}} pictureof, core, {{name}} {{/str}}"
-                                        aria-hidden="true"
-                                    >
-                                {{/urls.image}}
+                                {{#urls.group}}
+                                    {{#urls.image}}
+                                        <a href="{{urls.group}}" role="button" aria-label='{{#str}} memberofgroup, group, {{name}}{{/str}}'>
+                                            <img
+                                                 class="rounded-circle w-100"
+                                                 src="{{{.}}}"
+                                                 alt="{{#str}} pictureof, core, {{name}} {{/str}}"
+                                                 aria-hidden="true"
+                                                 title="{{#str}} pictureof, core, {{name}} {{/str}}"
+                                            >
+                                        </a>
+                                    {{/urls.image}}
+                                {{/urls.group}}
+                                {{^urls.group}}
+                                    {{#urls.image}}
+                                        <img class="rounded-circle w-100"
+                                            src="{{{.}}}"
+                                            alt="{{#str}} pictureof, core, {{name}} {{/str}}"
+                                            title="{{#str}} pictureof, core, {{name}} {{/str}}"
+                                        >
+                                    {{/urls.image}}
+                                {{/urls.group}}
                             {{/groups}}
                         </div>
                     {{/author}}
@@ -181,6 +202,7 @@
                                                     class="btn btn-link"
                                                     title="{{#str}} permanentlinktopost, mod_forum {{/str}}"
                                                     aria-label="{{#str}} permanentlinktopost, mod_forum {{/str}}"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} permalink, mod_forum {{/str}}
                                                 </a>
@@ -191,6 +213,7 @@
                                                         data-region="post-action"
                                                         href="{{{urls.markasread}}}"
                                                         class="btn btn-link"
+                                                        role="menuitem"
                                                     >
                                                         {{#str}} markread, mod_forum {{/str}}
                                                     </a>
@@ -200,6 +223,7 @@
                                                         data-region="post-action"
                                                         href="{{{urls.markasunread}}}"
                                                         class="btn btn-link"
+                                                        role="menuitem"
                                                     >
                                                         {{#str}} markunread, mod_forum {{/str}}
                                                     </a>
@@ -212,6 +236,7 @@
                                                     class="btn btn-link"
                                                     title="{{#str}} permanentlinktoparentpost, mod_forum {{/str}}"
                                                     aria-label="{{#str}} permanentlinktoparentpost, mod_forum {{/str}}"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} parent, mod_forum {{/str}}
                                                 </a>
@@ -221,6 +246,7 @@
                                                     data-region="post-action"
                                                     href="{{{urls.edit}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} edit, mod_forum {{/str}}
                                                 </a>
@@ -230,6 +256,7 @@
                                                     data-region="post-action"
                                                     href="{{{urls.split}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} prune, mod_forum {{/str}}
                                                 </a>
@@ -239,6 +266,7 @@
                                                     data-region="post-action"
                                                     href="{{{urls.delete}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} delete, mod_forum {{/str}}
                                                 </a>
@@ -253,16 +281,34 @@
                                                         data-action="collapsible-link"
                                                         data-can-reply-privately="{{canreplyprivately}}"
                                                         title="{{#str}} reply, mod_forum {{/str}}"
+                                                        role="menuitem"
                                                     >
                                                         {{#str}} reply, mod_forum {{/str}}
                                                     </a>
                                                 {{/replyoutput}}
                                             {{/reply}}
+                                            {{^reply}}
+                                                {{#selfenrol}}
+                                                    {{$replyoutput}}
+                                                        <a
+                                                            href="{{{urls.reply}}}"
+                                                            class="btn btn-link"
+                                                            data-post-id="{{id}}"
+                                                            data-can-reply-privately="{{canreplyprivately}}"
+                                                            title="{{#str}} reply, mod_forum {{/str}}"
+                                                            role="menuitem"
+                                                        >
+                                                            {{#str}} reply, mod_forum {{/str}}
+                                                        </a>
+                                                    {{/replyoutput}}
+                                                {{/selfenrol}}
+                                            {{/reply}}
                                             {{#export}}
                                                 <a
                                                     data-region="post-action"
                                                     href="{{{urls.export}}}"
                                                     class="btn btn-link"
+                                                    role="menuitem"
                                                 >
                                                     {{#str}} addtoportfolio, core_portfolio {{/str}}
                                                 </a>
diff --git a/mod/forum/templates/forum_post_subject_with_context_links.mustache b/mod/forum/templates/forum_post_subject_with_context_links.mustache
new file mode 100644
index 0000000000000..06e60f9877479
--- /dev/null
+++ b/mod/forum/templates/forum_post_subject_with_context_links.mustache
@@ -0,0 +1,73 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_forum/forum_post_subject_with_context_links
+
+    Template to render a breadcrumb-style subject.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Example context (json):
+    {
+        "coursename": "Test course",
+        "forumname": "Test forum",
+        "discussionname": "Test discussion",
+        "subject": "Test post subject",
+        "urls": {
+            "viewcourse": "#",
+            "viewforum": "#",
+            "viewdiscussion": "#",
+            "viewparent": "#"
+        },
+        "showdiscussionname": true,
+        "hasparent": true
+    }
+}}
+{{#coursename}}
+    {{#urls.viewcourse}}
+        <a href="{{{urls.viewcourse}}}">{{{coursename}}}</a> ->
+    {{/urls.viewcourse}}
+    {{^urls.viewcourse}}
+        {{coursename}} ->
+    {{/urls.viewcourse}}
+{{/coursename}}
+{{#urls.viewforum}}
+    <a href="{{{urls.viewforum}}}">{{{forumname}}}</a>
+{{/urls.viewforum}}
+{{^urls.viewforum}}
+    {{{forumname}}}
+{{/urls.viewforum}}
+{{#showdiscussionname}}
+    {{#urls.viewdiscussion}}
+        -> <a href="{{{urls.viewdiscussion}}}">{{{discussionname}}}</a>
+    {{/urls.viewdiscussion}}
+    {{^urls.viewdiscussion}}
+        {{{discussionname}}}
+    {{/urls.viewdiscussion}}
+    {{#hasparent}}
+        {{#urls.viewparent}}
+            -> <a href="{{{urls.viewparent}}}">{{{subject}}}</a>
+        {{/urls.viewparent}}
+        {{^urls.viewparent}}
+            {{{subject}}}
+        {{/urls.viewparent}}
+    {{/hasparent}}
+{{/showdiscussionname}}
diff --git a/mod/forum/templates/forum_posts_with_context_links.mustache b/mod/forum/templates/forum_posts_with_context_links.mustache
index fdabc08603211..c7c512f0ecbca 100644
--- a/mod/forum/templates/forum_posts_with_context_links.mustache
+++ b/mod/forum/templates/forum_posts_with_context_links.mustache
@@ -33,36 +33,7 @@
 {{#posts}}
     {{< mod_forum/forum_discussion_post }}
         {{$subject}}
-            {{#coursename}}
-                {{#urls.viewcourse}}
-                    <a href="{{{urls.viewcourse}}}">{{{coursename}}}</a> ->
-                {{/urls.viewcourse}}
-                {{^urls.viewcourse}}
-                    {{coursename}} ->
-                {{/urls.viewcourse}}
-            {{/coursename}}
-            {{#urls.viewforum}}
-                <a href="{{{urls.viewforum}}}">{{{forumname}}}</a>
-            {{/urls.viewforum}}
-            {{^urls.viewforum}}
-                {{{forumname}}}
-            {{/urls.viewforum}}
-            {{#showdiscussionname}}
-                {{#urls.viewdiscussion}}
-                    -> <a href="{{{urls.viewdiscussion}}}">{{{discussionname}}}</a>
-                {{/urls.viewdiscussion}}
-                {{^urls.viewdiscussion}}
-                    {{{discussionname}}}
-                {{/urls.viewdiscussion}}
-                {{#hasparent}}
-                    {{#urls.viewparent}}
-                        -> <a href="{{{urls.viewparent}}}">{{{subject}}}</a>
-                    {{/urls.viewparent}}
-                    {{^urls.viewparent}}
-                        {{{subject}}}
-                    {{/urls.viewparent}}
-                {{/hasparent}}
-            {{/showdiscussionname}}
+            {{> mod_forum/forum_post_subject_with_context_links }}
         {{/subject}}
         {{$replies}}{{/replies}}
         {{$footer}}
diff --git a/mod/forum/templates/forum_search_results.mustache b/mod/forum/templates/forum_search_results.mustache
new file mode 100644
index 0000000000000..9e8c85001f470
--- /dev/null
+++ b/mod/forum/templates/forum_search_results.mustache
@@ -0,0 +1,69 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_forum/forum_search_results
+
+    Template to render results for the forum post search.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Example context (json):
+    {
+        "posts": [
+            {
+                "id": 1,
+                "subject": "Re: Test discussion",
+                "message": "Reply to post by Sam Student",
+                "author": {
+                    "id": 2,
+                    "fullname": "Sam Student"
+                },
+                "discussionid": 3,
+                "capabilities": {
+                    "view": true,
+                    "edit": true,
+                    "delete": true,
+                    "split": true,
+                    "reply": true
+                },
+                "html": {
+                    "authorsubheading": "by <a href=\"#\">Sam Student<\/a> - <time>Friday, 7 February 2020, 11:55 AM<\/time>"
+                },
+                "forumname": "Forum",
+                "discussionname": "<span class=\"highlight\">Test<\/span> discussion",
+                "showdiscussionname": true
+            }
+        ]
+    }
+}}
+{{< mod_forum/forum_posts_with_context_links}}
+    {{$subjectheading}}
+        <h4 {{!
+            }}class="h6 font-weight-bold mb-0" {{!
+            }}data-region-content="forum-post-core-subject" {{!
+            }}data-reply-subject="{{replysubject}}" {{!
+            }}>
+            {{$subject}}
+                {{> mod_forum/forum_post_subject_with_context_links }}
+            {{/subject}}
+        </h4>
+    {{/subjectheading}}
+{{/ mod_forum/forum_posts_with_context_links}}
diff --git a/mod/forum/templates/inpage_reply.mustache b/mod/forum/templates/inpage_reply.mustache
index 8a99d1d356da8..de8970c382acb 100644
--- a/mod/forum/templates/inpage_reply.mustache
+++ b/mod/forum/templates/inpage_reply.mustache
@@ -38,10 +38,10 @@
         <form data-post-id="{{postid}}" id="inpage-reply-{{postid}}" data-content="inpage-reply-form" action="{{{reply_url}}}">
             <div class="row pb-1">
                 <span>
-                    <textarea rows="5" name="post" title="post" class="w-100" placeholder="{{#str}} replyplaceholder, forum {{/str}}"></textarea>
+                    <textarea rows="5" name="post" title="post" class="form-control" placeholder="{{#str}} replyplaceholder, forum {{/str}}"></textarea>
                     <input type="hidden" name="postformat" value="{{postformat}}"/>
                 </span>
-                <input type="hidden" name="subject" value="{{#str}} inpagereplysubject, forum, {{parentsubject}} {{/str}}"/>
+                <input type="hidden" name="subject" value="{{parentsubject}}"/>
                 <input type="hidden" name="reply" value="{{postid}}"/>
                 <input type="hidden" name="sesskey" value="{{sesskey}}"/>
             </div>
diff --git a/mod/forum/templates/social_discussion_list.mustache b/mod/forum/templates/social_discussion_list.mustache
index fc24f19068994..d37e6d6a94fb9 100644
--- a/mod/forum/templates/social_discussion_list.mustache
+++ b/mod/forum/templates/social_discussion_list.mustache
@@ -38,7 +38,12 @@
            {{< mod_forum/forum_discussion_post }}
                {{$footer}}
                    <div class="link text-right">
-                       <a href="{{urls.discuss}}">{{#str}}discussthistopic, forum{{/str}}</a>&nbsp;({{discussionrepliescount}}{{#isreplyplural}}{{#str}}repliesmany, forum{{/str}}{{/isreplyplural}}{{^isreplyplural}}{{#str}}repliesone, forum{{/str}}{{/isreplyplural}})
+                       <a href="{{urls.discuss}}"
+                          aria-label="{{#str}} discusstopicname, forum, {{subject}} {{/str}}">
+                           {{#str}}discussthistopic, forum{{/str}}
+                       </a>&nbsp;({{#isreplyplural}}{{#str}} repliesmany, forum, {{discussionrepliescount}} {{/str}}{{/isreplyplural}}{{^isreplyplural}}{{#str}} repliesone, forum, {{discussionrepliescount}} {{/str}}{{/isreplyplural}}{{#discussionunreadscount}}
+                       <span class="sep">/</span>
+                       <span class="unread"><a href="{{urls.discuss}}#unread">{{#isunreadplural}}{{#str}} unreadpostsnumber, mod_forum, {{discussionunreadscount}} {{/str}}{{/isunreadplural}}{{^isunreadplural}}{{#str}} unreadpostsone, mod_forum {{/str}}{{/isunreadplural}}</a></span>{{/discussionunreadscount}})
                    </div>
                {{/footer}}
                {{$replyoutput}}{{/replyoutput}}
diff --git a/mod/forum/tests/behat/app_basic_usage.feature b/mod/forum/tests/behat/app_basic_usage.feature
deleted file mode 100644
index 1cd4db6429962..0000000000000
--- a/mod/forum/tests/behat/app_basic_usage.feature
+++ /dev/null
@@ -1,62 +0,0 @@
-@mod @mod_forum @app @javascript
-Feature: Test basic usage in app
-  In order to participate in the forum while using the mobile app
-  As a student
-  I need basic forum functionality to work
-
-  Background:
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1        |
-    And the following "users" exist:
-      | username |
-      | student1 |
-    And the following "course enrolments" exist:
-      | user     | course | role    |
-      | student1 | C1     | student |
-    And the following "activities" exist:
-      | activity   | name            | intro       | course | idnumber | groupmode |
-      | forum      | Test forum name | Test forum  | C1     | forum    | 0         |
-
-  Scenario: Student starts a discussion
-    When I enter the app
-    And I log in as "student1"
-    And I press "Course 1" near "Course overview" in the app
-    And I press "Test forum name" in the app
-    And I press "Add a new discussion topic" in the app
-    And I set the field "Subject" to "My happy subject" in the app
-    And I set the field "Message" to "An awesome message" in the app
-    And I press "Post to forum" in the app
-    Then I should see "My happy subject"
-    And I should see "An awesome message"
-
-  Scenario: Student posts a reply
-    When I enter the app
-    And I log in as "student1"
-    And I press "Course 1" near "Course overview" in the app
-    And I press "Test forum name" in the app
-    And I press "Add a new discussion topic" in the app
-    And I set the field "Subject" to "DiscussionSubject" in the app
-    And I set the field "Message" to "DiscussionMessage" in the app
-    And I press "Post to forum" in the app
-    And I press "DiscussionSubject" in the app
-    And I press "Reply" in the app
-    And I set the field "Message" to "ReplyMessage" in the app
-    And I press "Post to forum" in the app
-    Then I should see "DiscussionMessage"
-    And I should see "ReplyMessage"
-
-  Scenario: Test that 'open in browser' works for forum
-    When I enter the app
-    And I change viewport size to "360x640"
-    And I log in as "student1"
-    And I press "Course 1" near "Course overview" in the app
-    And I press "Test forum name" in the app
-    And I press the page menu button in the app
-    And I press "Open in browser" in the app
-    And I switch to the browser tab opened by the app
-    And I log in as "student1"
-    Then I should see "Test forum name"
-    And I should see "Add a new discussion topic"
-    And I close the browser tab opened by the app
-    And I press the back button in the app
diff --git a/mod/forum/tests/behat/behat_mod_forum.php b/mod/forum/tests/behat/behat_mod_forum.php
index b721ec48e576b..5375996a7d5bb 100644
--- a/mod/forum/tests/behat/behat_mod_forum.php
+++ b/mod/forum/tests/behat/behat_mod_forum.php
@@ -49,6 +49,17 @@ public function i_add_a_new_topic_to_forum_with($forumname, TableNode $table) {
         $this->add_new_discussion($forumname, $table, get_string('addanewtopic', 'forum'));
     }
 
+    /**
+     * Adds a Q&A discussion to the Q&A-type forum specified by it's name with the provided table data.
+     *
+     * @Given /^I add a new question to "(?P<forum_name_string>(?:[^"]|\\")*)" forum with:$/
+     * @param string $forumname
+     * @param TableNode $table
+     */
+    public function i_add_a_new_question_to_forum_with($forumname, TableNode $table) {
+        $this->add_new_discussion($forumname, $table, get_string('addanewquestion', 'forum'));
+    }
+
     /**
      * Adds a discussion to the forum specified by it's name with the provided table data (usually Subject and Message). The step begins from the forum's course page.
      *
@@ -156,7 +167,7 @@ protected function add_new_discussion($forumname, TableNode $table, $buttonstr)
         // Navigate to forum.
         $this->execute('behat_general::click_link', $this->escape($forumname));
         $this->execute('behat_general::click_link', $buttonstr);
-        $this->execute('behat_forms::press_button', get_string('advanced'));
+        $this->execute('behat_forms::press_button', get_string('showadvancededitor'));
 
         $this->fill_new_discussion_form($table);
     }
diff --git a/mod/forum/tests/behat/edit_post_student.feature b/mod/forum/tests/behat/edit_post_student.feature
index 7a44ae79265b3..42e66bc658f4d 100644
--- a/mod/forum/tests/behat/edit_post_student.feature
+++ b/mod/forum/tests/behat/edit_post_student.feature
@@ -44,9 +44,8 @@ Feature: Students can edit or delete their forum posts within a set time limit
   Scenario: Time limit expires
     Given I log out
     And I log in as "admin"
-    And I navigate to "Security > Site security settings" in site administration
-    And I set the field "Maximum time to edit posts" to "1 minutes"
-    And I press "Save changes"
+    And the following config values are set as admin:
+      | maxeditingtime | 1 |
     And I am on "Course 1" course homepage with editing mode on
     And I add the "Recent activity" block
     And I log out
@@ -54,7 +53,7 @@ Feature: Students can edit or delete their forum posts within a set time limit
     And I am on "Course 1" course homepage
     And I should see "New forum posts:" in the "Recent activity" "block"
     And I should see "Forum post subject" in the "Recent activity" "block"
-    When I wait "61" seconds
+    When I wait "2" seconds
     And I follow "Forum post subject"
     Then I should not see "Edit" in the "region-main" "region"
     And I should not see "Delete" in the "region-main" "region"
diff --git a/mod/forum/tests/behat/recent_activity.feature b/mod/forum/tests/behat/recent_activity.feature
new file mode 100644
index 0000000000000..382e2f02c152b
--- /dev/null
+++ b/mod/forum/tests/behat/recent_activity.feature
@@ -0,0 +1,141 @@
+@mod @mod_forum @block_recent_activity
+Feature: Users can see the relevant recent forum posts from the recent activity block
+  In order to quickly see the updates from forums in my course
+  As a user
+  I need to be able to see the recent forum posts in the recent activity block
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname  | lastname  | email                 |
+      | student1 | Student    | 1         | student1@example.com  |
+      | student2 | Student    | 2         | student2@example.com  |
+      | teacher1 | Teacher    | 1         | teacher1@example.com  |
+    And the following "courses" exist:
+      | fullname | shortname  | category  |
+      | Course 1 | C1         | 0         |
+    And the following "course enrolments" exist:
+      | user      | course  | role            |
+      | student1  | C1      | student         |
+      | student2  | C1      | student         |
+      | teacher1  | C1      | editingteacher  |
+    And the following "groups" exist:
+      | name    | course  | idnumber  |
+      | Group 1 | C1      | G1        |
+      | Group 2 | C1      | G2        |
+    And the following "group members" exist:
+      | user     | group  |
+      | student1 | G1     |
+      | student2 | G2     |
+      | teacher1 | G1     |
+      | teacher1 | G2     |
+    And the following "activities" exist:
+      | activity   | name                   | intro                       | course  | idnumber  | type    | groupmode | visible |
+      | forum      | Separate groups forum  | Separate groups description | C1      | forum1    | general | 1         | 1       |
+      | forum      | Visible groups forum   | Visible groups description  | C1      | forum2    | general | 2         | 1       |
+      | forum      | Standard forum         | Standard description        | C1      | forum3    | general | 0         | 1       |
+      | forum      | Hidden forum           | Hidden description          | C1      | forum4    | general | 0         | 0       |
+      | forum      | Q&A forum              | Q&A description             | C1      | forum5    | qanda   | 0         | 1       |
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Recent activity" block
+
+  Scenario: Recent forum activity with separate group discussion
+    Given I add a new discussion to "Separate groups forum" forum with:
+      | Subject | Group 1 separate discussion |
+      | Message | Group 1 members only        |
+      | Group   | Group 1                     |
+    And I log out
+    And I log in as "student1"
+    When I am on "Course 1" course homepage
+    Then I should see "Group 1 separate discussion" in the "Recent activity" "block"
+    And I log out
+    And I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I should not see "Group 1 separate discussion" in the "Recent activity" "block"
+
+  Scenario: Recent forum activity with visible groups discussion
+    Given I add a new discussion to "Visible groups forum" forum with:
+      | Subject | Group 1 visible discussion    |
+      | Message | Not just for group 1 members  |
+      | Group   | Group 1                       |
+    And I log out
+    And I log in as "student1"
+    When I am on "Course 1" course homepage
+    Then I should see "Group 1 visible discussion" in the "Recent activity" "block"
+    And I log out
+    And I log in as "student2"
+    And I am on "Course 1" course homepage
+    And I should see "Group 1 visible discussion" in the "Recent activity" "block"
+
+  Scenario: Recent forum activity with recent post as a private reply
+    Given I add a new discussion to "Standard forum" forum with:
+      | Subject | Standard forum discussion             |
+      | Message | Discuss anything under the sun here!  |
+    And I reply "Standard forum discussion" post from "Standard forum" forum with:
+      | Subject         | Teacher's private reply |
+      | Message         | This is a private reply |
+      | Reply privately | 1                       |
+    And I am on "Course 1" course homepage
+    And I should see "Standard forum discussion" in the "Recent activity" "block"
+    And I should see "Teacher's private reply" in the "Recent activity" "block"
+    And I log out
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    Then I should see "Standard forum discussion" in the "Recent activity" "block"
+    But I should not see "Teacher's private reply" in the "Recent activity" "block"
+
+  Scenario: Recent forum activity with recent post in a hidden forum
+    Given I add a new discussion to "Hidden forum" forum with:
+      | Subject | Hidden discussion |
+      | Message | Should be hidden! |
+    And I am on "Course 1" course homepage
+    And I should see "Hidden discussion" in the "Recent activity" "block"
+    And I log out
+    And I log in as "student1"
+    When I am on "Course 1" course homepage
+    Then I should not see "Hidden discussion" in the "Recent activity" "block"
+
+  Scenario: Recent forum activity with question and answer forum
+    Given I add a new question to "Q&A forum" forum with:
+      | Subject | The egg vs the chicken                    |
+      | Message | Which came first? The egg or the chicken? |
+    And I log out
+    And I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I reply "The egg vs the chicken" post from "Q&A forum" forum with:
+      | Subject | Student 1's answer  |
+      | Message | The egg!            |
+    And I am on "Course 1" course homepage
+    And I should see "The egg vs the chicken" in the "Recent activity" "block"
+    And I should see "Student 1's answer" in the "Recent activity" "block"
+    And I log out
+    And I log in as "admin"
+    And the following config values are set as admin:
+      | maxeditingtime | 1 |
+    And I log out
+    When I log in as "student2"
+    And I am on "Course 1" course homepage
+    Then I should see "The egg vs the chicken" in the "Recent activity" "block"
+    But I should not see "Student 1's answer" in the "Recent activity" "block"
+    And I reply "The egg vs the chicken" post from "Q&A forum" forum with:
+      | Subject | Student 2's answer  |
+      | Message | The chicken, duh!   |
+    And I wait "2" seconds
+    And I am on "Course 1" course homepage
+    And I should see "Student 1's answer" in the "Recent activity" "block"
+    And I should see "Student 2's answer" in the "Recent activity" "block"
+
+  Scenario: Recent forum activity with timed discussion
+    Given I add a new discussion to "Standard forum" forum with:
+      | Subject           | Timed discussion                                  |
+      | Message           | Discuss anything under the sun here... no more!!! |
+      | timeend[enabled]  | 1                                                 |
+      | timeend[year]     | 2020                                              |
+      | timeend[month]    | 1                                                 |
+      | timeend[day]      | 1                                                 |
+    And I am on "Course 1" course homepage
+    And I should see "Timed discussion" in the "Recent activity" "block"
+    And I log out
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    Then I should not see "Timed discussion" in the "Recent activity" "block"
diff --git a/mod/forum/tests/exporters_author_test.php b/mod/forum/tests/exporters_author_test.php
index 9942e7f26e1a3..aa3d1f51c1301 100644
--- a/mod/forum/tests/exporters_author_test.php
+++ b/mod/forum/tests/exporters_author_test.php
@@ -62,7 +62,8 @@ public function test_export_author() {
 
         $exporter = new author_exporter($author, 1, [], true, [
             'urlfactory' => \mod_forum\local\container::get_url_factory(),
-            'context' => $context
+            'context' => $context,
+            'forum' => $forum,
         ]);
 
         $exportedauthor = $exporter->export($renderer);
@@ -102,7 +103,8 @@ public function test_export_author_with_groups() {
 
         $exporter = new author_exporter($author, 1, [$group], true, [
             'urlfactory' => \mod_forum\local\container::get_url_factory(),
-            'context' => $context
+            'context' => $context,
+            'forum' => $forum,
         ]);
 
         $exportedauthor = $exporter->export($renderer);
@@ -139,7 +141,8 @@ public function test_export_author_no_view_capability() {
 
         $exporter = new author_exporter($author, 1, [$group], false, [
             'urlfactory' => \mod_forum\local\container::get_url_factory(),
-            'context' => $context
+            'context' => $context,
+            'forum' => $forum,
         ]);
 
         $exportedauthor = $exporter->export($renderer);
diff --git a/mod/forum/tests/exporters_post_test.php b/mod/forum/tests/exporters_post_test.php
index 425abc73f48e4..67cbcdf5eb468 100644
--- a/mod/forum/tests/exporters_post_test.php
+++ b/mod/forum/tests/exporters_post_test.php
@@ -104,6 +104,7 @@ public function test_export_post() {
         $canexport = true;
         $cancontrolreadstatus = true;
         $canreplyprivately = true;
+        $canenrol = true;
         $capabilitymanager = new test_capability_manager(
             $canview,
             $canedit,
@@ -112,7 +113,8 @@ public function test_export_post() {
             $canreply,
             $canexport,
             $cancontrolreadstatus,
-            $canreplyprivately
+            $canreplyprivately,
+            $canenrol
         );
         $managerfactory = \mod_forum\local\container::get_manager_factory();
         $entityfactory = \mod_forum\local\container::get_entity_factory();
@@ -157,6 +159,7 @@ public function test_export_post() {
         $this->assertEquals($cansplit, $exportedpost->capabilities['split']);
         $this->assertEquals($canreply, $exportedpost->capabilities['reply']);
         $this->assertEquals($canexport, $exportedpost->capabilities['export']);
+        $this->assertEquals($canenrol, $exportedpost->capabilities['selfenrol']);
         $this->assertEquals($cancontrolreadstatus, $exportedpost->capabilities['controlreadstatus']);
         $this->assertNotEmpty($exportedpost->urls['view']);
         $this->assertNotEmpty($exportedpost->urls['viewisolated']);
@@ -416,6 +419,8 @@ class test_capability_manager extends capability_manager {
     private $controlreadstatus;
     /** @var bool $controlreadstatus Value for can_reply_privately_to_post */
     private $canreplyprivatelytopost;
+    /** @var bool $canenrol Value for can_self_enrol */
+    private $canenrol;
 
     /**
      * Constructor.
@@ -436,7 +441,8 @@ public function __construct(
         bool $reply = true,
         bool $export = true,
         bool $controlreadstatus = true,
-        bool $canreplyprivatelytopost = true
+        bool $canreplyprivatelytopost = true,
+        bool $canenrol = true
     ) {
         $this->view = $view;
         $this->edit = $edit;
@@ -446,6 +452,7 @@ public function __construct(
         $this->export = $export;
         $this->controlreadstatus = $controlreadstatus;
         $this->canreplyprivatelytopost = $canreplyprivatelytopost;
+        $this->canenrol = $canenrol;
     }
 
     /**
@@ -538,4 +545,13 @@ public function can_manually_control_post_read_status(stdClass $user) : bool {
     public function can_reply_privately_to_post(stdClass $user, post_entity $post) : bool {
         return $this->canreplyprivatelytopost;
     }
+
+    /**
+     * Override can_self_enrol
+     * @param stdClass $user
+     * @return bool
+     */
+    public function can_self_enrol(stdClass $user) : bool {
+        return $this->canenrol;
+    }
 }
diff --git a/mod/forum/tests/externallib_test.php b/mod/forum/tests/externallib_test.php
index 5e903acbee59a..eb857a5a74d72 100644
--- a/mod/forum/tests/externallib_test.php
+++ b/mod/forum/tests/externallib_test.php
@@ -527,7 +527,7 @@ public function test_mod_forum_get_forum_discussion_posts() {
      * Tests is similar to the get_forum_discussion_posts only utilizing the new return structure and entities
      */
     public function test_mod_forum_get_discussion_posts() {
-        global $CFG, $PAGE;
+        global $CFG;
 
         $this->resetAfterTest(true);
 
@@ -538,6 +538,9 @@ public function test_mod_forum_get_discussion_posts() {
         $legacyfactory = mod_forum\local\container::get_legacy_data_mapper_factory();
         $entityfactory = mod_forum\local\container::get_entity_factory();
 
+        // Create course to add the module.
+        $course1 = self::getDataGenerator()->create_course();
+
         // Create a user who can track forums.
         $record = new stdClass();
         $record->trackforums = true;
@@ -550,7 +553,7 @@ public function test_mod_forum_get_discussion_posts() {
             'fullname' => fullname($user2),
             'groups' => [],
             'urls' => [
-                'profile' => $urlfactory->get_author_profile_url($user2entity),
+                'profile' => $urlfactory->get_author_profile_url($user2entity, $course1->id)->out(false),
                 'profileimage' => $urlfactory->get_author_profile_image_url($user2entity),
             ]
         ];
@@ -563,7 +566,7 @@ public function test_mod_forum_get_discussion_posts() {
             'fullname' => fullname($user3),
             'groups' => [],
             'urls' => [
-                'profile' => $urlfactory->get_author_profile_url($user3entity),
+                'profile' => $urlfactory->get_author_profile_url($user3entity, $course1->id)->out(false),
                 'profileimage' => $urlfactory->get_author_profile_image_url($user3entity),
             ]
         ];
@@ -573,9 +576,6 @@ public function test_mod_forum_get_discussion_posts() {
         // Set the first created user to the test user.
         self::setUser($user1);
 
-        // Create course to add the module.
-        $course1 = self::getDataGenerator()->create_course();
-
         // Forum with tracking off.
         $record = new stdClass();
         $record->course = $course1->id;
@@ -668,6 +668,7 @@ public function test_mod_forum_get_discussion_posts() {
             'hasparent' => true,
             'timecreated' => $discussion1reply2->created,
             'subject' => $discussion1reply2->subject,
+            'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply2->subject}",
             'message' => file_rewrite_pluginfile_urls($discussion1reply2->message, 'pluginfile.php',
                     $forum1context->id, 'mod_forum', 'post', $discussion1reply2->id),
             'messageformat' => 1,   // This value is usually changed by external_format_text() function.
@@ -682,7 +683,8 @@ public function test_mod_forum_get_discussion_posts() {
             'html' => [
                 'rating' => null,
                 'taglist' => null,
-                'authorsubheading' => $forumgenerator->get_author_subheading_html((object)$exporteduser3, $discussion1reply2->created)
+                'authorsubheading' => $forumgenerator->get_author_subheading_html((object)$exporteduser3,
+                        $discussion1reply2->created)
             ],
             'capabilities' => [
                 'view' => 1,
@@ -692,12 +694,14 @@ public function test_mod_forum_get_discussion_posts() {
                 'reply' => 1,
                 'export' => 0,
                 'controlreadstatus' => 0,
-                'canreplyprivately' => 0
+                'canreplyprivately' => 0,
+                'selfenrol' => 0
             ],
             'urls' => [
                 'view' => $urlfactory->get_view_post_url_from_post_id($discussion1reply2->discussion, $discussion1reply2->id),
                 'viewisolated' => $isolatedurl->out(false),
-                'viewparent' => $urlfactory->get_view_post_url_from_post_id($discussion1reply2->discussion, $discussion1reply2->parent),
+                'viewparent' => $urlfactory->get_view_post_url_from_post_id($discussion1reply2->discussion,
+                        $discussion1reply2->parent),
                 'edit' => null,
                 'delete' =>null,
                 'split' => null,
@@ -721,6 +725,7 @@ public function test_mod_forum_get_discussion_posts() {
             'hasparent' => true,
             'timecreated' => $discussion1reply1->created,
             'subject' => $discussion1reply1->subject,
+            'replysubject' => get_string('re', 'mod_forum') . " {$discussion1reply1->subject}",
             'message' => file_rewrite_pluginfile_urls($discussion1reply1->message, 'pluginfile.php',
                     $forum1context->id, 'mod_forum', 'post', $discussion1reply1->id),
             'messageformat' => 1,   // This value is usually changed by external_format_text() function.
@@ -735,7 +740,8 @@ public function test_mod_forum_get_discussion_posts() {
             'html' => [
                 'rating' => null,
                 'taglist' => null,
-                'authorsubheading' => $forumgenerator->get_author_subheading_html((object)$exporteduser2, $discussion1reply1->created)
+                'authorsubheading' => $forumgenerator->get_author_subheading_html((object)$exporteduser2,
+                        $discussion1reply1->created)
             ],
             'capabilities' => [
                 'view' => 1,
@@ -745,12 +751,14 @@ public function test_mod_forum_get_discussion_posts() {
                 'reply' => 1,
                 'export' => 0,
                 'controlreadstatus' => 0,
-                'canreplyprivately' => 0
+                'canreplyprivately' => 0,
+                'selfenrol' => 0
             ],
             'urls' => [
                 'view' => $urlfactory->get_view_post_url_from_post_id($discussion1reply1->discussion, $discussion1reply1->id),
                 'viewisolated' => $isolatedurl->out(false),
-                'viewparent' => $urlfactory->get_view_post_url_from_post_id($discussion1reply1->discussion, $discussion1reply1->parent),
+                'viewparent' => $urlfactory->get_view_post_url_from_post_id($discussion1reply1->discussion,
+                        $discussion1reply1->parent),
                 'edit' => null,
                 'delete' =>null,
                 'split' => null,
@@ -1687,6 +1695,92 @@ public function test_add_discussion_post() {
         }
     }
 
+    /**
+     * Test add_discussion_post and auto subscription to a discussion.
+     */
+    public function test_add_discussion_post_subscribe_discussion() {
+        global $USER;
+
+        $this->resetAfterTest(true);
+
+        self::setAdminUser();
+
+        $user = self::getDataGenerator()->create_user();
+        $admin = get_admin();
+        // Create course to add the module.
+        $course = self::getDataGenerator()->create_course(array('groupmode' => VISIBLEGROUPS, 'groupmodeforce' => 0));
+
+        $this->getDataGenerator()->enrol_user($user->id, $course->id);
+
+        // Forum with tracking off.
+        $record = new stdClass();
+        $record->course = $course->id;
+        $forum = self::getDataGenerator()->create_module('forum', $record);
+        $cm = get_coursemodule_from_id('forum', $forum->cmid, 0, false, MUST_EXIST);
+
+        // Add discussions to the forums.
+        $record = new stdClass();
+        $record->course = $course->id;
+        $record->userid = $admin->id;
+        $record->forum = $forum->id;
+        $discussion1 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
+        $discussion2 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
+
+        // Try to post as user.
+        self::setUser($user);
+        // Enable auto subscribe discussion.
+        $USER->autosubscribe = true;
+        // Add a discussion post in a forum discussion where the user is not subscribed (auto-subscribe preference enabled).
+        mod_forum_external::add_discussion_post($discussion1->firstpost, 'some subject', 'some text here...');
+
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion1->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // We receive the discussion and the post.
+        $this->assertEquals(2, count($posts['posts']));
+        // The user should be subscribed to the discussion after adding a discussion post.
+        $this->assertTrue(\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussion1->id, $cm));
+
+        // Disable auto subscribe discussion.
+        $USER->autosubscribe = false;
+        $this->assertTrue(\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussion1->id, $cm));
+        // Add a discussion post in a forum discussion where the user is subscribed (auto-subscribe preference disabled).
+        mod_forum_external::add_discussion_post($discussion1->firstpost, 'some subject 1', 'some text here 1...');
+
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion1->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // We receive the discussion and the post.
+        $this->assertEquals(3, count($posts['posts']));
+        // The user should still be subscribed to the discussion after adding a discussion post.
+        $this->assertTrue(\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussion1->id, $cm));
+
+        $this->assertFalse(\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussion2->id, $cm));
+        // Add a discussion post in a forum discussion where the user is not subscribed (auto-subscribe preference disabled).
+        mod_forum_external::add_discussion_post($discussion2->firstpost, 'some subject 2', 'some text here 2...');
+
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion2->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // We receive the discussion and the post.
+        $this->assertEquals(2, count($posts['posts']));
+        // The user should still not be subscribed to the discussion after adding a discussion post.
+        $this->assertFalse(\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussion2->id, $cm));
+
+        // Passing a value for the discussionsubscribe option parameter.
+        $this->assertFalse(\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussion2->id, $cm));
+        // Add a discussion post in a forum discussion where the user is not subscribed (auto-subscribe preference disabled),
+        // and the option parameter 'discussionsubscribe' => true in the webservice.
+        $option = array('name' => 'discussionsubscribe', 'value' => true);
+        $options[] = $option;
+        mod_forum_external::add_discussion_post($discussion2->firstpost, 'some subject 2', 'some text here 2...',
+            $options);
+
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion2->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // We receive the discussion and the post.
+        $this->assertEquals(3, count($posts['posts']));
+        // The user should now be subscribed to the discussion after adding a discussion post.
+        $this->assertTrue(\mod_forum\subscriptions::is_subscribed($user->id, $forum, $discussion2->id, $cm));
+    }
+
     /*
      * Test add_discussion. A basic test since all the API functions are already covered by unit tests.
      */
@@ -2264,4 +2358,130 @@ public function test_add_discussion_post_private() {
                 ],
             ]);
     }
+
+    /**
+     * Test trusted text enabled.
+     */
+    public function test_trusted_text_enabled() {
+        global $USER, $CFG;
+
+        $this->resetAfterTest(true);
+        $CFG->enabletrusttext = 1;
+
+        $dangeroustext = '<button>Untrusted text</button>';
+        $cleantext = 'Untrusted text';
+
+        // Create courses to add the modules.
+        $course = self::getDataGenerator()->create_course();
+        $user1 = self::getDataGenerator()->create_user();
+
+        // First forum with tracking off.
+        $record = new stdClass();
+        $record->course = $course->id;
+        $record->type = 'qanda';
+        $forum = self::getDataGenerator()->create_module('forum', $record);
+        $context = context_module::instance($forum->cmid);
+
+        // Add discussions to the forums.
+        $discussionrecord = new stdClass();
+        $discussionrecord->course = $course->id;
+        $discussionrecord->userid = $user1->id;
+        $discussionrecord->forum = $forum->id;
+        $discussionrecord->message = $dangeroustext;
+        $discussionrecord->messagetrust  = trusttext_trusted($context);
+        $discussion1 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($discussionrecord);
+
+        self::setAdminUser();
+        $discussionrecord->userid = $USER->id;
+        $discussionrecord->messagetrust  = trusttext_trusted($context);
+        $discussion2 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($discussionrecord);
+
+        $discussions = mod_forum_external::get_forum_discussions_paginated($forum->id);
+        $discussions = external_api::clean_returnvalue(mod_forum_external::get_forum_discussions_paginated_returns(), $discussions);
+
+        $this->assertCount(2, $discussions['discussions']);
+        $this->assertCount(0, $discussions['warnings']);
+        // Admin message is fully trusted.
+        $this->assertEquals(1, $discussions['discussions'][0]['messagetrust']);
+        $this->assertEquals($dangeroustext, $discussions['discussions'][0]['message']);
+        // Student message is not trusted.
+        $this->assertEquals(0, $discussions['discussions'][1]['messagetrust']);
+        $this->assertEquals($cleantext, $discussions['discussions'][1]['message']);
+
+        // Get posts now.
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion2->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // Admin message is fully trusted.
+        $this->assertEquals(1, $posts['posts'][0]['messagetrust']);
+        $this->assertEquals($dangeroustext, $posts['posts'][0]['message']);
+
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion1->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // Student message is not trusted.
+        $this->assertEquals(0, $posts['posts'][0]['messagetrust']);
+        $this->assertEquals($cleantext, $posts['posts'][0]['message']);
+    }
+
+    /**
+     * Test trusted text disabled.
+     */
+    public function test_trusted_text_disabled() {
+        global $USER, $CFG;
+
+        $this->resetAfterTest(true);
+        $CFG->enabletrusttext = 0;
+
+        $dangeroustext = '<button>Untrusted text</button>';
+        $cleantext = 'Untrusted text';
+
+        // Create courses to add the modules.
+        $course = self::getDataGenerator()->create_course();
+        $user1 = self::getDataGenerator()->create_user();
+
+        // First forum with tracking off.
+        $record = new stdClass();
+        $record->course = $course->id;
+        $record->type = 'qanda';
+        $forum = self::getDataGenerator()->create_module('forum', $record);
+        $context = context_module::instance($forum->cmid);
+
+        // Add discussions to the forums.
+        $discussionrecord = new stdClass();
+        $discussionrecord->course = $course->id;
+        $discussionrecord->userid = $user1->id;
+        $discussionrecord->forum = $forum->id;
+        $discussionrecord->message = $dangeroustext;
+        $discussionrecord->messagetrust  = trusttext_trusted($context);
+        $discussion1 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($discussionrecord);
+
+        self::setAdminUser();
+        $discussionrecord->userid = $USER->id;
+        $discussionrecord->messagetrust  = trusttext_trusted($context);
+        $discussion2 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($discussionrecord);
+
+        $discussions = mod_forum_external::get_forum_discussions($forum->id);
+        $discussions = external_api::clean_returnvalue(mod_forum_external::get_forum_discussions_returns(), $discussions);
+
+        $this->assertCount(2, $discussions['discussions']);
+        $this->assertCount(0, $discussions['warnings']);
+        // Admin message is not trusted because enabletrusttext is disabled.
+        $this->assertEquals(0, $discussions['discussions'][0]['messagetrust']);
+        $this->assertEquals($cleantext, $discussions['discussions'][0]['message']);
+        // Student message is not trusted.
+        $this->assertEquals(0, $discussions['discussions'][1]['messagetrust']);
+        $this->assertEquals($cleantext, $discussions['discussions'][1]['message']);
+
+        // Get posts now.
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion2->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // Admin message is not trusted because enabletrusttext is disabled.
+        $this->assertEquals(0, $posts['posts'][0]['messagetrust']);
+        $this->assertEquals($cleantext, $posts['posts'][0]['message']);
+
+        $posts = mod_forum_external::get_forum_discussion_posts($discussion1->id);
+        $posts = external_api::clean_returnvalue(mod_forum_external::get_forum_discussion_posts_returns(), $posts);
+        // Student message is not trusted.
+        $this->assertEquals(0, $posts['posts'][0]['messagetrust']);
+        $this->assertEquals($cleantext, $posts['posts'][0]['message']);
+    }
 }
diff --git a/mod/forum/tests/mail_test.php b/mod/forum/tests/mail_test.php
index 4b1654ce86823..c7f4a44d2a1c6 100644
--- a/mod/forum/tests/mail_test.php
+++ b/mod/forum/tests/mail_test.php
@@ -137,6 +137,7 @@ public function test_cron_message_includes_courseid() {
     }
 
     public function test_forced_subscription() {
+        global $DB;
         $this->resetAfterTest(true);
 
         // Create a course, with a forum.
@@ -145,8 +146,14 @@ public function test_forced_subscription() {
         $options = array('course' => $course->id, 'forcesubscribe' => FORUM_FORCESUBSCRIBE);
         $forum = $this->getDataGenerator()->create_module('forum', $options);
 
-        // Create two users enrolled in the course as students.
-        list($author, $recipient) = $this->helper_create_users($course, 2);
+        // Create users enrolled in the course as students.
+        list($author, $recipient, $unconfirmed, $deleted) = $this->helper_create_users($course, 4);
+
+        // Make the third user unconfirmed (thence inactive) to make sure it does not break the notifications.
+        $DB->set_field('user', 'confirmed', 0, ['id' => $unconfirmed->id]);
+
+        // Mark the fourth user as deleted to make sure it does not break the notifications.
+        $DB->set_field('user', 'deleted', 1, ['id' => $deleted->id]);
 
         // Post a discussion to the forum.
         list($discussion, $post) = $this->helper_post_to_forum($forum, $author);
@@ -160,11 +167,21 @@ public function test_forced_subscription() {
                 'userid' => $recipient->id,
                 'messages' => 1,
             ],
+            (object) [
+                'userid' => $unconfirmed->id,
+                'messages' => 0,
+            ],
+            (object) [
+                'userid' => $deleted->id,
+                'messages' => 0,
+            ],
         ];
         $this->queue_tasks_and_assert($expect);
 
         $this->send_notifications_and_assert($author, [$post]);
         $this->send_notifications_and_assert($recipient, [$post]);
+        $this->send_notifications_and_assert($unconfirmed, []);
+        $this->send_notifications_and_assert($deleted, []);
     }
 
     /**
@@ -1075,7 +1092,7 @@ public function forum_post_email_templates_provider() {
         $htmlbase['user']['mailformat'] = 1;
         $htmlbase['expectations'][0]['contents'] = array(
             '~{\$a',
-            '~&(amp|lt|gt|quot|\#039);(?!course)',
+            '~&(amp|lt|gt|quot|\#039);(?!course|lang|version|iosappid|androidappid)',
             '<div class="attachments">( *\n *)?<a href',
             '<div class="subject">\n.*Hello Moodle', '>Moodle Forum', '>Welcome.*Moodle', '>Love Moodle', '>1\d1');
         $htmlcases['HTML mail without ampersands, quotes or lt/gt'] = array('data' => $htmlbase);
@@ -1104,7 +1121,7 @@ public function forum_post_email_templates_provider() {
         $newcase['expectations'][0]['subject'] = '.*101.*HTML text and image';
         $newcase['expectations'][0]['contents'] = array(
             '~{\$a',
-            '~&(amp|lt|gt|quot|\#039);(?!course)',
+            '~&(amp|lt|gt|quot|\#039);(?!course|lang|version|iosappid|androidappid)',
             '<div class="attachments">( *\n *)?<a href',
             '<div class="subject">\n.*HTML text and image', '>Moodle Forum',
             '<p>Welcome to Moodle, '
diff --git a/mod/forum/tests/maildigest_test.php b/mod/forum/tests/maildigest_test.php
index 86a3613d46f72..e725f7570ec8f 100644
--- a/mod/forum/tests/maildigest_test.php
+++ b/mod/forum/tests/maildigest_test.php
@@ -360,6 +360,101 @@ public function test_cron_profile_digest_email() {
         $this->send_digests_and_assert($user, $posts);
     }
 
+    /**
+     * Send digests to a user who cannot view fullnames
+     */
+    public function test_cron_digest_view_fullnames_off() {
+        global $DB, $CFG;
+
+        $CFG->fullnamedisplay = 'lastname';
+        $this->resetAfterTest(true);
+
+        // Set up a basic user enrolled in a course.
+        $userhelper = $this->helper_setup_user_in_course();
+        $user = $userhelper->user;
+        $course1 = $userhelper->courses->course1;
+        $forum1 = $userhelper->forums->forum1;
+        $posts = [];
+
+        // Add 1 discussions to forum 1.
+        list($discussion, $post) = $this->helper_post_to_forum($forum1, $user, ['mailnow' => 1]);
+        $posts[] = $post;
+
+        // Set the tested user's default maildigest setting.
+        $DB->set_field('user', 'maildigest', 1, array('id' => $user->id));
+
+        // No digests mails should be sent, but 1 forum mails will be sent.
+        $expect = [
+            (object) [
+                'userid' => $user->id,
+                'messages' => 0,
+                'digests' => 1,
+            ],
+        ];
+        $this->queue_tasks_and_assert($expect);
+        $this->send_digests_and_assert($user, $posts);
+
+        // The user does not, by default, have permission to view the fullname.
+        $messagecontent = $this->messagesink->get_messages()[0]->fullmessage;
+
+        // Assert that the expected name is present (lastname only).
+        $this->assertContains(fullname($user, false), $messagecontent);
+
+        // Assert that the full name is not present (firstname lastname only).
+        $this->assertNotContains(fullname($user, true), $messagecontent);
+    }
+
+    /**
+     * Send digests to a user who can view fullnames.
+     */
+    public function test_cron_digest_view_fullnames_on() {
+        global $DB, $CFG;
+
+        $CFG->fullnamedisplay = 'lastname';
+        $this->resetAfterTest(true);
+
+        // Set up a basic user enrolled in a course.
+        $userhelper = $this->helper_setup_user_in_course();
+        $user = $userhelper->user;
+        $course1 = $userhelper->courses->course1;
+        $forum1 = $userhelper->forums->forum1;
+        $posts = [];
+        assign_capability(
+            'moodle/site:viewfullnames',
+            CAP_ALLOW,
+            $DB->get_field('role', 'id', ['shortname' => 'student']),
+            \context_course::instance($course1->id)
+        );
+
+        // Add 1 discussions to forum 1.
+        list($discussion, $post) = $this->helper_post_to_forum($forum1, $user, ['mailnow' => 1]);
+        $posts[] = $post;
+
+        // Set the tested user's default maildigest setting.
+        $DB->set_field('user', 'maildigest', 1, array('id' => $user->id));
+
+        // No digests mails should be sent, but 1 forum mails will be sent.
+        $expect = [
+            (object) [
+                'userid' => $user->id,
+                'messages' => 0,
+                'digests' => 1,
+            ],
+        ];
+        $this->queue_tasks_and_assert($expect);
+        $this->send_digests_and_assert($user, $posts);
+
+        // The user does not, by default, have permission to view the fullname.
+        // However we have given the user that capability so we expect to see both firstname and lastname.
+        $messagecontent = $this->messagesink->get_messages()[0]->fullmessage;
+
+        // Assert that the expected name is present (lastname only).
+        $this->assertContains(fullname($user, false), $messagecontent);
+
+        // Assert that the full name is also present (firstname lastname only).
+        $this->assertContains(fullname($user, true), $messagecontent);
+    }
+
     /**
      * Sends several notifications to one user as:
      * * daily digests coming from the per-forum setting; and
@@ -518,4 +613,85 @@ public function test_cron_forum_digest_email() {
 
         $this->send_digests_and_assert($user, $fulldigests, $shortdigests);
     }
+
+    /**
+     * The digest being in the past is queued til the next day.
+     */
+    public function test_cron_digest_previous_day() {
+        global $DB, $CFG;
+
+        $this->resetAfterTest(true);
+
+        // Set up a basic user enrolled in a course.
+        $userhelper = $this->helper_setup_user_in_course();
+        $user = $userhelper->user;
+        $course1 = $userhelper->courses->course1;
+        $forum1 = $userhelper->forums->forum1;
+        $forum2 = $userhelper->forums->forum2;
+        $fulldigests = [];
+        $shortdigests = [];
+
+        // Add 1 discussions to forum 1.
+        list($discussion, $post) = $this->helper_post_to_forum($forum1, $user, ['mailnow' => 1]);
+        $fulldigests[] = $post;
+
+        // Set the tested user's default maildigest setting.
+        $DB->set_field('user', 'maildigest', 1, array('id' => $user->id));
+
+        // Set the digest time to midnight.
+        $CFG->digestmailtime = 0;
+        // One digest e-mail should be sent, and no individual notifications.
+        $expect = [
+            (object) [
+                'userid' => $user->id,
+                'digests' => 1,
+            ],
+        ];
+        $this->queue_tasks_and_assert($expect);
+
+        $tasks = $DB->get_records('task_adhoc');
+        $task = reset($tasks);
+        $this->assertGreaterThanOrEqual(time(), $task->nextruntime);
+    }
+
+    /**
+     * The digest being in the past is queued til the next day.
+     */
+    public function test_cron_digest_same_day() {
+        global $DB, $CFG;
+
+        $this->resetAfterTest(true);
+
+        // Set up a basic user enrolled in a course.
+        $userhelper = $this->helper_setup_user_in_course();
+        $user = $userhelper->user;
+        $course1 = $userhelper->courses->course1;
+        $forum1 = $userhelper->forums->forum1;
+        $forum2 = $userhelper->forums->forum2;
+        $fulldigests = [];
+        $shortdigests = [];
+
+        // Add 1 discussions to forum 1.
+        list($discussion, $post) = $this->helper_post_to_forum($forum1, $user, ['mailnow' => 1]);
+        $fulldigests[] = $post;
+
+        // Set the tested user's default maildigest setting.
+        $DB->set_field('user', 'maildigest', 1, array('id' => $user->id));
+
+        // Set the digest time to the future (magic, shouldn't work).
+        $CFG->digestmailtime = 25;
+        // One digest e-mail should be sent, and no individual notifications.
+        $expect = [
+            (object) [
+                'userid' => $user->id,
+                'digests' => 1,
+            ],
+        ];
+        $this->queue_tasks_and_assert($expect);
+
+        $tasks = $DB->get_records('task_adhoc');
+        $task = reset($tasks);
+        $digesttime = usergetmidnight(time(), \core_date::get_server_timezone()) + ($CFG->digestmailtime * 3600);
+        $this->assertLessThanOrEqual($digesttime, $task->nextruntime);
+    }
 }
diff --git a/mod/forum/tests/managers_capability_test.php b/mod/forum/tests/managers_capability_test.php
index 2f8309db8fe07..075f08e1dbe0e 100644
--- a/mod/forum/tests/managers_capability_test.php
+++ b/mod/forum/tests/managers_capability_test.php
@@ -27,6 +27,7 @@
 global $CFG;
 require_once(__DIR__ . '/generator_trait.php');
 
+use mod_forum\local\entities\forum;
 use mod_forum\local\managers\capability as capability_manager;
 
 /**
@@ -36,7 +37,6 @@
  * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \mod_forum\local\managers\capability
- * @covers ::<!public>
  */
 class mod_forum_managers_capability_testcase extends advanced_testcase {
     // Make use of the test generator trait.
@@ -123,7 +123,7 @@ public function tearDown() {
      * Helper function to create a forum entity.
      *
      * @param array $forumproperties List of properties to override the prebuilt forum
-     * @return forum_entity
+     * @return forum
      */
     private function create_forum(array $forumproperties = []) {
         $forumrecord = (object) array_merge((array) $this->forumrecord, $forumproperties);
@@ -942,6 +942,52 @@ public function test_can_reply_to_post() {
         $this->assertFalse($capabilitymanager->can_reply_to_post($user, $discussion, $post));
     }
 
+    /**
+     * Test for \mod_forum\local\managers\capability::can_reply_to_post() involving Q & A forums.
+     */
+    public function test_can_reply_to_post_in_qanda_forum() {
+        global $CFG;
+
+        $this->resetAfterTest();
+
+        // Set max editing time to 10 seconds.
+        $CFG->maxeditingtime = 10;
+
+        $qandaforum = $this->create_forum(['type' => 'qanda']);
+        $datagenerator = $this->getDataGenerator();
+        $capabilitymanager = $this->managerfactory->get_capability_manager($qandaforum);
+
+        // Student 1.
+        $student1 = $datagenerator->create_user(['firstname' => 'S1']);
+        $datagenerator->enrol_user($student1->id, $this->course->id, 'student');
+        // Confirm Student 1 can reply to the question.
+        $this->assertTrue($capabilitymanager->can_reply_to_post($student1, $this->discussion, $this->post));
+
+        // Student 2.
+        $student2 = $datagenerator->create_user(['firstname' => 'S2']);
+        $datagenerator->enrol_user($student2->id, $this->course->id, 'student');
+        // Confirm Student 2 can reply to the question.
+        $this->assertTrue($capabilitymanager->can_reply_to_post($student2, $this->discussion, $this->post));
+
+        // Reply to the question as student 1.
+        $now = time();
+        $options = ['parent' => $this->post->get_id(), 'created' => $now - 100];
+        $student1post = $this->helper_post_to_discussion($this->forumrecord, $this->discussionrecord, $student1, $options);
+        $student1postentity = $this->entityfactory->get_post_from_stdclass($student1post);
+
+        // Confirm Student 2 cannot reply student 1's answer yet.
+        $this->assertFalse($capabilitymanager->can_reply_to_post($student2, $this->discussion, $student1postentity));
+
+        // Reply to the question as student 2.
+        $this->helper_post_to_discussion($this->forumrecord, $this->discussionrecord, $student2, $options);
+
+        // Reinitialise capability manager first to ensure we don't return cached values.
+        $capabilitymanager = $this->managerfactory->get_capability_manager($qandaforum);
+
+        // Confirm Student 2 can now reply to student 1's answer.
+        $this->assertTrue($capabilitymanager->can_reply_to_post($student2, $this->discussion, $student1postentity));
+    }
+
     /**
      * Ensure that can_reply_privately_to_post works as expected.
      *
diff --git a/mod/forum/tests/privacy_provider_test.php b/mod/forum/tests/privacy_provider_test.php
index d90dbf4bf0e50..ac7ff4ed39cd7 100644
--- a/mod/forum/tests/privacy_provider_test.php
+++ b/mod/forum/tests/privacy_provider_test.php
@@ -1470,10 +1470,13 @@ public function test_delete_data_for_user() {
         // 5 users * 2 forums * 1 file in each forum
         // Original total: 10
         // One post with file removed.
-        $this->assertCount(0, $DB->get_records_select('files', "itemid {$postinsql}", $postinparams));
+        $componentsql = "component = 'mod_forum' AND ";
+        $this->assertCount(0, $DB->get_records_select('files',
+            "{$componentsql} itemid {$postinsql}", $postinparams));
 
         // Files for the other posts should remain.
-        $this->assertCount(18, $DB->get_records_select('files', "filename <> '.' AND itemid {$otherpostinsql}", $otherpostinparams));
+        $this->assertCount(18, $DB->get_records_select('files',
+            "{$componentsql} filename <> '.' AND itemid {$otherpostinsql}", $otherpostinparams));
     }
 
     /**
@@ -1678,11 +1681,14 @@ public function test_delete_data_for_users() {
         // 5 users * 2 forums * 1 file in each forum
         // Original total: 10
         // One post with file removed.
-        $this->assertCount(0, $DB->get_records_select('files', "itemid {$postinsql}", $postinparams));
+        $componentsql = "component = 'mod_forum' AND ";
+        $this->assertCount(0, $DB->get_records_select('files',
+            "{$componentsql} itemid {$postinsql}", $postinparams));
 
         // Files for the other posts should remain.
         $this->assertCount(18,
-                $DB->get_records_select('files', "filename <> '.' AND itemid {$otherpostinsql}", $otherpostinparams));
+                $DB->get_records_select('files',
+                    "{$componentsql} filename <> '.' AND itemid {$otherpostinsql}", $otherpostinparams));
     }
 
     /**
diff --git a/mod/forum/tests/subscriptions_test.php b/mod/forum/tests/subscriptions_test.php
index 823140ac53673..df894958ce712 100644
--- a/mod/forum/tests/subscriptions_test.php
+++ b/mod/forum/tests/subscriptions_test.php
@@ -1036,7 +1036,7 @@ public function test_discussion_subscription_cache_prefill() {
         // Create a course, with a forum.
         $course = $this->getDataGenerator()->create_course();
 
-        $options = array('course' => $course->id, 'forcesubscribe' => FORUM_INITIALSUBSCRIBE);
+        $options = array('course' => $course->id, 'forcesubscribe' => FORUM_FORCESUBSCRIBE);
         $forum = $this->getDataGenerator()->create_module('forum', $options);
 
         // Create some users.
@@ -1045,6 +1045,8 @@ public function test_discussion_subscription_cache_prefill() {
         // Post some discussions to the forum.
         $discussions = array();
         $author = $users[0];
+        $userwithnosubs = $users[1];
+
         for ($i = 0; $i < 20; $i++) {
             list($discussion, $post) = $this->helper_post_to_forum($forum, $author);
             $discussions[] = $discussion;
@@ -1053,15 +1055,20 @@ public function test_discussion_subscription_cache_prefill() {
         // Unsubscribe half the users from the half the discussions.
         $forumcount = 0;
         $usercount = 0;
+        $userwithsubs = null;
         foreach ($discussions as $data) {
+            // Unsubscribe user from all discussions.
+            \mod_forum\subscriptions::unsubscribe_user_from_discussion($userwithnosubs->id, $data);
+
             if ($forumcount % 2) {
                 continue;
             }
             foreach ($users as $user) {
                 if ($usercount % 2) {
+                    $userwithsubs = $user;
                     continue;
                 }
-                \mod_forum\subscriptions::unsubscribe_user_from_discussion($user->id, $discussion);
+                \mod_forum\subscriptions::unsubscribe_user_from_discussion($user->id, $data);
                 $usercount++;
             }
             $forumcount++;
@@ -1071,6 +1078,25 @@ public function test_discussion_subscription_cache_prefill() {
         \mod_forum\subscriptions::reset_forum_cache();
         \mod_forum\subscriptions::reset_discussion_cache();
 
+        // A user with no subscriptions should only be fetched once.
+        $this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id, $userwithnosubs->id));
+        $startcount = $DB->perf_get_reads();
+        $this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id, $userwithnosubs->id));
+        $this->assertEquals($startcount, $DB->perf_get_reads());
+
+        // Confirm subsequent calls properly tries to fetch subs.
+        $this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id, $userwithsubs->id));
+        $this->assertNotEquals($startcount, $DB->perf_get_reads());
+
+        // Another read should be performed to get all subscriptions for the forum.
+        $startcount = $DB->perf_get_reads();
+        $this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id));
+        $this->assertNotEquals($startcount, $DB->perf_get_reads());
+
+        // Reset the subscription caches.
+        \mod_forum\subscriptions::reset_forum_cache();
+        \mod_forum\subscriptions::reset_discussion_cache();
+
         // Filling the discussion subscription cache should only use a single query.
         $startcount = $DB->perf_get_reads();
         $this->assertNull(\mod_forum\subscriptions::fill_discussion_subscription_cache($forum->id));
diff --git a/mod/forum/tests/vaults_forum_test.php b/mod/forum/tests/vaults_forum_test.php
index 3cb4a5bf76065..fbf72c77e1aaf 100644
--- a/mod/forum/tests/vaults_forum_test.php
+++ b/mod/forum/tests/vaults_forum_test.php
@@ -42,7 +42,6 @@ class mod_forum_vaults_forum_testcase extends advanced_testcase {
      * Test get_from_id.
      *
      * @covers ::get_from_id
-     * @covers ::<!public>
      */
     public function test_get_from_id() {
         $this->resetAfterTest();
@@ -63,7 +62,6 @@ public function test_get_from_id() {
      * Test get_from_course_module_id.
      *
      * @covers ::get_from_course_module_id
-     * @covers ::<!public>
      */
     public function test_get_from_course_module_id() {
         $this->resetAfterTest();
@@ -90,7 +88,6 @@ public function test_get_from_course_module_id() {
      * Test get_from_course_module_ids.
      *
      * @covers ::get_from_course_module_ids
-     * @covers ::<!public>
      */
     public function test_get_from_course_module_ids() {
         $this->resetAfterTest();
@@ -129,7 +126,6 @@ public function test_get_from_course_module_ids() {
      * Test get_from_post_id.
      *
      * @covers ::get_from_post_id
-     * @covers ::<!public>
      */
     public function test_get_from_post_id() {
         $this->resetAfterTest();
diff --git a/mod/forum/tests/vaults_post_test.php b/mod/forum/tests/vaults_post_test.php
index 3d3efadf19224..085b821dba8ea 100644
--- a/mod/forum/tests/vaults_post_test.php
+++ b/mod/forum/tests/vaults_post_test.php
@@ -77,7 +77,6 @@ public function test_get_from_id() {
      * Test get_from_discussion_id.
      *
      * @covers ::get_from_discussion_id
-     * @covers ::<!public>
      */
     public function test_get_from_discussion_id() {
         $this->resetAfterTest();
@@ -107,7 +106,6 @@ public function test_get_from_discussion_id() {
      * replies.
      *
      * @covers ::get_from_discussion_id
-     * @covers ::<!public>
      */
     public function test_get_from_discussion_id_private_replies() {
         $this->resetAfterTest();
@@ -168,7 +166,6 @@ public function test_get_from_discussion_ids_empty() {
      * Test get_from_discussion_ids.
      *
      * @covers ::get_from_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_from_discussion_ids() {
         $this->resetAfterTest();
@@ -201,7 +198,6 @@ public function test_get_from_discussion_ids() {
      * replies.
      *
      * @covers ::get_from_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_from_discussion_ids_private_replies() {
         $this->resetAfterTest();
@@ -251,7 +247,6 @@ public function test_get_from_discussion_ids_private_replies() {
      * Test get_replies_to_post.
      *
      * @covers ::get_replies_to_post
-     * @covers ::<!public>
      */
     public function test_get_replies_to_post() {
         $this->resetAfterTest();
@@ -300,7 +295,6 @@ public function test_get_replies_to_post() {
      * Test get_replies_to_post with private replies.
      *
      * @covers ::get_replies_to_post
-     * @covers ::<!public>
      */
     public function test_get_replies_to_post_private_replies() {
         $this->resetAfterTest();
@@ -477,7 +471,6 @@ public function test_get_reply_count_for_discussion_ids_empty() {
      * Test get_reply_count_for_discussion_ids.
      *
      * @covers ::get_reply_count_for_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_reply_count_for_discussion_ids() {
         $this->resetAfterTest();
@@ -527,7 +520,6 @@ public function test_get_reply_count_for_discussion_ids() {
      * Test get_reply_count_for_discussion_ids.
      *
      * @covers ::get_reply_count_for_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_reply_count_for_discussion_ids_private_replies() {
         $this->resetAfterTest();
@@ -578,7 +570,6 @@ public function test_get_reply_count_for_discussion_ids_private_replies() {
      * Test get_reply_count_for_discussion_id.
      *
      * @covers ::get_reply_count_for_post_id_in_discussion_id
-     * @covers ::<!public>
      */
     public function test_get_reply_count_for_post_id_in_discussion_id() {
         $this->resetAfterTest();
@@ -609,7 +600,6 @@ public function test_get_reply_count_for_post_id_in_discussion_id() {
      * Test get_reply_count_for_post_id_in_discussion_id.
      *
      * @covers ::get_reply_count_for_post_id_in_discussion_id
-     * @covers ::<!public>
      */
     public function test_get_reply_count_for_post_id_in_discussion_id_private_replies() {
         $this->resetAfterTest();
@@ -660,7 +650,6 @@ public function test_get_reply_count_for_post_id_in_discussion_id_private_replie
      * Test get_unread_count_for_discussion_ids.
      *
      * @covers ::get_unread_count_for_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_unread_count_for_discussion_ids() {
         global $CFG;
@@ -737,7 +726,6 @@ public function test_get_unread_count_for_discussion_ids_empty() {
      * Test get_latest_posts_for_discussion_ids.
      *
      * @covers ::get_latest_posts_for_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_latest_posts_for_discussion_ids() {
         $this->resetAfterTest();
@@ -800,7 +788,6 @@ public function test_get_latest_posts_for_discussion_ids() {
      * Test get_latest_posts_for_discussion_ids when no discussion ids were provided.
      *
      * @covers ::get_latest_posts_for_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_latest_posts_for_discussion_ids_empty() {
         $this->resetAfterTest();
@@ -817,7 +804,6 @@ public function test_get_latest_posts_for_discussion_ids_empty() {
      * Test get_first_post_for_discussion_ids.
      *
      * @covers ::get_first_post_for_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_first_post_for_discussion_ids() {
         $this->resetAfterTest();
@@ -865,7 +851,6 @@ public function test_get_first_post_for_discussion_ids() {
      * Test get_first_post_for_discussion_ids when no discussion ids were provided.
      *
      * @covers ::get_first_post_for_discussion_ids
-     * @covers ::<!public>
      */
     public function test_get_first_post_for_discussion_ids_empty() {
         $this->resetAfterTest();
diff --git a/mod/forum/version.php b/mod/forum/version.php
index 0e875b0e7906e..2777c1ffea8e8 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019052000;       // The current module version (Date: YYYYMMDDXX)
+$plugin->version   = 2019052001;       // The current module version (Date: YYYYMMDDXX)
 $plugin->requires  = 2019051100;       // Requires this Moodle version
 $plugin->component = 'mod_forum';      // Full name of the plugin (used for diagnostics)
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 5e489dfb7a862..6e4acac4a001d 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -94,7 +94,7 @@
 if (!$capabilitymanager->can_view_discussions($USER)) {
     redirect(
         $urlfactory->get_course_url_from_forum($forum),
-        get_string('noviewdiscussionspermission', 'fourm'),
+        get_string('noviewdiscussionspermission', 'forum'),
         null,
         \core\output\notification::NOTIFY_WARNING
     );
@@ -160,12 +160,27 @@
                 $orderpostsby
             );
         echo $discussionsrenderer->render($USER, $post, $replies);
+
+        if (!$CFG->forum_usermarksread && forum_tp_is_tracked($forumrecord, $USER)) {
+            $postids = array_map(function($post) {
+                return $post->get_id();
+            }, array_merge([$post], array_values($replies)));
+            forum_tp_mark_posts_read($USER, $postids);
+        }
         break;
     case 'blog':
         $discussionsrenderer = $rendererfactory->get_blog_discussion_list_renderer($forum);
         // Blog forums always show discussions newest first.
         echo $discussionsrenderer->render($USER, $cm, $groupid, $discussionlistvault::SORTORDER_CREATED_DESC,
             $pageno, $pagesize);
+
+        if (!$CFG->forum_usermarksread && forum_tp_is_tracked($forumrecord, $USER)) {
+            $discussions = mod_forum_get_discussion_summaries($forum, $USER, $groupid, null, $pageno, $pagesize);
+            $firstpostids = array_map(function($discussion) {
+                return $discussion->get_first_post()->get_id();
+            }, array_values($discussions));
+            forum_tp_mark_posts_read($USER, $firstpostids);
+        }
         break;
     default:
         $discussionsrenderer = $rendererfactory->get_discussion_list_renderer($forum);
diff --git a/mod/glossary/classes/external.php b/mod/glossary/classes/external.php
index e60ef92a91f5d..a06d115cc0207 100644
--- a/mod/glossary/classes/external.php
+++ b/mod/glossary/classes/external.php
@@ -222,8 +222,10 @@ public static function get_glossaries_by_courses($courseids = array()) {
             foreach ($glossaries as $glossary) {
                 $context = context_module::instance($glossary->coursemodule);
                 $glossary->name = external_format_string($glossary->name, $context->id);
-                list($glossary->intro, $glossary->introformat) = external_format_text($glossary->intro, $glossary->introformat,
-                    $context->id, 'mod_glossary', 'intro', null);
+                $options = array('noclean' => true);
+                list($glossary->intro, $glossary->introformat) =
+                    external_format_text($glossary->intro, $glossary->introformat, $context->id, 'mod_glossary', 'intro', null,
+                        $options);
                 $glossary->introfiles = external_util::get_area_files($context->id, 'mod_glossary', 'intro', false, false);
 
                 // Make sure we have a number of entries per page.
diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php
index 748a79aac22bd..b1a22ede78d42 100644
--- a/mod/glossary/db/upgrade.php
+++ b/mod/glossary/db/upgrade.php
@@ -100,5 +100,8 @@ function xmldb_glossary_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php
index 8cacbb373ebb4..624130da9168f 100644
--- a/mod/glossary/deleteentry.php
+++ b/mod/glossary/deleteentry.php
@@ -39,6 +39,11 @@
     print_error('invalidentry');
 }
 
+// Permission checks are based on the course module instance so make sure it is correct.
+if ($cm->instance != $entry->glossaryid) {
+    print_error('invalidentry');
+}
+
 require_login($course, false, $cm);
 $context = context_module::instance($cm->id);
 $manageentries = has_capability('mod/glossary:manageentries', $context);
diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html
index a5eec6ee0092f..450f5d0af7b69 100644
--- a/mod/glossary/editcategories.html
+++ b/mod/glossary/editcategories.html
@@ -4,47 +4,74 @@
 ?>
 <div class="boxaligncenter">
 <form id="form" method="post" action="editcategories.php">
-<div>
-<table  class="generalbox" cellpadding="5">
-<tr valign="top">
-    <td align="right"><label for="name"><?php echo get_string("name") ?>:</label></td>
-    <td>
-        <input type="text" name="name" id="name" size="30" value="<?php p($name) ?>" />
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><label for="usedynalink"><?php echo get_string("linkcategory","glossary") ?>:</label></td>
-    <td>
-      <select size="1" id="usedynalink" name="usedynalink">
-      <option value="1" <?php
+    <div id="fitem_id_name" class="form-group row fitem">
+        <div class="col-md-3">
+            <label class="col-form-label d-inline " for="name">
+                <?php echo get_string("name") ?>
+            </label>
+        </div>
+        <div class="col-md-9 form-inline felement" data-fieldtype="select">
+            <input type="text" name="name" id="name" class="form-control" size="30" value="<?php p($name) ?>" />
+        </div>
+    </div>
+    <div id="fitem_id_usedynalink" class="form-group row fitem">
+        <div class="col-md-3">
+            <span class="float-sm-right text-nowrap">
+                <?php echo $OUTPUT->help_icon('linkcategory', 'glossary') ?>
+            </span>
+            <label class="col-form-label d-inline " for="usedynalink">
+                <?php echo get_string("linkcategory","glossary") ?>
+            </label>
+        </div>
+        <div class="col-md-9 form-inline felement" data-fieldtype="select">
+            <select size="1" id="usedynalink" name="usedynalink" class="custom-select">
+                <option value="1" <?php
        if ( $usedynalink ) {
           echo "selected=\"selected\"";
        }
        ?>><?php echo get_string("yes") ?></option>
-      <option value="0" <?php
+                <option value="0" <?php
        if ( !$usedynalink ) {
           echo "selected=\"selected\"";
        }
        ?>><?php echo get_string("no") ?>
-      </option>
-      </select> <?php echo $OUTPUT->help_icon('linkcategory', 'glossary') ?>
-    </td>
-</tr>
-<tr>
-<td colspan="2">
-    <div class="buttons">
-    <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
-    <input type="hidden" name="id" value="<?php p($cm->id) ?>" />
-    <input type="hidden" name="action" value="<?php p($action) ?>" />
-    <input type="hidden" name="confirm" value="1" />
-    <input type="hidden" name="mode" value='cat' />
-    <input type="hidden" name="hook" value="<?php p($hook) ?>" />
-    <input type="submit" value="<?php print_string("savechanges") ?>" />
-    <input type="reset" value="<?php print_string("back","glossary") ?>"  onclick="javascript:history.go(-1);" />
+                </option>
+            </select>
+        </div>
+    </div>
+    <div id="fgroup_id_buttonar" class="form-group row fitem femptylabel" data-groupname="buttonar">
+        <div class="col-md-3">
+            <span class="float-sm-right text-nowrap">
+            </span>
+            <label class="col-form-label d-inline " for="fgroup_id_buttonar">
+            </label>
+        </div>
+        <div class="col-md-9 form-inline felement" data-fieldtype="group">
+            <div class="form-group fitem form-submit mr-1">
+                <label class="col-form-label" for="id_save">
+                </label>
+                <span data-fieldtype="submit">
+                    <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
+                    <input type="hidden" name="id" value="<?php p($cm->id) ?>" />
+                    <input type="hidden" name="action" value="<?php p($action) ?>" />
+                    <input type="hidden" name="confirm" value="1" />
+                    <input type="hidden" name="mode" value='cat' />
+                    <input type="hidden" name="hook" value="<?php p($hook) ?>" />
+                    <input type="submit" class="btn btn-primary" name="save" id="id_save"
+                           value="<?php echo get_string("savechanges") ?>" />
+                </span>
+            </div>
+            <div class="form-group fitem btn-cancel">
+                <label class="col-form-label" for="id_back">
+                </label>
+                <span data-fieldtype="submit">
+                    <input type="reset" class="btn btn-secondary" name="back" id="id_back"
+                           value="<?php print_string("back", "glossary") ?>"  onclick="javascript:history.go(-1);" />
+                </span>
+            </div>
+        </div>
     </div>
-</td>
-</tr>
-</table>
+    <div>
 </div>
 </form>
 </div>
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index 7ffb5ce2e5eeb..079c86f1d3649 100644
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -173,7 +173,7 @@
                         <input type="hidden" name="confirm"     value="1" />
                         <input type="hidden" name="mode"         value="<?php echo $mode ?>" />
                         <input type="hidden" name="hook"         value="<?php echo $hook ?>" />
-                        <input type="submit" value=" <?php print_string("yes")?> " />
+                        <input type="submit" class="btn btn-primary" value=" <?php print_string("yes")?> " />
                         </div>
                         </form>
                         </td>
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index c0b44d147deae..e15d7359eb72d 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -2438,8 +2438,8 @@ function glossary_generate_export_file($glossary, $ignored = "", $hook = 0) {
  * @return string
  */
 function glossary_read_imported_file($file_content) {
-    require_once "../../lib/xmlize.php";
     global $CFG;
+    require_once "../../lib/xmlize.php";
 
     return xmlize($file_content, 0);
 }
diff --git a/mod/glossary/tests/behat/categories.feature b/mod/glossary/tests/behat/categories.feature
index 193488dbc02f4..2154e7b13f109 100644
--- a/mod/glossary/tests/behat/categories.feature
+++ b/mod/glossary/tests/behat/categories.feature
@@ -80,12 +80,12 @@ Feature: Glossary entries can be organised in categories
     And I follow "Browse by category"
     And "//h3[contains(.,'CATEGORYAUTOLINKS')]" "xpath_element" should appear before "//h3[contains(.,'CATEGORYNOLINKS')]" "xpath_element"
     And "//h4[contains(.,'EntryCategoryAL')]" "xpath_element" should appear before "//h3[contains(.,'CATEGORYNOLINKS')]" "xpath_element"
-    And "//h4[contains(.,'EntryCategoryBoth')]" "xpath_element" should appear before "//h3[contains(.,'CATEGORYNOLINKS')]" "xpath_element"
-    And "//h3[contains(.,'CATEGORYNOLINKS')]" "xpath_element" should appear before "//h4[contains(.,'EntryCategoryBoth')]" "xpath_element"
+    And "(//h4[contains(.,'EntryCategoryBoth')])[1]" "xpath_element" should appear before "//h3[contains(.,'CATEGORYNOLINKS')]" "xpath_element"
+    And "//h3[contains(.,'CATEGORYNOLINKS')]" "xpath_element" should appear before "(//h4[contains(.,'EntryCategoryBoth')])[2]" "xpath_element"
     And "//h4[contains(.,'EntryCategoryNL')]" "xpath_element" should appear after "//h3[contains(.,'CATEGORYNOLINKS')]" "xpath_element"
     And I should not see "EntryNoCategory"
     And I set the field "hook" to "Not categorised"
-    And I click on "Not categorised" "option" in the "#catmenu select" "css_element"
+    And I set the field "Categories" to "Not categorised"
     And I should see "EntryNoCategory"
     And I should not see "EntryCategoryNL"
     And I should not see "EntryCategoryAL"
@@ -112,8 +112,7 @@ Feature: Glossary entries can be organised in categories
     And I should not see "EntryNoCategory"
     And I should not see "EntryCategoryAL"
     And I should see "EntryCategoryBoth"
-    And I click on "Not categorised" "option" in the "#catmenu select" "css_element"
+    And I set the field "Categories" to "Not categorised"
     And I should see "EntryNoCategory"
     And I should see "EntryCategoryAL"
     And I should not see "EntryCategoryBoth"
-    And I log out
diff --git a/mod/glossary/tests/behat/entries_always_editable.feature b/mod/glossary/tests/behat/entries_always_editable.feature
index 0d693a04ea3ed..906b27f363d50 100644
--- a/mod/glossary/tests/behat/entries_always_editable.feature
+++ b/mod/glossary/tests/behat/entries_always_editable.feature
@@ -4,7 +4,6 @@ Feature: A teacher can set whether glossary entries are always editable or not
   As a teacher
   I need to prevent entries to be always editable
 
-  @javascript
   Scenario: Glossary entries are not always editable
     Given the following "users" exist:
       | username | firstname | lastname | email |
@@ -18,7 +17,7 @@ Feature: A teacher can set whether glossary entries are always editable or not
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
     And the following config values are set as admin:
-      | maxeditingtime | 60 |
+      | maxeditingtime | 5 |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
     And I add a "Glossary" to section "1" and I fill the form with:
@@ -34,7 +33,7 @@ Feature: A teacher can set whether glossary entries are always editable or not
       | Definition | Test concept description |
     Then "Delete entry: Test concept name" "link" should exist
     And "Edit entry: Test concept name" "link" should exist
-    And I wait "65" seconds
+    And I wait "6" seconds
     And I reload the page
-    Then "Delete entry: Test concept name" "link" should not exist
+    And "Delete entry: Test concept name" "link" should not exist
     And "Edit entry: Test concept name" "link" should not exist
diff --git a/mod/imscp/classes/external.php b/mod/imscp/classes/external.php
index 85292af661f7d..e8db88c9db7a3 100644
--- a/mod/imscp/classes/external.php
+++ b/mod/imscp/classes/external.php
@@ -163,8 +163,10 @@ public static function get_imscps_by_courses($courseids = array()) {
 
                 if (has_capability('mod/imscp:view', $context)) {
                     // Format intro.
+                    $options = array('noclean' => true);
                     list($imscpdetails['intro'], $imscpdetails['introformat']) =
-                        external_format_text($imscp->intro, $imscp->introformat, $context->id, 'mod_imscp', 'intro', null);
+                        external_format_text($imscp->intro, $imscp->introformat, $context->id, 'mod_imscp', 'intro', null,
+                            $options);
                     $imscpdetails['introfiles'] = external_util::get_area_files($context->id, 'mod_imscp', 'intro', false, false);
                 }
 
diff --git a/mod/imscp/db/upgrade.php b/mod/imscp/db/upgrade.php
index ac32ec4dc80c1..c897c086f7ed4 100644
--- a/mod/imscp/db/upgrade.php
+++ b/mod/imscp/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_imscp_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/label/classes/external.php b/mod/label/classes/external.php
index 064af2d7e7af2..6b575129dbbe7 100644
--- a/mod/label/classes/external.php
+++ b/mod/label/classes/external.php
@@ -91,9 +91,9 @@ public static function get_labels_by_courses($courseids = array()) {
                 $context = context_module::instance($label->coursemodule);
                 // Entry to return.
                 $label->name = external_format_string($label->name, $context->id);
-
-                list($label->intro, $label->introformat) = external_format_text($label->intro,
-                                                                $label->introformat, $context->id, 'mod_label', 'intro', null);
+                $options = array('noclean' => true);
+                list($label->intro, $label->introformat) =
+                    external_format_text($label->intro, $label->introformat, $context->id, 'mod_label', 'intro', null, $options);
                 $label->introfiles = external_util::get_area_files($context->id, 'mod_label', 'intro', false, false);
 
                 $returnedlabels[] = $label;
diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php
index 7212edc246f30..a6f9dc10bbe2d 100644
--- a/mod/label/db/upgrade.php
+++ b/mod/label/db/upgrade.php
@@ -70,5 +70,8 @@ function xmldb_label_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lesson/backup/moodle2/backup_lesson_stepslib.php b/mod/lesson/backup/moodle2/backup_lesson_stepslib.php
index 11b5f0ace2164..1991ac3dd2be9 100644
--- a/mod/lesson/backup/moodle2/backup_lesson_stepslib.php
+++ b/mod/lesson/backup/moodle2/backup_lesson_stepslib.php
@@ -180,6 +180,12 @@ protected function define_structure() {
             $overrideparams['userid'] = backup_helper::is_sqlparam(null); //  Without userinfo, skip user overrides.
         }
 
+        // Skip group overrides if not including groups.
+        $groupinfo = $this->get_setting_value('groups');
+        if (!$groupinfo) {
+            $overrideparams['groupid'] = backup_helper::is_sqlparam(null);
+        }
+
         $override->set_source_table('lesson_overrides', $overrideparams);
 
         // Annotate the user id's where required.
diff --git a/mod/lesson/backup/moodle2/restore_lesson_stepslib.php b/mod/lesson/backup/moodle2/restore_lesson_stepslib.php
index 5cefa64e6d814..3e06f7570dc1d 100644
--- a/mod/lesson/backup/moodle2/restore_lesson_stepslib.php
+++ b/mod/lesson/backup/moodle2/restore_lesson_stepslib.php
@@ -220,6 +220,11 @@ protected function process_lesson_override($data) {
             $data->groupid = $this->get_mappingid('group', $data->groupid);
         }
 
+        // Skip if there is no user and no group data.
+        if (empty($data->userid) && empty($data->groupid)) {
+            return;
+        }
+
         $data->available = $this->apply_date_offset($data->available);
         $data->deadline = $this->apply_date_offset($data->deadline);
 
diff --git a/mod/lesson/classes/analytics/indicator/cognitive_depth.php b/mod/lesson/classes/analytics/indicator/cognitive_depth.php
index 24ca8e233283a..fe2600746a77a 100644
--- a/mod/lesson/classes/analytics/indicator/cognitive_depth.php
+++ b/mod/lesson/classes/analytics/indicator/cognitive_depth.php
@@ -70,7 +70,7 @@ protected function feedback_submitted(\cm_info $cm, $contextid, $userid, $after
         }
 
         // Multiple lesson attempts completed counts as submitted after feedback.
-        return (2 >= count($this->activitylogs[$contextid][$userid]['\mod_lesson\event\lesson_ended']));
+        return (2 >= count($this->activitylogs[$contextid][$userid]['\mod_lesson\event\lesson_ended']->timecreated));
     }
 
     /**
diff --git a/mod/lesson/classes/external.php b/mod/lesson/classes/external.php
index d3ff0190b5689..fc99b71d0f0fe 100644
--- a/mod/lesson/classes/external.php
+++ b/mod/lesson/classes/external.php
@@ -143,7 +143,9 @@ public static function get_lessons_by_courses($courseids = array()) {
                 $lessonrecord = self::get_lesson_summary_for_exporter($lessonrecord);
 
                 $exporter = new lesson_summary_exporter($lessonrecord, array('context' => $context));
-                $returnedlessons[] = $exporter->export($PAGE->get_renderer('core'));
+                $lesson = $exporter->export($PAGE->get_renderer('core'));
+                $lesson->name = external_format_string($lesson->name, $context);
+                $returnedlessons[] = $lesson;
             }
         }
         $result = array();
diff --git a/mod/lesson/classes/external/lesson_summary_exporter.php b/mod/lesson/classes/external/lesson_summary_exporter.php
index fb262be14dbf8..e0fa14a5d53f7 100644
--- a/mod/lesson/classes/external/lesson_summary_exporter.php
+++ b/mod/lesson/classes/external/lesson_summary_exporter.php
@@ -301,6 +301,7 @@ protected function get_format_parameters_for_intro() {
         return [
             'component' => 'mod_lesson',
             'filearea' => 'intro',
+            'options' => array('noclean' => true),
         ];
     }
 }
diff --git a/mod/lesson/db/upgrade.php b/mod/lesson/db/upgrade.php
index a3b5ce356368a..0e4fe4d65b62d 100644
--- a/mod/lesson/db/upgrade.php
+++ b/mod/lesson/db/upgrade.php
@@ -101,6 +101,13 @@ function xmldb_lesson_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2017051501, 'lesson');
     }
 
+    if ($oldversion < 2019052001) {
+        // Delete orphaned group overrides.
+        $DB->delete_records_select('lesson_overrides', 'groupid = 0 AND userid IS NULL');
+
+        upgrade_mod_savepoint(true, 2019052001, 'lesson');
+    }
+
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
@@ -110,5 +117,8 @@ function xmldb_lesson_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lesson/editpage.php b/mod/lesson/editpage.php
index 7f7bef8103a97..1e28d9eca446b 100644
--- a/mod/lesson/editpage.php
+++ b/mod/lesson/editpage.php
@@ -32,8 +32,11 @@
 $id     = required_param('id', PARAM_INT);         // Course Module ID
 $qtype  = optional_param('qtype', 0, PARAM_INT);
 $edit   = optional_param('edit', false, PARAM_BOOL);
-$returnto = optional_param('returnto', null, PARAM_URL);
-if (empty($returnto)) {
+$returnto = optional_param('returnto', null, PARAM_LOCALURL);
+
+if (!empty($returnto)) {
+    $returnto = new moodle_url($returnto);
+} else {
     $returnto = new moodle_url('/mod/lesson/edit.php', array('id' => $id));
     $returnto->set_anchor('lesson-' . $pageid);
 }
diff --git a/mod/lesson/import_form.php b/mod/lesson/import_form.php
index b152c0abe242a..0ca0b1e5d68b5 100644
--- a/mod/lesson/import_form.php
+++ b/mod/lesson/import_form.php
@@ -59,6 +59,7 @@ public function definition() {
      * @param array $data the submitted data.
      * @param array $errors the errors so far.
      * @return array the updated errors.
+     * @throws moodle_exception
      */
     protected function validate_uploaded_file($data, $errors) {
         global $CFG;
@@ -69,7 +70,7 @@ protected function validate_uploaded_file($data, $errors) {
         }
 
         $files = $this->get_draft_files('questionfile');
-        if (count($files) < 1) {
+        if (!is_array($files) || count($files) < 1) {
             $errors['questionfile'] = get_string('required');
             return $errors;
         }
diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php
index 62eb108d8fb38..b04549da120c7 100644
--- a/mod/lesson/lang/en/lesson.php
+++ b/mod/lesson/lang/en/lesson.php
@@ -247,7 +247,7 @@
 $string['gradeoptions'] = 'Grade options';
 $string['groupoverrides'] = 'Group overrides';
 $string['groupoverridesdeleted'] = 'Group overrides deleted';
-$string['groupsnone'] = 'There are no groups in this course';
+$string['groupsnone'] = 'No groups you can access.';
 $string['handlingofretakes'] = 'Handling of re-takes';
 $string['handlingofretakes_help'] = 'If re-takes are allowed, this setting specifies whether the grade for the lesson is the mean or maximum of all attempts.';
 $string['havenotgradedyet'] = 'Have not graded yet.';
@@ -542,8 +542,8 @@
 $string['studentresponse'] = '{$a}\'s response';
 $string['submit'] = 'Submit';
 $string['submitname'] = 'Submit name';
-$string['teacherjumpwarning'] = 'An {$a->cluster} jump or an {$a->unseen} jump is being used in this lesson.  The next page jump will be used instead.  Login as a student to test these jumps.';
-$string['teacherongoingwarning'] = 'Ongoing score is only displayed for student.  Login as a student to test ongoing score';
+$string['teacherjumpwarning'] = 'A {$a->cluster} jump or an {$a->unseen} jump is being used in this lesson.  The next page jump will be used instead. Log in as a student to test these jumps.';
+$string['teacherongoingwarning'] = 'The ongoing score is only displayed for the student. Log in as a student to test the ongoing score.';
 $string['teachertimerwarning'] = 'Timer only works for students.  Test the timer by logging in as a student.';
 $string['thatsthecorrectanswer'] = 'That\'s the correct answer';
 $string['thatsthewronganswer'] = 'That\'s the wrong answer';
diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index 2adefdb6c20b3..f67ff7ae26669 100644
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -1676,6 +1676,14 @@ function mod_lesson_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     $lesson = new lesson($DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST));
 
     if ($lesson->count_user_retries($userid)) {
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index a12beefe80e53..d4b3bad126d72 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -584,7 +584,7 @@ function lesson_add_header_buttons($cm, $context, $extraeditbuttons=false, $less
                 'id'       => $cm->id,
                 'pageid'   => $lessonpageid,
                 'edit'     => 1,
-                'returnto' => $PAGE->url->out(false)
+                'returnto' => $PAGE->url->out_as_local_url(false)
             ));
             $PAGE->set_button($OUTPUT->single_button($url, get_string('editpagecontent', 'lesson')));
         }
@@ -1324,7 +1324,7 @@ public final function definition() {
 
         if (!empty($this->_customdata['returnto'])) {
             $mform->addElement('hidden', 'returnto', $this->_customdata['returnto']);
-            $mform->setType('returnto', PARAM_URL);
+            $mform->setType('returnto', PARAM_LOCALURL);
         }
 
         $mform->addElement('hidden', 'id');
@@ -4510,7 +4510,7 @@ public function update($properties, $context = null, $maxbytes = null) {
                     $this->answers[$i]->responseformat = $properties->response_editor[$i]['format'];
                 }
 
-                if (isset($this->answers[$i]->answer) && $this->answers[$i]->answer != '') {
+                if ($this->answers[$i]->answer !== null && $this->answers[$i]->answer !== '') {
                     if (isset($properties->jumpto[$i])) {
                         $this->answers[$i]->jumpto = $properties->jumpto[$i];
                     }
diff --git a/mod/lesson/override_form.php b/mod/lesson/override_form.php
index 0d7fbed19358e..ae52f8b35b3f4 100644
--- a/mod/lesson/override_form.php
+++ b/mod/lesson/override_form.php
@@ -81,13 +81,16 @@ public function __construct($submiturl, $cm, $lesson, $context, $groupmode, $ove
      * Define this form - called by the parent constructor
      */
     protected function definition() {
-        global $CFG, $DB;
+        global $DB;
 
         $cm = $this->cm;
         $mform = $this->_form;
 
         $mform->addElement('header', 'override', get_string('override', 'lesson'));
 
+        $lessongroupmode = groups_get_activity_groupmode($cm);
+        $accessallgroups = ($lessongroupmode == NOGROUPS) || has_capability('moodle/site:accessallgroups', $this->context);
+
         if ($this->groupmode) {
             // Group override.
             if ($this->groupid) {
@@ -99,7 +102,8 @@ protected function definition() {
                 $mform->freeze('groupid');
             } else {
                 // Prepare the list of groups.
-                $groups = groups_get_all_groups($cm->course);
+                // Only include the groups the current can access.
+                $groups = $accessallgroups ? groups_get_all_groups($cm->course) :  groups_get_activity_allowed_groups($cm);
                 if (empty($groups)) {
                     // Generate an error.
                     $link = new moodle_url('/mod/lesson/overrides.php', array('cmid' => $cm->id));
@@ -132,8 +136,27 @@ protected function definition() {
                 $mform->freeze('userid');
             } else {
                 // Prepare the list of users.
-                $users = get_enrolled_users($this->context, '', 0,
-                        'u.id, u.email, ' . get_all_user_name_fields(true, 'u'));
+                $users = [];
+                list($sort) = users_order_by_sql('u');
+
+                // Get the list of appropriate users, depending on whether and how groups are used.
+                if ($accessallgroups) {
+                    $users = get_enrolled_users($this->context, '', 0,
+                            'u.id, u.email, ' . get_all_user_name_fields(true, 'u'), $sort);
+                } else if ($groups = groups_get_activity_allowed_groups($cm)) {
+                    $enrolledjoin = get_enrolled_join($this->context, 'u.id');
+                    $userfields = 'u.id, u.email, ' . get_all_user_name_fields(true, 'u');
+                    list($ingroupsql, $ingroupparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+                    $params = $enrolledjoin->params + $ingroupparams;
+                    $sql = "SELECT $userfields
+                              FROM {user} u
+                              JOIN {groups_members} gm ON gm.userid = u.id
+                                   {$enrolledjoin->joins}
+                             WHERE gm.groupid $ingroupsql
+                                   AND {$enrolledjoin->wheres}
+                          ORDER BY $sort";
+                    $users = $DB->get_records_sql($sql, $params);
+                }
 
                 // Filter users based on any fixed restrictions (groups, profile).
                 $info = new \core_availability\info_module($cm);
@@ -235,7 +258,6 @@ protected function definition() {
      * @return array of "element_name"=>"error_description" if there are errors
      */
     public function validation($data, $files) {
-        global $COURSE, $DB;
         $errors = parent::validation($data, $files);
 
         $mform =& $this->_form;
diff --git a/mod/lesson/overridedelete.php b/mod/lesson/overridedelete.php
index 8f23eb8053e0b..bd213e00a73d3 100644
--- a/mod/lesson/overridedelete.php
+++ b/mod/lesson/overridedelete.php
@@ -49,6 +49,16 @@
 // Check the user has the required capabilities to modify an override.
 require_capability('mod/lesson:manageoverrides', $context);
 
+if ($override->groupid) {
+    if (!groups_group_visible($override->groupid, $course, $cm)) {
+        print_error('invalidoverrideid', 'lesson');
+    }
+} else {
+    if (!groups_user_groups_visible($course, $override->userid, $cm)) {
+        print_error('invalidoverrideid', 'lesson');
+    }
+}
+
 $url = new moodle_url('/mod/lesson/overridedelete.php', array('id' => $override->id));
 $confirmurl = new moodle_url($url, array('id' => $override->id, 'confirm' => 1));
 $cancelurl = new moodle_url('/mod/lesson/overrides.php', array('cmid' => $cm->id));
diff --git a/mod/lesson/overrideedit.php b/mod/lesson/overrideedit.php
index 0268b35e8f65f..68f8251d9dc0f 100644
--- a/mod/lesson/overrideedit.php
+++ b/mod/lesson/overrideedit.php
@@ -76,6 +76,16 @@
 if ($overrideid) {
     // Editing an override.
     $data = clone $override;
+
+    if ($override->groupid) {
+        if (!groups_group_visible($override->groupid, $course, $cm)) {
+            print_error('invalidoverrideid', 'lesson');
+        }
+    } else {
+        if (!groups_user_groups_visible($course, $override->userid, $cm)) {
+            print_error('invalidoverrideid', 'lesson');
+        }
+    }
 } else {
     // Creating a new override.
     $data = new stdClass();
diff --git a/mod/lesson/overrides.php b/mod/lesson/overrides.php
index be60a7787ab2d..657dcfb4b1999 100644
--- a/mod/lesson/overrides.php
+++ b/mod/lesson/overrides.php
@@ -35,11 +35,18 @@
 list($course, $cm) = get_course_and_cm_from_cmid($cmid, 'lesson');
 $lesson = $DB->get_record('lesson', array('id' => $cm->instance), '*', MUST_EXIST);
 
-// Get the course groups.
-$groups = groups_get_all_groups($cm->course);
-if ($groups === false) {
-    $groups = array();
-}
+require_login($course, false, $cm);
+
+$context = context_module::instance($cm->id);
+
+// Check the user has the required capabilities to list overrides.
+require_capability('mod/lesson:manageoverrides', $context);
+
+$lessongroupmode = groups_get_activity_groupmode($cm);
+$accessallgroups = ($lessongroupmode == NOGROUPS) || has_capability('moodle/site:accessallgroups', $context);
+
+// Get the course groups that the current user can access.
+$groups = $accessallgroups ? groups_get_all_groups($cm->course) : groups_get_activity_allowed_groups($cm);
 
 // Default mode is "group", unless there are no groups.
 if ($mode != "user" and $mode != "group") {
@@ -55,13 +62,6 @@
 
 $PAGE->set_url($url);
 
-require_login($course, false, $cm);
-
-$context = context_module::instance($cm->id);
-
-// Check the user has the required capabilities to list overrides.
-require_capability('mod/lesson:manageoverrides', $context);
-
 // Display a list of overrides.
 $PAGE->set_pagelayout('admin');
 $PAGE->set_title(get_string('overrides', 'lesson'));
@@ -71,35 +71,62 @@
 
 // Delete orphaned group overrides.
 $sql = 'SELECT o.id
-            FROM {lesson_overrides} o LEFT JOIN {groups} g
-            ON o.groupid = g.id
-            WHERE o.groupid IS NOT NULL
-              AND g.id IS NULL
-              AND o.lessonid = ?';
+          FROM {lesson_overrides} o
+     LEFT JOIN {groups} g ON o.groupid = g.id
+         WHERE o.groupid IS NOT NULL
+               AND g.id IS NULL
+               AND o.lessonid = ?';
 $params = array($lesson->id);
 $orphaned = $DB->get_records_sql($sql, $params);
 if (!empty($orphaned)) {
     $DB->delete_records_list('lesson_overrides', 'id', array_keys($orphaned));
 }
 
+$overrides = [];
+
 // Fetch all overrides.
 if ($groupmode) {
     $colname = get_string('group');
-    $sql = 'SELECT o.*, g.name
-                FROM {lesson_overrides} o
-                JOIN {groups} g ON o.groupid = g.id
-                WHERE o.lessonid = :lessonid
-                ORDER BY g.name';
-    $params = array('lessonid' => $lesson->id);
+    // To filter the result by the list of groups that the current user has access to.
+    if ($groups) {
+        $params = ['lessonid' => $lesson->id];
+        list($insql, $inparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params += $inparams;
+
+        $sql = "SELECT o.*, g.name
+                  FROM {lesson_overrides} o
+                  JOIN {groups} g ON o.groupid = g.id
+                 WHERE o.lessonid = :lessonid AND g.id $insql
+              ORDER BY g.name";
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    }
 } else {
     $colname = get_string('user');
     list($sort, $params) = users_order_by_sql('u');
-    $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
-            FROM {lesson_overrides} o
-            JOIN {user} u ON o.userid = u.id
-            WHERE o.lessonid = :lessonid
-            ORDER BY ' . $sort;
     $params['lessonid'] = $lesson->id;
+
+    if ($accessallgroups) {
+        $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
+                  FROM {lesson_overrides} o
+                  JOIN {user} u ON o.userid = u.id
+                 WHERE o.lessonid = :lessonid
+              ORDER BY ' . $sort;
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    } else if ($groups) {
+        list($insql, $inparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params += $inparams;
+
+        $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
+                  FROM {lesson_overrides} o
+                  JOIN {user} u ON o.userid = u.id
+                  JOIN {groups_members} gm ON u.id = gm.userid
+                 WHERE o.lessonid = :lessonid AND gm.groupid ' . $insql . '
+              ORDER BY ' . $sort;
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    }
 }
 
 $overrides = $DB->get_records_sql($sql, $params);
@@ -272,13 +299,31 @@
 } else {
     $users = array();
     // See if there are any users in the lesson.
-    $users = get_enrolled_users($context);
+    if ($accessallgroups) {
+        $users = get_enrolled_users($context, '', 0, 'u.id');
+        $nousermessage = get_string('usersnone', 'lesson');
+    } else if ($groups) {
+        $enrolledjoin = get_enrolled_join($context, 'u.id');
+        list($ingroupsql, $ingroupparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params = $enrolledjoin->params + $ingroupparams;
+        $sql = "SELECT u.id
+                  FROM {user} u
+                  JOIN {groups_members} gm ON gm.userid = u.id
+                       {$enrolledjoin->joins}
+                 WHERE gm.groupid $ingroupsql
+                       AND {$enrolledjoin->wheres}
+              ORDER BY $sort";
+        $users = $DB->get_records_sql($sql, $params);
+        $nousermessage = get_string('usersnone', 'lesson');
+    } else {
+        $nousermessage = get_string('groupsnone', 'lesson');
+    }
     $info = new \core_availability\info_module($cm);
     $users = $info->filter_user_list($users);
 
     if (empty($users)) {
         // There are no users.
-        echo $OUTPUT->notification(get_string('usersnone', 'lesson'), 'error');
+        echo $OUTPUT->notification($nousermessage, 'error');
         $options['disabled'] = true;
     }
     echo $OUTPUT->single_button($overrideediturl->out(true,
diff --git a/mod/lesson/tests/behat/date_availability.feature b/mod/lesson/tests/behat/date_availability.feature
index b0be900fc4eff..dfdbda5fa0984 100644
--- a/mod/lesson/tests/behat/date_availability.feature
+++ b/mod/lesson/tests/behat/date_availability.feature
@@ -28,7 +28,7 @@ Feature: A teacher can set available from and deadline dates to access a lesson
       | Description | Test lesson description |
       | available[day] | 1 |
       | available[month] | January |
-      | available[year] | 2020 |
+      | available[year] | 2030 |
       | available[hour] | 08 |
       | available[minute] | 00 |
     And I press "Save and display"
@@ -43,7 +43,7 @@ Feature: A teacher can set available from and deadline dates to access a lesson
     And I log in as "student1"
     And I am on "Course 1" course homepage
     When I follow "Test lesson"
-    Then I should see "This lesson will be open on Wednesday, 1 January 2020, 8:00"
+    Then I should see "This lesson will be open on Tuesday, 1 January 2030, 8:00"
     And I should not see "First page contents"
 
   Scenario: Forbidding lesson accesses until a specified date
diff --git a/mod/lesson/tests/behat/lesson_group_override.feature b/mod/lesson/tests/behat/lesson_group_override.feature
index d28ccbf40c108..b5bcf89df1f6f 100644
--- a/mod/lesson/tests/behat/lesson_group_override.feature
+++ b/mod/lesson/tests/behat/lesson_group_override.feature
@@ -48,8 +48,11 @@ Feature: Lesson group override
       | id_response_editor_1 | Wrong |
       | id_jumpto_1          | This page |
     And I press "Save page"
+    And I log out
 
   Scenario: Add, modify then delete a group override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Group overrides" in current page administration
     And I press "Add group override"
@@ -73,6 +76,8 @@ Feature: Lesson group override
     And I should not see "Group 1"
 
   Scenario: Duplicate a user override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Group overrides" in current page administration
     And I press "Add group override"
@@ -95,6 +100,8 @@ Feature: Lesson group override
     And I should see "Group 2"
 
   Scenario: Allow a single group to have re-take the lesson
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -134,6 +141,8 @@ Feature: Lesson group override
     And I should see "You are not allowed to retake this lesson."
 
   Scenario: Allow a single group to have a different password
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -179,6 +188,8 @@ Feature: Lesson group override
     And I press "Continue"
 
   Scenario: Allow a group to have a different due date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -196,7 +207,7 @@ Feature: Lesson group override
       | id_deadline_enabled | 1 |
       | deadline[day]       | 1 |
       | deadline[month]     | January |
-      | deadline[year]      | 2020 |
+      | deadline[year]      | 2030 |
       | deadline[hour]      | 08 |
       | deadline[minute]    | 00 |
     And I press "Save"
@@ -214,13 +225,15 @@ Feature: Lesson group override
     And I should see "Cat is an amphibian"
 
   Scenario: Allow a group to have a different start date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
       | id_available_enabled | 1 |
       | available[day]       | 1 |
       | available[month]     | January |
-      | available[year]      | 2020 |
+      | available[year]      | 2030 |
       | available[hour]      | 08 |
       | available[minute]    | 00 |
     And I press "Save and display"
@@ -240,7 +253,7 @@ Feature: Lesson group override
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test lesson"
-    Then  I should see "This lesson will be open on Wednesday, 1 January 2020, 8:00"
+    Then  I should see "This lesson will be open on Tuesday, 1 January 2030, 8:00"
     And I should not see "Cat is an amphibian"
     And I log out
     And I log in as "student1"
@@ -249,6 +262,8 @@ Feature: Lesson group override
     And I should see "Cat is an amphibian"
 
   Scenario: Allow a single group to have multiple attempts at each question
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -289,13 +304,15 @@ Feature: Lesson group override
 
   @javascript
   Scenario: Add both a user and group override and verify that both are applied correctly
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
       | id_available_enabled | 1 |
       | available[day]       | 1 |
       | available[month]     | January |
-      | available[year]      | 2030 |
+      | available[year]      | 2040 |
       | available[hour]      | 08 |
       | available[minute]    | 00 |
     And I press "Save and display"
@@ -307,11 +324,11 @@ Feature: Lesson group override
       | id_available_enabled | 1 |
       | available[day]       | 1 |
       | available[month]     | January |
-      | available[year]      | 2020 |
+      | available[year]      | 2030 |
       | available[hour]      | 08 |
       | available[minute]    | 00 |
     And I press "Save"
-    And I should see "Wednesday, 1 January 2020, 8:00"
+    And I should see "Tuesday, 1 January 2030, 8:00"
     And I follow "Test lesson name"
     And I navigate to "User overrides" in current page administration
     And I press "Add user override"
@@ -320,23 +337,96 @@ Feature: Lesson group override
       | id_available_enabled | 1 |
       | available[day]       | 1 |
       | available[month]     | January |
-      | available[year]      | 2021 |
+      | available[year]      | 2031 |
       | available[hour]      | 08 |
       | available[minute]    | 00 |
     And I press "Save"
-    And I should see "Friday, 1 January 2021, 8:00"
+    And I should see "Wednesday, 1 January 2031, 8:00"
     And I log out
     Then I log in as "student1"
     And I am on "Course 1" course homepage
     And I follow "Test lesson"
-    And I should see "This lesson will be open on Friday, 1 January 2021, 8:00"
+    And I should see "This lesson will be open on Wednesday, 1 January 2031, 8:00"
     And I log out
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test lesson"
-    And I should see "This lesson will be open on Tuesday, 1 January 2030, 8:00"
+    And I should see "This lesson will be open on Sunday, 1 January 2040, 8:00"
     And I log out
     And I log in as "student3"
     And I am on "Course 1" course homepage
     And I follow "Test lesson"
-    And I should see "This lesson will be open on Wednesday, 1 January 2020, 8:00"
+    And I should see "This lesson will be open on Tuesday, 1 January 2030, 8:00"
+
+  Scenario: Override a group when teacher is in no group, and does not have accessallgroups permission, and the activity's group mode is 'separate groups'
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name     | intro                | course | idnumber | groupmode |
+      | lesson   | Lesson 2 | Lesson 2 description | C1     | lesson2  | 1         |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "Group overrides" in current page administration
+    Then I should see "No groups you can access."
+    And the "Add group override" "button" should be disabled
+
+  Scenario: A teacher without accessallgroups permission should only be able to add group override for their groups, when the activity's group mode is 'separate groups'
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name     | intro                | course | idnumber | groupmode |
+      | lesson   | Lesson 2 | Lesson 2 description | C1     | lesson2  | 1         |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "Group overrides" in current page administration
+    And I press "Add group override"
+    Then the "Override group" select box should contain "Group 1"
+    And the "Override group" select box should not contain "Group 2"
+
+  Scenario: A teacher without accessallgroups permission should only be able to see the group overrides for their groups, when the activity's group mode is 'separate groups'
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name     | intro                | course | idnumber | groupmode |
+      | lesson   | Lesson 2 | Lesson 2 description | C1     | lesson2  | 1         |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+    And I log in as "admin"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "Group overrides" in current page administration
+    And I press "Add group override"
+    And I set the following fields to these values:
+      | Override group       | Group 1 |
+      | id_available_enabled | 1       |
+      | available[day]       | 1       |
+      | available[month]     | January |
+      | available[year]      | 2020    |
+      | available[hour]      | 08      |
+      | available[minute]    | 00      |
+    And I press "Save and enter another override"
+    And I set the following fields to these values:
+      | Override group       | Group 2 |
+      | id_available_enabled | 1       |
+      | available[day]       | 1       |
+      | available[month]     | January |
+      | available[year]      | 2020    |
+      | available[hour]      | 08      |
+      | available[minute]    | 00      |
+    And I press "Save"
+    And I log out
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "Group overrides" in current page administration
+    Then I should see "Group 1" in the ".generaltable" "css_element"
+    And I should not see "Group 2" in the ".generaltable" "css_element"
diff --git a/mod/lesson/tests/behat/lesson_user_override.feature b/mod/lesson/tests/behat/lesson_user_override.feature
index 5612457f85c19..e6b9fd0a8dd0c 100644
--- a/mod/lesson/tests/behat/lesson_user_override.feature
+++ b/mod/lesson/tests/behat/lesson_user_override.feature
@@ -1,4 +1,4 @@
-@mod @mod_lesson @javascript
+@mod @mod_lesson
 Feature: Lesson user override
   In order to grant a student special access to a lesson
   As a teacher
@@ -18,10 +18,6 @@ Feature: Lesson user override
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
       | student2 | C1 | student |
-    And the following "groups" exist:
-      | name    | course | idnumber |
-      | Group 1 | C1     | G1       |
-      | Group 2 | C1     | G2       |
     And the following "activities" exist:
       | activity | name             | intro                   | course | idnumber |
       | lesson   | Test lesson name | Test lesson description | C1     | lesson1  |
@@ -41,9 +37,12 @@ Feature: Lesson user override
       | id_response_editor_1 | Wrong |
       | id_jumpto_1          | This page |
     And I press "Save page"
+    And I log out
 
   @javascript
   Scenario: Add, modify then delete a user override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "User overrides" in current page administration
     And I press "Add user override"
@@ -66,7 +65,10 @@ Feature: Lesson user override
     And I press "Continue"
     And I should not see "Sam1 Student1"
 
+  @javascript
   Scenario: Duplicate a user override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "User overrides" in current page administration
     And I press "Add user override"
@@ -88,7 +90,10 @@ Feature: Lesson user override
     And I should see "Tuesday, 1 January 2030, 8:00"
     And I should see "Sam2 Student2"
 
+  @javascript
   Scenario: Allow a single user to have re-take the lesson
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -127,7 +132,10 @@ Feature: Lesson user override
     And I follow "Test lesson name"
     And I should see "You are not allowed to retake this lesson."
 
+  @javascript
   Scenario: Allow a single user to have a different password
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -172,7 +180,10 @@ Feature: Lesson user override
     And I set the field "userpassword" to "moodle_rules"
     And I press "Continue"
 
+  @javascript
   Scenario: Allow a user to have a different due date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -190,7 +201,7 @@ Feature: Lesson user override
       | id_deadline_enabled | 1 |
       | deadline[day]       | 1 |
       | deadline[month]     | January |
-      | deadline[year]      | 2020 |
+      | deadline[year]      | 2030 |
       | deadline[hour]      | 08 |
       | deadline[minute]    | 00 |
     And I press "Save"
@@ -207,14 +218,17 @@ Feature: Lesson user override
     And I follow "Test lesson"
     And I should see "Cat is an amphibian"
 
+  @javascript
   Scenario: Allow a user to have a different start date
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
       | id_available_enabled | 1 |
       | available[day]       | 1 |
       | available[month]     | January |
-      | available[year]      | 2020 |
+      | available[year]      | 2030 |
       | available[hour]      | 08 |
       | available[minute]    | 00 |
     And I press "Save and display"
@@ -234,7 +248,7 @@ Feature: Lesson user override
     And I log in as "student2"
     And I am on "Course 1" course homepage
     And I follow "Test lesson"
-    Then  I should see "This lesson will be open on Wednesday, 1 January 2020, 8:00"
+    Then  I should see "This lesson will be open on Tuesday, 1 January 2030, 8:00"
     And I should not see "Cat is an amphibian"
     And I log out
     And I log in as "student1"
@@ -242,7 +256,10 @@ Feature: Lesson user override
     And I follow "Test lesson"
     And I should see "Cat is an amphibian"
 
+  @javascript
   Scenario: Allow a single user to have multiple attempts at each question
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
     When I follow "Test lesson name"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
@@ -280,3 +297,89 @@ Feature: Lesson user override
     And I press "Submit"
     Then I press "Continue"
     And I should see "Congratulations - end of lesson reached"
+
+  Scenario: Override a user when teacher is in no group, and does not have accessallgroups permission, and the activity's group mode is 'separate groups'
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name     | intro                | course | idnumber | groupmode |
+      | lesson   | Lesson 2 | Lesson 2 description | C1     | lesson2  | 1         |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "User overrides" in current page administration
+    Then I should see "No groups you can access."
+    And the "Add user override" "button" should be disabled
+
+  Scenario: A teacher without accessallgroups permission should only be able to add user override for their group-mates, when the activity's group mode is 'separate groups'
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name     | intro                | course | idnumber | groupmode |
+      | lesson   | Lesson 2 | Lesson 2 description | C1     | lesson2  | 1         |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+      | student1 | G1    |
+      | student2 | G2    |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "User overrides" in current page administration
+    And I press "Add user override"
+    Then the "Override user" select box should contain "Sam1 Student1, student1@example.com"
+    And the "Override user" select box should not contain "Sam2 Student2, student2@example.com"
+
+  @javascript
+  Scenario: A teacher without accessallgroups permission should only be able to see the user override for their group-mates, when the activity's group mode is 'separate groups'
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name     | intro                | course | idnumber | groupmode |
+      | lesson   | Lesson 2 | Lesson 2 description | C1     | lesson2  | 1         |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+    And the following "group members" exist:
+      | user     | group |
+      | teacher1 | G1    |
+      | student1 | G1    |
+      | student2 | G2    |
+    And I log in as "admin"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "User overrides" in current page administration
+    And I press "Add user override"
+    And I set the following fields to these values:
+      | Override user       | Student1 |
+      | id_deadline_enabled | 1        |
+      | deadline[day]       | 1        |
+      | deadline[month]     | January  |
+      | deadline[year]      | 2020     |
+      | deadline[hour]      | 08       |
+      | deadline[minute]    | 00       |
+    And I press "Save and enter another override"
+    And I set the following fields to these values:
+      | Override user       | Student2 |
+      | id_deadline_enabled | 1        |
+      | deadline[day]       | 1        |
+      | deadline[month]     | January  |
+      | deadline[year]      | 2020     |
+      | deadline[hour]      | 08       |
+      | deadline[minute]    | 00       |
+    And I press "Save"
+    And I log out
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Lesson 2"
+    And I navigate to "User overrides" in current page administration
+    Then I should see "Student1" in the ".generaltable" "css_element"
+    And I should not see "Student2" in the ".generaltable" "css_element"
diff --git a/mod/lesson/tests/external_test.php b/mod/lesson/tests/external_test.php
index 27ae4ae8ea6c9..9524649151685 100644
--- a/mod/lesson/tests/external_test.php
+++ b/mod/lesson/tests/external_test.php
@@ -99,7 +99,8 @@ public function setUp() {
      * Test test_mod_lesson_get_lessons_by_courses
      */
     public function test_mod_lesson_get_lessons_by_courses() {
-        global $DB;
+        global $DB, $CFG;
+        require_once($CFG->libdir . '/externallib.php');
 
         // Create additional course.
         $course2 = self::getDataGenerator()->create_course();
@@ -107,6 +108,7 @@ public function test_mod_lesson_get_lessons_by_courses() {
         // Second lesson.
         $record = new stdClass();
         $record->course = $course2->id;
+        $record->name = '<span lang="en" class="multilang">English</span><span lang="es" class="multilang">Español</span>';
         $lesson2 = self::getDataGenerator()->create_module('lesson', $record);
 
         // Execute real Moodle enrolment as we'll call unenrol() method on the instance later.
@@ -122,6 +124,14 @@ public function test_mod_lesson_get_lessons_by_courses() {
 
         self::setUser($this->student);
 
+        // Enable multilang filter to on content and heading.
+        filter_manager::reset_caches();
+        filter_set_global_state('multilang', TEXTFILTER_ON);
+        filter_set_applies_to_strings('multilang', true);
+        // Set WS filtering.
+        $wssettings = external_settings::get_instance();
+        $wssettings->set_filter(true);
+
         $returndescription = mod_lesson_external::get_lessons_by_courses_returns();
 
         // Create what we expect to be returned when querying the two courses.
@@ -157,6 +167,7 @@ public function test_mod_lesson_get_lessons_by_courses() {
             $expected2[$field] = $lesson2->{$field};
         }
 
+        $expected2['name'] = 'English';  // Lang filtered expected.
         $expectedlessons = array($expected2, $expected1);
 
         // Call the external function passing course ids.
diff --git a/mod/lesson/tests/lib_test.php b/mod/lesson/tests/lib_test.php
index ed6a7db532a79..06502139a6cfa 100644
--- a/mod/lesson/tests/lib_test.php
+++ b/mod/lesson/tests/lib_test.php
@@ -648,6 +648,71 @@ public function test_lesson_core_calendar_provide_event_action_after_attempt_for
         $this->assertNull($action);
     }
 
+    public function test_lesson_core_calendar_provide_event_action_already_completed() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $lesson = $this->getDataGenerator()->create_module('lesson', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('lesson', $lesson->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $lesson->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_lesson_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_lesson_core_calendar_provide_event_action_already_completed_for_user() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $lesson = $this->getDataGenerator()->create_module('lesson', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('lesson', $lesson->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $lesson->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_lesson_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
diff --git a/mod/lesson/tests/restore_override_test.php b/mod/lesson/tests/restore_override_test.php
new file mode 100644
index 0000000000000..b3ff0c60035df
--- /dev/null
+++ b/mod/lesson/tests/restore_override_test.php
@@ -0,0 +1,105 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Restore override tests.
+ *
+ * @package    mod_lesson
+ * @author   2019 Nathan Nguyen <nathannguyen@catalyst-au.net>
+ * @copyright Catalyst IT
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->libdir . "/phpunit/classes/restore_date_testcase.php");
+/**
+ * Restore override tests.
+ *
+ * @package    mod_lesson
+ * @author   2019 Nathan Nguyen <nathannguyen@catalyst-au.net>
+ * @copyright Catalyst IT
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mod_lesson_restore_override_testcase extends restore_date_testcase {
+
+    /**
+     * Test restore overrides.
+     */
+    public function test_restore_overrides() {
+        global $DB, $USER;
+        $this->resetAfterTest();
+
+        $course = $this->getDataGenerator()->create_course();
+        $lessongen = $this->getDataGenerator()->get_plugin_generator('mod_lesson');
+        $lesson = $lessongen->create_instance(['course' => $course->id]);
+
+        $group1 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+        $group2 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+
+        $now = 100;
+        $groupoverride1 = (object)[
+            'lessonid' => $lesson->id,
+            'groupid' => $group1->id,
+            'available' => $now,
+            'deadline' => $now + 20
+        ];
+        $DB->insert_record('lesson_overrides', $groupoverride1);
+
+        $groupoverride2 = (object)[
+            'lessonid' => $lesson->id,
+            'groupid' => $group2->id,
+            'available' => $now,
+            'deadline' => $now + 40
+        ];
+        $DB->insert_record('lesson_overrides', $groupoverride2);
+
+        // Current quiz overrides.
+        $overrides = $DB->get_records('lesson_overrides', ['lessonid' => $lesson->id]);
+        $this->assertEquals(2, count($overrides));
+
+        // User override.
+        $useroverride = (object)[
+            'lessonid' => $lesson->id,
+            'userid' => $USER->id,
+            'sortorder' => 1,
+            'available' => 100,
+            'deadline' => 200
+        ];
+        $DB->insert_record('lesson_overrides', $useroverride);
+
+        // Current quiz overrides.
+        $overrides = $DB->get_records('lesson_overrides', ['lessonid' => $lesson->id]);
+        $this->assertEquals(3, count($overrides));
+
+        // Back up and restore including group info and user info.
+        set_config('backup_general_groups', 1, 'backup');
+        $newcourseid = $this->backup_and_restore($course);
+        $newquiz = $DB->get_record('lesson', ['course' => $newcourseid]);
+        $overrides = $DB->get_records('lesson_overrides', ['lessonid' => $newquiz->id]);
+        // 2 groups overrides and 1 user override.
+        $this->assertEquals(3, count($overrides));
+
+        // Back up and restore with user info and without group info.
+        set_config('backup_general_groups', 0, 'backup');
+        $newcourseid = $this->backup_and_restore($course);
+        $newquiz = $DB->get_record('lesson', ['course' => $newcourseid]);
+        $overrides = $DB->get_records('lesson_overrides', ['lessonid' => $newquiz->id]);
+        // 1 user override.
+        $this->assertEquals(1, count($overrides));
+    }
+}
diff --git a/mod/lesson/version.php b/mod/lesson/version.php
index 217f67823d195..4c2727ee63c09 100644
--- a/mod/lesson/version.php
+++ b/mod/lesson/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019052000;     // The current module version (Date: YYYYMMDDXX)
+$plugin->version   = 2019052001;     // The current module version (Date: YYYYMMDDXX)
 $plugin->requires  = 2019051100;    // Requires this Moodle version
 $plugin->component = 'mod_lesson'; // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 0;
diff --git a/mod/lti/amd/build/tool_configure_controller.min.js b/mod/lti/amd/build/tool_configure_controller.min.js
index 2be614155e08c..655e33e455fcb 100644
--- a/mod/lti/amd/build/tool_configure_controller.min.js
+++ b/mod/lti/amd/build/tool_configure_controller.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/notification","core/templates","mod_lti/events","mod_lti/keys","mod_lti/tool_type","mod_lti/tool_proxy","core/str"],function(a,b,c,d,e,f,g,h,i){var j={EXTERNAL_REGISTRATION_CONTAINER:"#external-registration-container",EXTERNAL_REGISTRATION_PAGE_CONTAINER:"#external-registration-page-container",CARTRIDGE_REGISTRATION_CONTAINER:"#cartridge-registration-container",CARTRIDGE_REGISTRATION_FORM:"#cartridge-registration-form",ADD_TOOL_FORM:"#add-tool-form",TOOL_LIST_CONTAINER:"#tool-list-container",TOOL_CREATE_BUTTON:"#tool-create-button",REGISTRATION_CHOICE_CONTAINER:"#registration-choice-container",TOOL_URL:"#tool-url"},k=function(){return a(j.TOOL_CREATE_BUTTON)},l=function(){return a(j.TOOL_LIST_CONTAINER)},m=function(){return a(j.EXTERNAL_REGISTRATION_CONTAINER)},n=function(){return a(j.CARTRIDGE_REGISTRATION_CONTAINER)},o=function(){return a(j.REGISTRATION_CHOICE_CONTAINER)},p=function(){return a(j.TOOL_URL).val()},q=function(){m().addClass("hidden")},r=function(){n().addClass("hidden")},s=function(){o().addClass("hidden")},t=function(){r(),s(),m().removeClass("hidden"),w(m())},u=function(a){q(),s(),n().removeClass("hidden"),n().find(j.CARTRIDGE_REGISTRATION_FORM).attr("data-cartridge-url",a),w(n())},v=function(){q(),r(),o().removeClass("hidden"),w(o())},w=function(a){var b=a.children().detach();b.appendTo(a)},x=function(){l().addClass("hidden")},y=function(){l().removeClass("hidden")},z=function(a){var b=a.error?"error":"success";c.addNotification({message:a.message,type:b})},A=function(a){a.addClass("loading")},B=function(a){a.removeClass("loading")},C=function(){var b=a.Deferred(),e=l();A(e),a.when(g.query(),h.query({orphanedonly:!0})).done(function(a,c){d.render("mod_lti/tool_list",{tools:a,proxies:c}).done(function(a,c){e.empty(),e.append(a),d.runTemplateJS(c),b.resolve()}).fail(b.reject)}).fail(b.reject),b.fail(c.exception).always(function(){B(e)})},D=function(){var b=a.trim(p());if(""===b)return a.Deferred().resolve();var d=k();A(d);var f=g.isCartridge(b);return f.always(function(){B(d)}),f.done(function(c){c.iscartridge?(a(j.TOOL_URL).val(""),a(document).trigger(e.START_CARTRIDGE_REGISTRATION,b)):a(document).trigger(e.START_EXTERNAL_REGISTRATION,{url:b})}),f.fail(function(){i.get_string("errorbadurl","mod_lti").done(function(b){a(document).trigger(e.REGISTRATION_FEEDBACK,{message:b,error:!0})}).fail(c.exception)}),f},E=function(){a(document).on(e.NEW_TOOL_TYPE,function(){C()}),a(document).on(e.START_EXTERNAL_REGISTRATION,function(){t(),a(j.TOOL_URL).val(""),x()}),a(document).on(e.STOP_EXTERNAL_REGISTRATION,function(){y(),v()}),a(document).on(e.START_CARTRIDGE_REGISTRATION,function(a,b){u(b)}),a(document).on(e.STOP_CARTRIDGE_REGISTRATION,function(){n().find(j.CARTRIDGE_REGISTRATION_FORM).removeAttr("data-cartridge-url"),v()}),a(document).on(e.REGISTRATION_FEEDBACK,function(a,b){z(b)});var b=a(j.ADD_TOOL_FORM);b.submit(function(a){a.preventDefault(),D()})};return{init:function(){E(),C()}}});
\ No newline at end of file
+define(["jquery","core/ajax","core/notification","core/templates","mod_lti/events","mod_lti/keys","mod_lti/tool_type","mod_lti/tool_proxy","core/str"],function(a,b,c,d,e,f,g,h,i){var j={EXTERNAL_REGISTRATION_CONTAINER:"#external-registration-container",EXTERNAL_REGISTRATION_PAGE_CONTAINER:"#external-registration-page-container",CARTRIDGE_REGISTRATION_CONTAINER:"#cartridge-registration-container",CARTRIDGE_REGISTRATION_FORM:"#cartridge-registration-form",ADD_TOOL_FORM:"#add-tool-form",TOOL_LIST_CONTAINER:"#tool-list-container",TOOL_CREATE_BUTTON:"#tool-create-button",REGISTRATION_CHOICE_CONTAINER:"#registration-choice-container",TOOL_URL:"#tool-url"},k=function(){return a(j.TOOL_CREATE_BUTTON)},l=function(){return a(j.TOOL_LIST_CONTAINER)},m=function(){return a(j.EXTERNAL_REGISTRATION_CONTAINER)},n=function(){return a(j.CARTRIDGE_REGISTRATION_CONTAINER)},o=function(){return a(j.REGISTRATION_CHOICE_CONTAINER)},p=function(){return a(j.TOOL_URL).val()},q=function(){m().addClass("hidden")},r=function(){n().addClass("hidden")},s=function(){o().addClass("hidden")},t=function(){r(),s(),m().removeClass("hidden"),w(m())},u=function(a){q(),s();var b=n();b.find("input").val(""),b.removeClass("hidden"),b.find(j.CARTRIDGE_REGISTRATION_FORM).attr("data-cartridge-url",a),w(b)},v=function(){q(),r(),o().removeClass("hidden"),w(o())},w=function(a){var b=a.children().detach();b.appendTo(a)},x=function(){l().addClass("hidden")},y=function(){l().removeClass("hidden")},z=function(a){var b=a.error?"error":"success";c.addNotification({message:a.message,type:b})},A=function(a){a.addClass("loading")},B=function(a){a.removeClass("loading")},C=function(){var b=a.Deferred(),e=l();A(e),a.when(g.query(),h.query({orphanedonly:!0})).done(function(a,c){d.render("mod_lti/tool_list",{tools:a,proxies:c}).done(function(a,c){e.empty(),e.append(a),d.runTemplateJS(c),b.resolve()}).fail(b.reject)}).fail(b.reject),b.fail(c.exception).always(function(){B(e)})},D=function(){var b=a.trim(p());if(""===b)return a.Deferred().resolve();var d=k();A(d);var f=g.isCartridge(b);return f.always(function(){B(d)}),f.done(function(c){c.iscartridge?(a(j.TOOL_URL).val(""),a(document).trigger(e.START_CARTRIDGE_REGISTRATION,b)):a(document).trigger(e.START_EXTERNAL_REGISTRATION,{url:b})}),f.fail(function(){i.get_string("errorbadurl","mod_lti").done(function(b){a(document).trigger(e.REGISTRATION_FEEDBACK,{message:b,error:!0})}).fail(c.exception)}),f},E=function(){a(document).on(e.NEW_TOOL_TYPE,function(){C()}),a(document).on(e.START_EXTERNAL_REGISTRATION,function(){t(),a(j.TOOL_URL).val(""),x()}),a(document).on(e.STOP_EXTERNAL_REGISTRATION,function(){y(),v()}),a(document).on(e.START_CARTRIDGE_REGISTRATION,function(a,b){u(b)}),a(document).on(e.STOP_CARTRIDGE_REGISTRATION,function(){n().find(j.CARTRIDGE_REGISTRATION_FORM).removeAttr("data-cartridge-url"),v()}),a(document).on(e.REGISTRATION_FEEDBACK,function(a,b){z(b)});var b=a(j.ADD_TOOL_FORM);b.submit(function(a){a.preventDefault(),D()})};return{init:function(){E(),C()}}});
\ No newline at end of file
diff --git a/mod/lti/amd/src/tool_configure_controller.js b/mod/lti/amd/src/tool_configure_controller.js
index a8fed075de291..40dc88589eba2 100644
--- a/mod/lti/amd/src/tool_configure_controller.js
+++ b/mod/lti/amd/src/tool_configure_controller.js
@@ -162,9 +162,12 @@ define(['jquery', 'core/ajax', 'core/notification', 'core/templates', 'mod_lti/e
     var showCartridgeRegistration = function(url) {
         hideExternalRegistration();
         hideRegistrationChoices();
-        getCartridgeRegistrationContainer().removeClass('hidden');
-        getCartridgeRegistrationContainer().find(SELECTORS.CARTRIDGE_REGISTRATION_FORM).attr('data-cartridge-url', url);
-        screenReaderAnnounce(getCartridgeRegistrationContainer());
+        // Don't save the key and secret from the last tool.
+        var container = getCartridgeRegistrationContainer();
+        container.find('input').val('');
+        container.removeClass('hidden');
+        container.find(SELECTORS.CARTRIDGE_REGISTRATION_FORM).attr('data-cartridge-url', url);
+        screenReaderAnnounce(container);
     };
 
     /**
diff --git a/mod/lti/classes/external.php b/mod/lti/classes/external.php
index b6e081ee14bdb..dad4370feea58 100644
--- a/mod/lti/classes/external.php
+++ b/mod/lti/classes/external.php
@@ -312,8 +312,9 @@ public static function get_ltis_by_courses($courseids = array()) {
 
                 $viewablefields = [];
                 if (has_capability('mod/lti:view', $context)) {
+                    $options = array('noclean' => true);
                     list($module['intro'], $module['introformat']) =
-                        external_format_text($lti->intro, $lti->introformat, $context->id, 'mod_lti', 'intro', null);
+                        external_format_text($lti->intro, $lti->introformat, $context->id, 'mod_lti', 'intro', null, $options);
 
                     $module['introfiles'] = external_util::get_area_files($context->id, 'mod_lti', 'intro', false, false);
                     $viewablefields = array('launchcontainer', 'showtitlelaunch', 'showdescriptionlaunch', 'icon', 'secureicon');
diff --git a/mod/lti/db/upgrade.php b/mod/lti/db/upgrade.php
index 4d313e590d197..e605f01f37f57 100644
--- a/mod/lti/db/upgrade.php
+++ b/mod/lti/db/upgrade.php
@@ -218,5 +218,8 @@ function xmldb_lti_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2019031302, 'lti');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lti/lang/en/lti.php b/mod/lti/lang/en/lti.php
index c3f827370011a..b39163eb05fce 100644
--- a/mod/lti/lang/en/lti.php
+++ b/mod/lti/lang/en/lti.php
@@ -96,9 +96,7 @@
 $string['cleanaccesstokens'] = 'External tool removal of expired access tokens';
 $string['click_to_continue'] = '<a href="{$a->link}" target="_top">Click to continue</a>';
 $string['clientidadmin'] = 'Client ID';
-$string['clientidadmin_help'] = 'The client ID can be thought of as a unique value used to identify a tool.
-It is created automatically for each tool which uses the JWT security profile introduced in LTI 1.3 and should
-be part of the details passed to the provider of the tool so that they can configure the connection at their end.';
+$string['clientidadmin_help'] = 'The client ID is a unique value used to identify a tool. It is created automatically for each tool which uses the JWT security profile introduced in LTI 1.3 and should be part of the details passed to the tool provider so that they can configure the connection at their end.';
 $string['comment'] = 'Comment';
 $string['configpassword'] = 'Default remote tool password';
 $string['configpreferheight'] = 'Default preferred height';
@@ -273,19 +271,13 @@
 $string['ltiversion'] = 'LTI version';
 $string['ltiversion_help'] = 'The version of LTI being used for signing messages and service requests: LTI 1.0/1.1 and LTI 2.0 use the OAuth 1.0A security profile; LTI 1.3.0 uses JWTs.';
 $string['main_admin'] = 'General help';
-$string['main_admin_help'] = 'External tools allow Moodle users to seamlessly interact with learning resources hosted remotely. Through a special
-launch protocol, the remote tool will have access to some general information about the launching user. For example,
-the institution name, course id, user id, and other information such as the user\'s name or e-mail address.
+$string['main_admin_help'] = 'External tools allow Moodle users to interact with learning resources hosted remotely. Through a special launch protocol, the remote tool has access to general information about the launching user. For example, the institution name, course ID, user ID, and other information such as the user\'s name or email address.
 
 Tools listed on this page are separated into three categories:
 
-* **Active** - These tool providers have been approved and configured by an administrator. They can be used from within any
-        course on this Moodle instance. If a consumer key and shared secret are entered, a trust relationship is established
-        between this Moodle instance and the remote tool, providing a secure communication channel.
-* **Pending** - These tool providers came in through a package import, but have not been configured by an administrator.
-        Teachers may still use tools from these providers if they have a consumer key and shared secret, or if none is required.
-* **Rejected** - These tools providers are flagged as ones which an administrator has no intention of making available to the entire
-        Moodle instance. Teachers may still use tools from these providers if they have a consumer key and shared secret, or if none is required.';
+* **Active** - These tool providers have been approved and configured by an administrator. They can be used from within any course on this site. If a consumer key and shared secret are entered, a trust relationship is established between this site and the remote tool, providing a secure communication channel.
+* **Pending** - These tool providers came in through a package import, but have not been configured by an administrator. Teachers may still use tools from these providers if they have a consumer key and shared secret, or if none is required.
+* **Rejected** - These tools providers are flagged as ones which an administrator has no intention of making available on the site. Teachers may still use tools from these providers if they have a consumer key and shared secret, or if none is required.';
 $string['manage_external_tools'] = 'Manage tools';
 $string['manage_tools'] = 'Manage preconfigured tools';
 $string['manage_tool_proxies'] = 'Manage external tool registrations';
diff --git a/mod/lti/service/memberships/lang/en/ltiservice_memberships.php b/mod/lti/service/memberships/lang/en/ltiservice_memberships.php
index f7d74ac76d8f8..b5bdaf591f79c 100644
--- a/mod/lti/service/memberships/lang/en/ltiservice_memberships.php
+++ b/mod/lti/service/memberships/lang/en/ltiservice_memberships.php
@@ -25,11 +25,7 @@
 
 $string['allow'] = 'Use this service to retrieve members\' information as per privacy settings';
 $string['ltiservice_memberships'] = 'IMS LTI Names and Role Provisioning';
-$string['ltiservice_memberships_help'] = 'Allow the tool to retrieve member\'s info from the course ' .
-  'using the IMS LTI Names and Role Provisioning Service. The privacy settings will apply.  For course-level ' .
-  'requests these will be based on the tool confguration settings.  If you wish to always send such details ' .
-  'do not delegate the choice to teachers.  Link-level requests will always use the privacy settings which ' .
-  'apply to the link.';
+$string['ltiservice_memberships_help'] = 'Allow the tool to retrieve members\' info from the course using the IMS LTI Names and Role Provisioning Service. The privacy settings will apply. For course-level requests these will be based on the tool configuration settings. If you wish to always send such details, do not delegate the choice to teachers. Link-level requests will always use the privacy settings which apply to the link.';
 $string['notallow'] = 'Do not use this service';
 $string['pluginname'] = 'Names and Role Provisioning LTI Service';
 $string['privacy:metadata:email'] = 'The email of the user using the LTI consumer.';
diff --git a/mod/lti/upgradelib.php b/mod/lti/upgradelib.php
index ee60d08b41bbb..5821092861983 100644
--- a/mod/lti/upgradelib.php
+++ b/mod/lti/upgradelib.php
@@ -35,7 +35,7 @@
  * @return string A warning message if a private key does not exist and cannot be generated.
  */
 function mod_lti_verify_private_key() {
-    $key = get_config('privatekey', 'mod_lti');
+    $key = get_config('mod_lti', 'privatekey');
 
     // If we already generated a valid key, no need to check.
     if (empty($key)) {
diff --git a/mod/page/classes/external.php b/mod/page/classes/external.php
index 8b10f1e8370d8..511d22285f57a 100644
--- a/mod/page/classes/external.php
+++ b/mod/page/classes/external.php
@@ -157,8 +157,9 @@ public static function get_pages_by_courses($courseids = array()) {
                 // Entry to return.
                 $page->name = external_format_string($page->name, $context->id);
 
-                list($page->intro, $page->introformat) = external_format_text($page->intro,
-                                                                $page->introformat, $context->id, 'mod_page', 'intro', null);
+                $options = array('noclean' => true);
+                list($page->intro, $page->introformat) =
+                    external_format_text($page->intro, $page->introformat, $context->id, 'mod_page', 'intro', null, $options);
                 $page->introfiles = external_util::get_area_files($context->id, 'mod_page', 'intro', false, false);
 
                 $options = array('noclean' => true);
diff --git a/mod/page/db/upgrade.php b/mod/page/db/upgrade.php
index a284b2ed6bcfe..6e12641b2a405 100644
--- a/mod/page/db/upgrade.php
+++ b/mod/page/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_page_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index f1c26ab3e8128..5a03823e21708 100644
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -120,9 +120,8 @@
 $regions = $PAGE->blocks->get_regions();
 $PAGE->blocks->add_fake_block($navbc, reset($regions));
 
-$title = get_string('attempt', 'quiz', $attemptobj->get_attempt_number());
 $headtags = $attemptobj->get_html_head_contributions($page);
-$PAGE->set_title($attemptobj->get_quiz_name());
+$PAGE->set_title($attemptobj->attempt_page_title($page));
 $PAGE->set_heading($attemptobj->get_course()->fullname);
 
 if ($attemptobj->is_last_page($page)) {
diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index 1f6674a9a08a3..743fcbf7e92ed 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -38,6 +38,16 @@
  * @since     Moodle 2.0
  */
 class moodle_quiz_exception extends moodle_exception {
+    /**
+     * Constructor.
+     *
+     * @param quiz $quizobj the quiz the error relates to.
+     * @param string $errorcode The name of the string from error.php to print.
+     * @param mixed $a Extra words and phrases that might be required in the error string.
+     * @param string $link The url where the user will be prompted to continue.
+     *      If no url is provided the user will be directed to the site index page.
+     * @param string|null $debuginfo optional debugging information.
+     */
     public function __construct($quizobj, $errorcode, $a = null, $link = '', $debuginfo = null) {
         if (!$link) {
             $link = $quizobj->view_url();
@@ -69,9 +79,9 @@ class quiz {
     /** @var context the quiz context. */
     protected $context;
 
-    /** @var array of questions augmented with slot information. */
+    /** @var stdClass[] of questions augmented with slot information. */
     protected $questions = null;
-    /** @var array of quiz_section rows. */
+    /** @var stdClass[] of quiz_section rows. */
     protected $sections = null;
     /** @var quiz_access_manager the access manager for this quiz. */
     protected $accessmanager = null;
@@ -101,8 +111,8 @@ public function __construct($quiz, $cm, $course, $getcontext = true) {
      * Static function to create a new quiz object for a specific user.
      *
      * @param int $quizid the the quiz id.
-     * @param int $userid the the userid.
-     * @return quiz the new quiz object
+     * @param int|null $userid the the userid (optional). If passed, relevant overrides are applied.
+     * @return quiz the new quiz object.
      */
     public static function create($quizid, $userid = null) {
         global $DB;
@@ -121,6 +131,7 @@ public static function create($quizid, $userid = null) {
 
     /**
      * Create a {@link quiz_attempt} for an attempt at this quiz.
+     *
      * @param object $attemptdata row from the quiz_attempts table.
      * @return quiz_attempt the new quiz_attempt object.
      */
@@ -146,7 +157,7 @@ public function preload_questions() {
      * Fully load some or all of the questions for this quiz. You must call
      * {@link preload_questions()} first.
      *
-     * @param array $questionids question ids of the questions to load. null for all.
+     * @param array|null $questionids question ids of the questions to load. null for all.
      */
     public function load_questions($questionids = null) {
         if ($this->questions === null) {
@@ -173,32 +184,56 @@ public function get_structure() {
     }
 
     // Simple getters ==========================================================
-    /** @return int the course id. */
+    /**
+     * Get the id of the course this quiz belongs to.
+     *
+     * @return int the course id.
+     */
     public function get_courseid() {
         return $this->course->id;
     }
 
-    /** @return object the row of the course table. */
+    /**
+     * Get the course settings object that this quiz belongs to.
+     *
+     * @return object the row of the course table.
+     */
     public function get_course() {
         return $this->course;
     }
 
-    /** @return int the quiz id. */
+    /**
+     * Get this quiz's id (in the quiz table).
+     *
+     * @return int the quiz id.
+     */
     public function get_quizid() {
         return $this->quiz->id;
     }
 
-    /** @return object the row of the quiz table. */
+    /**
+     * Get the quiz settings object.
+     *
+     * @return stdClass the row of the quiz table.
+     */
     public function get_quiz() {
         return $this->quiz;
     }
 
-    /** @return string the name of this quiz. */
+    /**
+     * Get the quiz name.
+     *
+     * @return string the name of this quiz.
+     */
     public function get_quiz_name() {
         return $this->quiz->name;
     }
 
-    /** @return int the quiz navigation method. */
+    /**
+     * Get the navigation method in use.
+     *
+     * @return int QUIZ_NAVMETHOD_FREE or QUIZ_NAVMETHOD_SEQ.
+     */
     public function get_navigation_method() {
         return $this->quiz->navmethod;
     }
@@ -208,17 +243,29 @@ public function get_num_attempts_allowed() {
         return $this->quiz->attempts;
     }
 
-    /** @return int the course_module id. */
+    /**
+     * Get the course-module id for this quiz.
+     *
+     * @return int the course_module id.
+     */
     public function get_cmid() {
         return $this->cm->id;
     }
 
-    /** @return object the course_module object. */
+    /**
+     * Get the course-module object for this quiz.
+     *
+     * @return object the course_module object.
+     */
     public function get_cm() {
         return $this->cm;
     }
 
-    /** @return object the module context for this quiz. */
+    /**
+     * Get the quiz context.
+     *
+     * @return context the module context for this quiz.
+     */
     public function get_context() {
         return $this->context;
     }
@@ -237,8 +284,8 @@ public function is_preview_user() {
     /**
      * Checks user enrollment in the current course.
      *
-     * @param int $userid
-     * @return null|stdClass user record
+     * @param int $userid the id of the user to check.
+     * @return bool whether the user is enrolled.
      */
     public function is_participant($userid) {
         return is_enrolled($this->get_context(), $userid, 'mod/quiz:attempt', $this->show_only_active_users());
@@ -254,7 +301,7 @@ public function show_only_active_users() {
     }
 
     /**
-     * @return whether any questions have been added to this quiz.
+     * @return bool whether any questions have been added to this quiz.
      */
     public function has_questions() {
         if ($this->questions === null) {
@@ -265,14 +312,15 @@ public function has_questions() {
 
     /**
      * @param int $id the question id.
-     * @return object the question object with that id.
+     * @return stdClass the question object with that id.
      */
     public function get_question($id) {
         return $this->questions[$id];
     }
 
     /**
-     * @param array $questionids question ids of the questions to load. null for all.
+     * @param array|null $questionids question ids of the questions to load. null for all.
+     * @return stdClass[] the question data objects.
      */
     public function get_questions($questionids = null) {
         if (is_null($questionids)) {
@@ -291,6 +339,7 @@ public function get_questions($questionids = null) {
 
     /**
      * Get all the sections in this quiz.
+     *
      * @return array 0, 1, 2, ... => quiz_sections row from the database.
      */
     public function get_sections() {
@@ -305,6 +354,7 @@ public function get_sections() {
     /**
      * Return quiz_access_manager and instance of the quiz_access_manager class
      * for this quiz at this time.
+     *
      * @param int $timenow the current time as a unix timestamp.
      * @return quiz_access_manager and instance of the quiz_access_manager class
      *      for this quiz at this time.
@@ -319,16 +369,25 @@ public function get_access_manager($timenow) {
 
     /**
      * Wrapper round the has_capability funciton that automatically passes in the quiz context.
+     *
+     * @param string $capability the name of the capability to check. For example mod/quiz:view.
+     * @param int|null $userid A user id. By default (null) checks the permissions of the current user.
+     * @param bool $doanything If false, ignore effect of admin role assignment.
+     * @return boolean true if the user has this capability. Otherwise false.
      */
     public function has_capability($capability, $userid = null, $doanything = true) {
         return has_capability($capability, $this->context, $userid, $doanything);
     }
 
     /**
-     * Wrapper round the require_capability funciton that automatically passes in the quiz context.
+     * Wrapper round the require_capability function that automatically passes in the quiz context.
+     *
+     * @param string $capability the name of the capability to check. For example mod/quiz:view.
+     * @param int|null $userid A user id. By default (null) checks the permissions of the current user.
+     * @param bool $doanything If false, ignore effect of admin role assignment.
      */
     public function require_capability($capability, $userid = null, $doanything = true) {
-        return require_capability($capability, $this->context, $userid, $doanything);
+        require_capability($capability, $this->context, $userid, $doanything);
     }
 
     // URLs related to this attempt ============================================
@@ -364,7 +423,10 @@ public function attempt_url($attemptid, $page = 0) {
     }
 
     /**
-     * @return string the URL of this quiz's edit page. Needs to be POSTed to with a cmid parameter.
+     * Get the URL to start/continue an attempt.
+     *
+     * @param int $page page in the attempt to start on (optional).
+     * @return moodle_url the URL of this quiz's edit page. Needs to be POSTed to with a cmid parameter.
      */
     public function start_attempt_url($page = 0) {
         $params = array('cmid' => $this->cm->id, 'sesskey' => sesskey());
@@ -435,9 +497,10 @@ public function cannot_review_message($when, $short = false) {
     }
 
     /**
+     * Probably not used any more, but left for backwards compatibility.
+     *
      * @param string $title the name of this particular quiz page.
-     * @return array the data that needs to be sent to print_header_simple as the $navigation
-     * parameter.
+     * @return string always returns ''.
      */
     public function navigation($title) {
         global $PAGE;
@@ -448,7 +511,8 @@ public function navigation($title) {
     // Private methods =========================================================
     /**
      * Check that the definition of a particular question is loaded, and if not throw an exception.
-     * @param $id a questionid.
+     *
+     * @param int $id a question id.
      */
     protected function ensure_question_loaded($id) {
         if (isset($this->questions[$id]->_partiallyloaded)) {
@@ -459,9 +523,10 @@ protected function ensure_question_loaded($id) {
     /**
      * Return all the question types used in this quiz.
      *
-     * @param  boolean $includepotential if the quiz include random questions, setting this flag to true will make the function to
-     * return all the possible question types in the random questions category
-     * @return array a sorted array including the different question types
+     * @param  boolean $includepotential if the quiz include random questions,
+     *      setting this flag to true will make the function to return all the
+     *      possible question types in the random questions category.
+     * @return array a sorted array including the different question types.
      * @since  Moodle 3.1
      */
     public function get_all_question_types_used($includepotential = false) {
@@ -576,30 +641,19 @@ class quiz_attempt {
      *      of the state of each question. Else just set up the basic details of the attempt.
      */
     public function __construct($attempt, $quiz, $cm, $course, $loadquestions = true) {
-        global $DB;
-
         $this->attempt = $attempt;
         $this->quizobj = new quiz($quiz, $cm, $course);
 
-        if (!$loadquestions) {
-            return;
+        if ($loadquestions) {
+            $this->load_questions();
         }
-
-        $this->quba = question_engine::load_questions_usage_by_activity($this->attempt->uniqueid);
-        $this->slots = $DB->get_records('quiz_slots',
-                array('quizid' => $this->get_quizid()), 'slot',
-                'slot, requireprevious, questionid, includingsubcategories');
-        $this->sections = array_values($DB->get_records('quiz_sections',
-                array('quizid' => $this->get_quizid()), 'firstslot'));
-
-        $this->link_sections_and_slots();
-        $this->determine_layout();
-        $this->number_questions();
     }
 
     /**
      * Used by {create()} and {create_from_usage_id()}.
+     *
      * @param array $conditions passed to $DB->get_record('quiz_attempts', $conditions).
+     * @return quiz_attempt the desired instance of this class.
      */
     protected static function create_helper($conditions) {
         global $DB;
@@ -643,6 +697,28 @@ public static function state_name($state) {
         return quiz_attempt_state_name($state);
     }
 
+    /**
+     * This method can be called later if the object was constructed with $loadqusetions = false.
+     */
+    public function load_questions() {
+        global $DB;
+
+        if (isset($this->quba)) {
+            throw new coding_exception('This quiz attempt has already had the questions loaded.');
+        }
+
+        $this->quba = question_engine::load_questions_usage_by_activity($this->attempt->uniqueid);
+        $this->slots = $DB->get_records('quiz_slots',
+                array('quizid' => $this->get_quizid()), 'slot',
+                'slot, id, requireprevious, questionid, includingsubcategories');
+        $this->sections = array_values($DB->get_records('quiz_sections',
+                array('quizid' => $this->get_quizid()), 'firstslot'));
+
+        $this->link_sections_and_slots();
+        $this->determine_layout();
+        $this->number_questions();
+    }
+
     /**
      * Let each slot know which section it is part of.
      */
@@ -719,6 +795,7 @@ protected function number_questions() {
     /**
      * If the given page number is out of range (before the first page, or after
      * the last page, chnage it to be within range).
+     *
      * @param int $page the requested page number.
      * @return int a safe page number to use.
      */
@@ -740,7 +817,11 @@ public function get_courseid() {
         return $this->quizobj->get_courseid();
     }
 
-    /** @return int the course id. */
+    /**
+     * Get the course settings object.
+     *
+     * @return stdClass the course settings object.
+     */
     public function get_course() {
         return $this->quizobj->get_course();
     }
@@ -765,13 +846,17 @@ public function get_cm() {
         return $this->quizobj->get_cm();
     }
 
-    /** @return object the course_module object. */
+    /**
+     * Get the course-module id.
+     *
+     * @return int the course_module id.
+     */
     public function get_cmid() {
         return $this->quizobj->get_cmid();
     }
 
     /**
-     * @return bool wether the current user is someone who previews the quiz,
+     * @return bool whether the current user is someone who previews the quiz,
      * rather than attempting it.
      */
     public function is_preview_user() {
@@ -853,7 +938,7 @@ public function is_preview() {
     /**
      * Is this someone dealing with their own attempt or preview?
      *
-     * @return bool true => own attempt/preview. false => reviewing someone elses.
+     * @return bool true => own attempt/preview. false => reviewing someone else's.
      */
     public function is_own_attempt() {
         global $USER;
@@ -864,7 +949,6 @@ public function is_own_attempt() {
      * @return bool whether this attempt is a preview belonging to the current user.
      */
     public function is_own_preview() {
-        global $USER;
         return $this->is_own_attempt() &&
                 $this->is_preview_user() && $this->attempt->preview;
     }
@@ -872,6 +956,7 @@ public function is_own_preview() {
     /**
      * Is the current user allowed to review this attempt. This applies when
      * {@link is_own_attempt()} returns false.
+     *
      * @return bool whether the review should be allowed.
      */
     public function is_review_allowed() {
@@ -895,8 +980,10 @@ public function is_review_allowed() {
 
     /**
      * Has the student, in this attempt, engaged with the quiz in a non-trivial way?
+     *
      * That is, is there any question worth a non-zero number of marks, where
      * the student has made some response that we have saved?
+     *
      * @return bool true if we have saved a response for at least one graded question.
      */
     public function has_response_to_at_least_one_graded_question() {
@@ -934,7 +1021,9 @@ public function get_additional_summary_data(question_display_options $options) {
 
     /**
      * Get the overall feedback corresponding to a particular mark.
-     * @param $grade a particular grade.
+     *
+     * @param number $grade a particular grade.
+     * @return string the feedback.
      */
     public function get_overall_feedback($grade) {
         return quiz_feedback_for_grade($grade, $this->get_quiz(),
@@ -943,16 +1032,25 @@ public function get_overall_feedback($grade) {
 
     /**
      * Wrapper round the has_capability funciton that automatically passes in the quiz context.
+     *
+     * @param string $capability the name of the capability to check. For example mod/forum:view.
+     * @param int|null $userid A user id. By default (null) checks the permissions of the current user.
+     * @param bool $doanything If false, ignore effect of admin role assignment.
+     * @return boolean true if the user has this capability. Otherwise false.
      */
     public function has_capability($capability, $userid = null, $doanything = true) {
         return $this->quizobj->has_capability($capability, $userid, $doanything);
     }
 
     /**
-     * Wrapper round the require_capability funciton that automatically passes in the quiz context.
+     * Wrapper round the require_capability function that automatically passes in the quiz context.
+     *
+     * @param string $capability the name of the capability to check. For example mod/forum:view.
+     * @param int|null $userid A user id. By default (null) checks the permissions of the current user.
+     * @param bool $doanything If false, ignore effect of admin role assignment.
      */
     public function require_capability($capability, $userid = null, $doanything = true) {
-        return $this->quizobj->require_capability($capability, $userid, $doanything);
+        $this->quizobj->require_capability($capability, $userid, $doanything);
     }
 
     /**
@@ -988,7 +1086,10 @@ public function check_review_capability() {
     }
 
     /**
-     * Checks whether a user may navigate to a particular slot
+     * Checks whether a user may navigate to a particular slot.
+     *
+     * @param int $slot the target slot (currently does not affect the answer).
+     * @return bool true if the navigation should be allowed.
      */
     public function can_navigate_to($slot) {
         switch ($this->get_navigation_method()) {
@@ -1014,6 +1115,7 @@ public function get_attempt_state() {
      * Wrapper that the correct mod_quiz_display_options for this quiz at the
      * moment.
      *
+     * @param bool $reviewing true for options when reviewing, false for when attempting.
      * @return question_display_options the render options for this user on this attempt.
      */
     public function get_display_options($reviewing) {
@@ -1117,6 +1219,7 @@ public function get_active_slots($page = 'all') {
 
     /**
      * Helper method for unit tests. Get the underlying question usage object.
+     *
      * @return question_usage_by_activity the usage.
      */
     public function get_question_usage() {
@@ -1129,17 +1232,21 @@ public function get_question_usage() {
 
     /**
      * Get the question_attempt object for a particular question in this attempt.
+     *
      * @param int $slot the number used to identify this question within this attempt.
-     * @return question_attempt
+     * @return question_attempt the requested question_attempt.
      */
     public function get_question_attempt($slot) {
         return $this->quba->get_question_attempt($slot);
     }
 
     /**
-     * Get the question_attempt object for a particular question in this attempt.
+     * Get all the question_attempt objects that have ever appeared in a given slot.
+     *
+     * This relates to the 'Try another question like this one' feature.
+     *
      * @param int $slot the number used to identify this question within this attempt.
-     * @return question_attempt
+     * @return question_attempt[] the attempts.
      */
     public function all_question_attempts_originally_in_slot($slot) {
         $qas = array();
@@ -1154,6 +1261,7 @@ public function all_question_attempts_originally_in_slot($slot) {
 
     /**
      * Is a particular question in this attempt a real question, or something like a description.
+     *
      * @param int $slot the number used to identify this question within this attempt.
      * @return int whether that question is a real question. Actually returns the
      *     question length, which could theoretically be greater than one.
@@ -1164,6 +1272,7 @@ public function is_real_question($slot) {
 
     /**
      * Is a particular question in this attempt a real question, or something like a description.
+     *
      * @param int $slot the number used to identify this question within this attempt.
      * @return bool whether that question is a real question.
      */
@@ -1172,10 +1281,12 @@ public function is_question_flagged($slot) {
     }
 
     /**
-     * Checks whether the question in this slot requires the previous question to have been completed.
+     * Checks whether the question in this slot requires the previous
+     * question to have been completed.
      *
      * @param int $slot the number used to identify this question within this attempt.
-     * @return bool whether the previous question must have been completed before this one can be seen.
+     * @return bool whether the previous question must have been completed before
+     *      this one can be seen.
      */
     public function is_blocked_by_previous_question($slot) {
         return $slot > 1 && isset($this->slots[$slot]) && $this->slots[$slot]->requireprevious &&
@@ -1190,7 +1301,7 @@ public function is_blocked_by_previous_question($slot) {
      * Is it possible for this question to be re-started within this attempt?
      *
      * @param int $slot the number used to identify this question within this attempt.
-     * @return whether the student should be given the option to restart this question now.
+     * @return bool whether the student should be given the option to restart this question now.
      */
     public function can_question_be_redone_now($slot) {
         return $this->get_quiz()->canredoquestions && !$this->is_finished() &&
@@ -1214,6 +1325,7 @@ public function get_original_slot($slot) {
 
     /**
      * Get the displayed question number for a slot.
+     *
      * @param int $slot the number used to identify this question within this attempt.
      * @return string the displayed question number for the question in this slot.
      *      For example '1', '2', '3' or 'i'.
@@ -1224,6 +1336,7 @@ public function get_question_number($slot) {
 
     /**
      * If the section heading, if any, that should come just before this slot.
+     *
      * @param int $slot identifies a particular question in this attempt.
      * @return string the required heading, or null if there is not one here.
      */
@@ -1237,6 +1350,7 @@ public function get_heading_before_slot($slot) {
 
     /**
      * Return the page of the quiz where this question appears.
+     *
      * @param int $slot the number used to identify this question within this attempt.
      * @return int the page of the quiz this question appears on.
      */
@@ -1274,7 +1388,7 @@ public function get_question_state($slot) {
      *
      * @param int $slot the number used to identify this question within this attempt.
      * @param bool $showcorrectness Whether right/partial/wrong states should
-     * be distinguised.
+     *      be distinguished.
      * @return string the formatted grade, to the number of decimal places specified
      *      by the quiz.
      */
@@ -1289,7 +1403,7 @@ public function get_question_status($slot, $showcorrectness) {
      *
      * @param int $slot the number used to identify this question within this attempt.
      * @param bool $showcorrectness Whether right/partial/wrong states should
-     * be distinguised.
+     *      be distinguished.
      * @return string class name for this state.
      */
     public function get_question_state_class($slot, $showcorrectness) {
@@ -1298,6 +1412,7 @@ public function get_question_state_class($slot, $showcorrectness) {
 
     /**
      * Return the grade obtained on a particular question.
+     *
      * You must previously have called load_question_states to load the state
      * data about this question.
      *
@@ -1310,6 +1425,7 @@ public function get_question_mark($slot) {
 
     /**
      * Get the time of the most recent action performed on a question.
+     *
      * @param int $slot the number used to identify this question within this usage.
      * @return int timestamp.
      */
@@ -1321,7 +1437,7 @@ public function get_question_action_time($slot) {
      * Return the question type name for a given slot within the current attempt.
      *
      * @param int $slot the number used to identify this question within this attempt.
-     * @return string the question type name
+     * @return string the question type name.
      * @since  Moodle 3.1
      */
     public function get_question_type_name($slot) {
@@ -1330,7 +1446,8 @@ public function get_question_type_name($slot) {
 
     /**
      * Get the time remaining for an in-progress attempt, if the time is short
-     * enought that it would be worth showing a timer.
+     * enough that it would be worth showing a timer.
+     *
      * @param int $timenow the time to consider as 'now'.
      * @return int|false the number of seconds remaining for this attempt.
      *      False if there is no limit.
@@ -1354,6 +1471,7 @@ public function get_submitted_date() {
     /**
      * If the attempt is in an applicable state, work out the time by which the
      * student should next do something.
+     *
      * @return int timestamp by which the student needs to do something.
      */
     public function get_due_date() {
@@ -1391,6 +1509,10 @@ public function view_url() {
     }
 
     /**
+     * Get the URL to start or continue an attempt.
+     *
+     * @param int|null $slot which question in the attempt to go to after starting (optional).
+     * @param int $page which page in the attempt to go to after starting.
      * @return string the URL of this quiz's edit page. Needs to be POSTed to with a cmid parameter.
      */
     public function start_attempt_url($slot = null, $page = -1) {
@@ -1403,11 +1525,29 @@ public function start_attempt_url($slot = null, $page = -1) {
     }
 
     /**
-     * @param int $slot if speified, the slot number of a specific question to link to.
-     * @param int $page if specified, a particular page to link to. If not givem deduced
+     * Generates the title of the attempt page.
+     *
+     * @param int $page the page number (starting with 0) in the attempt.
+     * @return string attempt page title.
+     */
+    public function attempt_page_title(int $page) : string {
+        if ($this->get_num_pages() > 1) {
+            $a = new stdClass();
+            $a->name = $this->get_quiz_name();
+            $a->currentpage = $page + 1;
+            $a->totalpages = $this->get_num_pages();
+            $title = get_string('attempttitlepaged', 'quiz', $a);
+        } else {
+            $title = get_string('attempttitle', 'quiz', $this->get_quiz_name());
+        }
+
+        return $title;
+    }
+
+    /**
+     * @param int|null $slot if specified, the slot number of a specific question to link to.
+     * @param int $page if specified, a particular page to link to. If not given deduced
      *      from $slot, or goes to the first page.
-     * @param int $questionid a question id. If set, will add a fragment to the URL
-     * to jump to a particuar question on the page.
      * @param int $thispage if not -1, the current page. Will cause links to other things on
      * this page to be output as only a fragment.
      * @return string the URL to continue this attempt.
@@ -1417,27 +1557,57 @@ public function attempt_url($slot = null, $page = -1, $thispage = -1) {
     }
 
     /**
-     * @return string the URL of this quiz's summary page.
+     * Generates the title of the summary page.
+     *
+     * @return string summary page title.
+     */
+    public function summary_page_title() : string {
+        return get_string('attemptsummarytitle', 'quiz', $this->get_quiz_name());
+    }
+
+    /**
+     * @return moodle_url the URL of this quiz's summary page.
      */
     public function summary_url() {
         return new moodle_url('/mod/quiz/summary.php', array('attempt' => $this->attempt->id, 'cmid' => $this->get_cmid()));
     }
 
     /**
-     * @return string the URL of this quiz's summary page.
+     * @return moodle_url the URL of this quiz's summary page.
      */
     public function processattempt_url() {
         return new moodle_url('/mod/quiz/processattempt.php');
     }
 
     /**
-     * @param int $slot indicates which question to link to.
+     * Generates the title of the review page.
+     *
+     * @param int $page the page number (starting with 0) in the attempt.
+     * @param bool $showall whether the review page contains the entire attempt on one page.
+     * @return string title of the review page.
+     */
+    public function review_page_title(int $page, bool $showall = false) : string {
+        if (!$showall && $this->get_num_pages() > 1) {
+            $a = new stdClass();
+            $a->name = $this->get_quiz_name();
+            $a->currentpage = $page + 1;
+            $a->totalpages = $this->get_num_pages();
+            $title = get_string('attemptreviewtitlepaged', 'quiz', $a);
+        } else {
+            $title = get_string('attemptreviewtitle', 'quiz', $this->get_quiz_name());
+        }
+
+        return $title;
+    }
+
+    /**
+     * @param int|null $slot indicates which question to link to.
      * @param int $page if specified, the URL of this particular page of the attempt, otherwise
-     * the URL will go to the first page.  If -1, deduce $page from $slot.
+     *      the URL will go to the first page.  If -1, deduce $page from $slot.
      * @param bool|null $showall if true, the URL will be to review the entire attempt on one page,
-     * and $page will be ignored. If null, a sensible default will be chosen.
+     *      and $page will be ignored. If null, a sensible default will be chosen.
      * @param int $thispage if not -1, the current page. Will cause links to other things on
-     * this page to be output as only a fragment.
+     *      this page to be output as only a fragment.
      * @return string the URL to review this attempt.
      */
     public function review_url($slot = null, $page = -1, $showall = null, $thispage = -1) {
@@ -1446,8 +1616,9 @@ public function review_url($slot = null, $page = -1, $showall = null, $thispage
 
     /**
      * By default, should this script show all questions on one page for this attempt?
+     *
      * @param string $script the script name, e.g. 'attempt', 'summary', 'review'.
-     * @return whether show all on one page should be on by default.
+     * @return bool whether show all on one page should be on by default.
      */
     public function get_default_show_all($script) {
         return $script == 'review' && count($this->questionpages) < self::MAX_SLOTS_FOR_DEFAULT_REVIEW_SHOW_ALL;
@@ -1460,7 +1631,7 @@ public function get_default_show_all($script) {
      * attempt at the moment, return an appropriate string explaining why.
      *
      * @param bool $short if true, return a shorter string.
-     * @return string an appropraite message.
+     * @return string an appropriate message.
      */
     public function cannot_review_message($short = false) {
         return $this->quizobj->cannot_review_message(
@@ -1469,7 +1640,10 @@ public function cannot_review_message($short = false) {
 
     /**
      * Initialise the JS etc. required all the questions on a page.
-     * @param mixed $page a page number, or 'all'.
+     *
+     * @param int|string $page a page number, or 'all'.
+     * @param bool $showall if true forces page number to all.
+     * @return string HTML to output - mostly obsolete, will probably be an empty string.
      */
     public function get_html_head_contributions($page = 'all', $showall = false) {
         if ($showall) {
@@ -1485,7 +1659,9 @@ public function get_html_head_contributions($page = 'all', $showall = false) {
 
     /**
      * Initialise the JS etc. required by one question.
-     * @param int $questionid the question id.
+     *
+     * @param int $slot the question slot number.
+     * @return string HTML to output - but this is mostly obsolete. Will probably be an empty string.
      */
     public function get_question_html_head_contributions($slot) {
         return $this->quba->render_question_head_html($slot) .
@@ -1495,6 +1671,8 @@ public function get_question_html_head_contributions($slot) {
     /**
      * Print the HTML for the start new preview button, if the current user
      * is allowed to see one.
+     *
+     * @return string HTML for the button.
      */
     public function restart_preview_button() {
         global $OUTPUT;
@@ -1544,7 +1722,8 @@ public function render_question($slot, $reviewing, mod_quiz_renderer $renderer,
      * @param int|null $seq the seq number of the past state to display.
      * @return string HTML fragment.
      */
-    protected function render_question_helper($slot, $reviewing, $thispageurl, mod_quiz_renderer $renderer, $seq) {
+    protected function render_question_helper($slot, $reviewing, $thispageurl,
+            mod_quiz_renderer $renderer, $seq) {
         $originalslot = $this->get_original_slot($slot);
         $number = $this->get_question_number($originalslot);
         $displayoptions = $this->get_display_options_with_edit_link($reviewing, $slot, $thispageurl);
@@ -1585,7 +1764,7 @@ protected function render_question_helper($slot, $reviewing, $thispageurl, mod_q
      * until the previous question has been answered.
      *
      * @param int $slot int slot number of the question to replace.
-     * @return question_definition the placeholde question.
+     * @return question_attempt the placeholder question attempt.
      */
     protected function make_blocked_question_placeholder($slot) {
         $replacedquestion = $this->get_question_attempt($slot)->get_question();
@@ -1623,21 +1802,23 @@ protected function make_blocked_question_placeholder($slot) {
      * Like {@link render_question()} but displays the question at the past step
      * indicated by $seq, rather than showing the latest step.
      *
-     * @param int $id the id of a question in this quiz attempt.
+     * @param int $slot the slot number of a question in this quiz attempt.
      * @param int $seq the seq number of the past state to display.
      * @param bool $reviewing is the being printed on an attempt or a review page.
      * @param mod_quiz_renderer $renderer the quiz renderer.
-     * @param string $thispageurl the URL of the page this question is being printed on.
+     * @param moodle_url $thispageurl the URL of the page this question is being printed on.
      * @return string HTML for the question in its current state.
      */
-    public function render_question_at_step($slot, $seq, $reviewing, mod_quiz_renderer $renderer, $thispageurl = '') {
+    public function render_question_at_step($slot, $seq, $reviewing,
+            mod_quiz_renderer $renderer, $thispageurl = null) {
         return $this->render_question_helper($slot, $reviewing, $thispageurl, $renderer, $seq);
     }
 
     /**
      * Wrapper round print_question from lib/questionlib.php.
      *
-     * @param int $id the id of a question in this quiz attempt.
+     * @param int $slot the id of a question in this quiz attempt.
+     * @return string HTML of the question.
      */
     public function render_question_for_commenting($slot) {
         $options = $this->get_display_options(true);
@@ -1650,9 +1831,13 @@ public function render_question_for_commenting($slot) {
     /**
      * Check wheter access should be allowed to a particular file.
      *
-     * @param int $id the id of a question in this quiz attempt.
+     * @param int $slot the slot of a question in this quiz attempt.
      * @param bool $reviewing is the being printed on an attempt or a review page.
-     * @param string $thispageurl the URL of the page this question is being printed on.
+     * @param int $contextid the file context id from the request.
+     * @param string $component the file component from the request.
+     * @param string $filearea the file area from the request.
+     * @param array $args extra part components from the request.
+     * @param bool $forcedownload whether to force download.
      * @return string HTML for the question in its current state.
      */
     public function check_file_access($slot, $reviewing, $contextid, $component,
@@ -1676,10 +1861,11 @@ public function check_file_access($slot, $reviewing, $contextid, $component,
     /**
      * Get the navigation panel object for this attempt.
      *
-     * @param $panelclass The type of panel, quiz_attempt_nav_panel or quiz_review_nav_panel
-     * @param $page the current page number.
-     * @param $showall whether we are showing the whole quiz on one page. (Used by review.php)
-     * @return quiz_nav_panel_base the requested object.
+     * @param mod_quiz_renderer $output the quiz renderer to use to output things.
+     * @param string $panelclass The type of panel, quiz_attempt_nav_panel or quiz_review_nav_panel
+     * @param int $page the current page number.
+     * @param bool $showall whether we are showing the whole quiz on one page. (Used by review.php.)
+     * @return block_contents the requested object.
      */
     public function get_navigation_panel(mod_quiz_renderer $output,
              $panelclass, $page, $showall = false) {
@@ -1701,12 +1887,13 @@ public function get_navigation_panel(mod_quiz_renderer $output,
      *
      * The {@link mod_quiz_links_to_other_attempts} object returned contains an
      * array with keys that are the attempt number, 1, 2, 3.
-     * The array values are either a {@link moodle_url} with the attmept parameter
+     * The array values are either a {@link moodle_url} with the attempt parameter
      * updated to point to the attempt id of the other attempt, or null corresponding
      * to the current attempt number.
      *
      * @param moodle_url $url a URL.
-     * @return mod_quiz_links_to_other_attempts containing array int => null|moodle_url.
+     * @return mod_quiz_links_to_other_attempts|bool containing array int => null|moodle_url.
+     *      False if none.
      */
     public function links_to_other_attempts(moodle_url $url) {
         $attempts = quiz_get_user_attempts($this->get_quiz()->id, $this->attempt->userid, 'all');
@@ -1770,18 +1957,17 @@ public function links_to_other_redos($slot, moodle_url $baseurl) {
 
     /**
      * Check this attempt, to see if there are any state transitions that should
-     * happen automatically.  This function will update the attempt checkstatetime.
-     * @param int $timestamp the timestamp that should be stored as the modifed
+     * happen automatically. This function will update the attempt checkstatetime.
+     * @param int $timestamp the timestamp that should be stored as the modified
      * @param bool $studentisonline is the student currently interacting with Moodle?
      */
     public function handle_if_time_expired($timestamp, $studentisonline) {
-        global $DB;
 
         $timeclose = $this->get_access_manager($timestamp)->get_end_time($this->attempt);
 
         if ($timeclose === false || $this->is_preview()) {
             $this->update_timecheckstate(null);
-            return; // No time limit
+            return; // No time limit.
         }
         if ($timestamp < $timeclose) {
             $this->update_timecheckstate($timeclose);
@@ -1830,8 +2016,8 @@ public function handle_if_time_expired($timestamp, $studentisonline) {
     /**
      * Process all the actions that were submitted as part of the current request.
      *
-     * @param int  $timestamp  the timestamp that should be stored as the modifed
-     *                         time in the database for these actions. If null, will use the current time.
+     * @param int $timestamp the timestamp that should be stored as the modified.
+     *      time in the database for these actions. If null, will use the current time.
      * @param bool $becomingoverdue
      * @param array|null $simulatedresponses If not null, then we are testing, and this is an array of simulated data.
      *      There are two formats supported here, for historical reasons. The newer approach is to pass an array created by
@@ -1877,8 +2063,12 @@ public function process_submitted_actions($timestamp, $becomingoverdue = false,
     }
 
     /**
-     * Replace a question in an attempt with a new attempt at the same qestion.
-     * @param int $slot the questoin to restart.
+     * Replace a question in an attempt with a new attempt at the same question.
+     *
+     * Well, for randomised questions, it won't be the same question, it will be
+     * a different randomised selection.
+     *
+     * @param int $slot the question to restart.
      * @param int $timestamp the timestamp to record for this action.
      */
     public function process_redo_question($slot, $timestamp) {
@@ -1890,7 +2080,7 @@ public function process_redo_question($slot, $timestamp) {
         }
 
         $qubaids = new \mod_quiz\question\qubaids_for_users_attempts(
-                $this->get_quizid(), $this->get_userid());
+                $this->get_quizid(), $this->get_userid(), 'all', true);
 
         $transaction = $DB->start_delegated_transaction();
 
@@ -1937,7 +2127,7 @@ public function process_redo_question($slot, $timestamp) {
     /**
      * Process all the autosaved data that was part of the current request.
      *
-     * @param int $timestamp the timestamp that should be stored as the modifed
+     * @param int $timestamp the timestamp that should be stored as the modified.
      * time in the database for these actions. If null, will use the current time.
      */
     public function process_auto_save($timestamp) {
@@ -1998,7 +2188,8 @@ public function process_finish($timestamp, $processsubmitted) {
 
     /**
      * Update this attempt timecheckstate if necessary.
-     * @param int|null the timecheckstate
+     *
+     * @param int|null $time the timestamp to set.
      */
     public function update_timecheckstate($time) {
         global $DB;
@@ -2010,6 +2201,7 @@ public function update_timecheckstate($time) {
 
     /**
      * Mark this attempt as now overdue.
+     *
      * @param int $timestamp the time to deem as now.
      * @param bool $studentisonline is the student currently interacting with Moodle?
      */
@@ -2033,6 +2225,7 @@ public function process_going_overdue($timestamp, $studentisonline) {
 
     /**
      * Mark this attempt as abandoned.
+     *
      * @param int $timestamp the time to deem as now.
      * @param bool $studentisonline is the student currently interacting with Moodle?
      */
@@ -2052,10 +2245,9 @@ public function process_abandon($timestamp, $studentisonline) {
 
     /**
      * Fire a state transition event.
-     * the same event information.
+     *
      * @param string $eventclass the event class name.
      * @param int $timestamp the timestamp to include in the event.
-     * @return void
      */
     protected function fire_state_transition_event($eventclass, $timestamp) {
         global $USER;
@@ -2083,7 +2275,7 @@ protected function fire_state_transition_event($eventclass, $timestamp) {
      * Get a URL for a particular question on a particular page of the quiz.
      * Used by {@link attempt_url()} and {@link review_url()}.
      *
-     * @param string $script. Used in the URL like /mod/quiz/$script.php
+     * @param string $script. Used in the URL like /mod/quiz/$script.php.
      * @param int $slot identifies the specific question on the page to jump to.
      *      0 to just use the $page parameter.
      * @param int $page -1 to look up the page number from the slot, otherwise
@@ -2092,7 +2284,7 @@ protected function fire_state_transition_event($eventclass, $timestamp) {
      *      if null, then an intelligent default will be chosen.
      * @param int $thispage the page we are currently on. Links to questions on this
      *      page will just be a fragment #q123. -1 to disable this.
-     * @return The requested URL.
+     * @return moodle_url The requested URL.
      */
     protected function page_and_question_url($script, $slot, $page, $showall, $thispage) {
 
@@ -2121,7 +2313,8 @@ protected function page_and_question_url($script, $slot, $page, $showall, $thisp
                 // First question on page, go to top.
                 $fragment = '#';
             } else {
-                $fragment = '#q' . $slot;
+                $qa = $this->get_question_attempt($slot);
+                $fragment = '#' . $qa->get_outer_question_div_unique_id();
             }
         }
 
@@ -2144,13 +2337,12 @@ protected function page_and_question_url($script, $slot, $page, $showall, $thisp
     /**
      * Process responses during an attempt at a quiz.
      *
-     * @param  int $timenow time when the processing started
-     * @param  bool $finishattempt whether to finish the attempt or not
-     * @param  bool $timeup true if form was submitted by timer
-     * @param  int $thispage current page number
-     * @return string the attempt state once the data has been processed
+     * @param  int $timenow time when the processing started.
+     * @param  bool $finishattempt whether to finish the attempt or not.
+     * @param  bool $timeup true if form was submitted by timer.
+     * @param  int $thispage current page number.
+     * @return string the attempt state once the data has been processed.
      * @since  Moodle 3.1
-     * @throws  moodle_exception
      */
     public function process_attempt($timenow, $finishattempt, $timeup, $thispage) {
         global $DB;
@@ -2269,13 +2461,11 @@ public function process_attempt($timenow, $finishattempt, $timeup, $thispage) {
     /**
      * Check a page access to see if is an out of sequence access.
      *
-     * @param  int $page page number
+     * @param  int $page page number.
      * @return boolean false is is an out of sequence access, true otherwise.
      * @since Moodle 3.1
      */
     public function check_page_access($page) {
-        global $DB;
-
         if ($this->get_currentpage() != $page) {
             if ($this->get_navigation_method() == QUIZ_NAVMETHOD_SEQ && $this->get_currentpage() > $page) {
                 return false;
@@ -2287,7 +2477,7 @@ public function check_page_access($page) {
     /**
      * Update attempt page.
      *
-     * @param  int $page page number
+     * @param  int $page page number.
      * @return boolean true if everything was ok, false otherwise (out of sequence access).
      * @since Moodle 3.1
      */
@@ -2365,15 +2555,14 @@ public function fire_attempt_reviewed_event() {
 
     /**
      * Update the timemodifiedoffline attempt field.
+     *
      * This function should be used only when web services are being used.
      *
-     * @param int $time time stamp
+     * @param int $time time stamp.
      * @return boolean false if the field is not updated because web services aren't being used.
      * @since Moodle 3.2
      */
     public function set_offline_modified_time($time) {
-        global $DB;
-
         // Update the timemodifiedoffline field only if web services are being used.
         if (WS_SERVER) {
             $this->attempt->timemodifiedoffline = $time;
@@ -2430,6 +2619,8 @@ class quiz_nav_question_button implements renderable {
     public $flagged;
     /** @var moodle_url the link this button goes to, or null if there should not be a link. */
     public $url;
+    /** @var int QUIZ_NAVMETHOD_FREE or QUIZ_NAVMETHOD_SEQ. */
+    public $navmethod;
 }
 
 
@@ -2461,6 +2652,7 @@ public function __construct(quiz_attempt $attemptobj,
 
     /**
      * Get the buttons and section headings to go in the quiz navigation block.
+     *
      * @return renderable[] the buttons, possibly interleaved with section headings.
      */
     public function get_question_buttons() {
@@ -2510,12 +2702,24 @@ protected function get_state_string(question_attempt $qa, $showcorrectness) {
         }
     }
 
+    /**
+     * Hook for subclasses to override.
+     *
+     * @param mod_quiz_renderer $output the quiz renderer to use.
+     * @return string HTML to output.
+     */
     public function render_before_button_bits(mod_quiz_renderer $output) {
         return '';
     }
 
     abstract public function render_end_bits(mod_quiz_renderer $output);
 
+    /**
+     * Render the restart preview button.
+     *
+     * @param mod_quiz_renderer $output the quiz renderer to use.
+     * @return string HTML to output.
+     */
     protected function render_restart_preview_link($output) {
         if (!$this->attemptobj->is_own_preview()) {
             return '';
@@ -2543,6 +2747,7 @@ public function user_picture() {
     /**
      * Return 'allquestionsononepage' as CSS class name when $showall is set,
      * otherwise, return 'multipages' as CSS class name.
+     *
      * @return string, CSS class name
      */
     public function get_button_container_class() {
diff --git a/mod/quiz/backup/moodle2/backup_quiz_stepslib.php b/mod/quiz/backup/moodle2/backup_quiz_stepslib.php
index 1e72487c7b12b..ae656816853a2 100644
--- a/mod/quiz/backup/moodle2/backup_quiz_stepslib.php
+++ b/mod/quiz/backup/moodle2/backup_quiz_stepslib.php
@@ -140,6 +140,13 @@ protected function define_structure() {
             $overrideparams['userid'] = backup_helper::is_sqlparam(null);
 
         }
+
+        // Skip group overrides if not including groups.
+        $groupinfo = $this->get_setting_value('groups');
+        if (!$groupinfo) {
+            $overrideparams['groupid'] = backup_helper::is_sqlparam(null);
+        }
+
         $override->set_source_table('quiz_overrides', $overrideparams);
 
         // All the rest of elements only happen if we are including user info.
diff --git a/mod/quiz/backup/moodle2/restore_quiz_stepslib.php b/mod/quiz/backup/moodle2/restore_quiz_stepslib.php
index 3c31ba2559dc0..aafaa3a6adb74 100644
--- a/mod/quiz/backup/moodle2/restore_quiz_stepslib.php
+++ b/mod/quiz/backup/moodle2/restore_quiz_stepslib.php
@@ -377,6 +377,11 @@ protected function process_quiz_override($data) {
             $data->groupid = $this->get_mappingid('group', $data->groupid);
         }
 
+        // Skip if there is no user and no group data.
+        if (empty($data->userid) && empty($data->groupid)) {
+            return;
+        }
+
         $data->timeopen = $this->apply_date_offset($data->timeopen);
         $data->timeclose = $this->apply_date_offset($data->timeclose);
 
diff --git a/mod/quiz/classes/external.php b/mod/quiz/classes/external.php
index 9c38f7e69bcca..f7efb989a98ee 100644
--- a/mod/quiz/classes/external.php
+++ b/mod/quiz/classes/external.php
@@ -105,8 +105,9 @@ public static function get_quizzes_by_courses($courseids = array()) {
 
                 if (has_capability('mod/quiz:view', $context)) {
                     // Format intro.
-                    list($quizdetails['intro'], $quizdetails['introformat']) = external_format_text($quiz->intro,
-                                                                    $quiz->introformat, $context->id, 'mod_quiz', 'intro', null);
+                    $options = array('noclean' => true);
+                    list($quizdetails['intro'], $quizdetails['introformat']) =
+                        external_format_text($quiz->intro, $quiz->introformat, $context->id, 'mod_quiz', 'intro', null, $options);
 
                     $quizdetails['introfiles'] = external_util::get_area_files($context->id, 'mod_quiz', 'intro', false, false);
                     $viewablefields = array('timeopen', 'timeclose', 'grademethod', 'section', 'visible', 'groupmode',
@@ -1299,7 +1300,8 @@ protected static function validate_attempt_review($params) {
             if (!$attemptobj->is_finished()) {
                 throw new moodle_quiz_exception($attemptobj->get_quizobj(), 'attemptclosed');
             } else if (!$displayoptions->attempt) {
-                throw new moodle_exception($attemptobj->cannot_review_message());
+                throw new moodle_quiz_exception($attemptobj->get_quizobj(), 'noreview', null, '',
+                    $attemptobj->cannot_review_message());
             }
         } else if (!$attemptobj->is_review_allowed()) {
             throw new moodle_quiz_exception($attemptobj->get_quizobj(), 'noreviewattempt');
diff --git a/mod/quiz/classes/output/edit_renderer.php b/mod/quiz/classes/output/edit_renderer.php
index 0ddbd17b2b54a..d4ab722f24b89 100644
--- a/mod/quiz/classes/output/edit_renderer.php
+++ b/mod/quiz/classes/output/edit_renderer.php
@@ -654,18 +654,20 @@ public function edit_menu_actions(structure $structure, $page,
         $actions['questionbank'] = new \action_menu_link_secondary($pageurl, $icon, $str->questionbank, $attributes);
 
         // Add a random question.
-        $returnurl = new \moodle_url('/mod/quiz/edit.php', array('cmid' => $structure->get_cmid(), 'data-addonpage' => $page));
-        $params = array('returnurl' => $returnurl, 'cmid' => $structure->get_cmid(), 'appendqnumstring' => 'addarandomquestion');
-        $url = new \moodle_url('/mod/quiz/addrandom.php', $params);
-        $icon = new \pix_icon('t/add', $str->addarandomquestion, 'moodle', array('class' => 'iconsmall', 'title' => ''));
-        $attributes = array('class' => 'cm-edit-action addarandomquestion', 'data-action' => 'addarandomquestion');
-        if ($page) {
-            $title = get_string('addrandomquestiontopage', 'quiz', $page);
-        } else {
-            $title = get_string('addrandomquestionatend', 'quiz');
+        if ($structure->can_add_random_questions()) {
+            $returnurl = new \moodle_url('/mod/quiz/edit.php', array('cmid' => $structure->get_cmid(), 'data-addonpage' => $page));
+            $params = ['returnurl' => $returnurl, 'cmid' => $structure->get_cmid(), 'appendqnumstring' => 'addarandomquestion'];
+            $url = new \moodle_url('/mod/quiz/addrandom.php', $params);
+            $icon = new \pix_icon('t/add', $str->addarandomquestion, 'moodle', array('class' => 'iconsmall', 'title' => ''));
+            $attributes = array('class' => 'cm-edit-action addarandomquestion', 'data-action' => 'addarandomquestion');
+            if ($page) {
+                $title = get_string('addrandomquestiontopage', 'quiz', $page);
+            } else {
+                $title = get_string('addrandomquestionatend', 'quiz');
+            }
+            $attributes = array_merge(array('data-header' => $title, 'data-addonpage' => $page), $attributes);
+            $actions['addarandomquestion'] = new \action_menu_link_secondary($url, $icon, $str->addarandomquestion, $attributes);
         }
-        $attributes = array_merge(array('data-header' => $title, 'data-addonpage' => $page), $attributes);
-        $actions['addarandomquestion'] = new \action_menu_link_secondary($url, $icon, $str->addarandomquestion, $attributes);
 
         // Add a new section to the add_menu if possible. This is always added to the HTML
         // then hidden with CSS when no needed, so that as things are re-ordered, etc. with
@@ -937,7 +939,7 @@ public function question_name(structure $structure, $slot, $pageurl) {
         $namestr = $qtype->local_name();
 
         $icon = $this->pix_icon('icon', $namestr, $qtype->plugin_name(), array('title' => $namestr,
-                'class' => 'icon activityicon', 'alt' => ' ', 'role' => 'presentation'));
+                'class' => 'activityicon', 'alt' => ' ', 'role' => 'presentation'));
 
         $editicon = $this->pix_icon('t/edit', '', 'moodle', array('title' => ''));
 
diff --git a/mod/quiz/classes/structure.php b/mod/quiz/classes/structure.php
index 60ba7d8b2474f..1c93753559b72 100644
--- a/mod/quiz/classes/structure.php
+++ b/mod/quiz/classes/structure.php
@@ -59,6 +59,9 @@ class structure {
     /** @var bool caches the results of can_be_edited. */
     protected $canbeedited = null;
 
+    /** @var bool caches the results of can_add_random_question. */
+    protected $canaddrandom = null;
+
     /** @var bool tracks whether tags have been loaded */
     protected $hasloadedtags = false;
 
@@ -1093,4 +1096,23 @@ public function get_slot_tags_for_slot_id($slotid) {
 
         return isset($this->slottags[$slotid]) ? $this->slottags[$slotid] : [];
     }
+
+    /**
+     * Whether the current user can add random questions to the quiz or not.
+     * It is only possible to add a random question if the user has the moodle/question:useall capability
+     * on at least one of the contexts related to the one where we are currently editing questions.
+     *
+     * @return bool
+     */
+    public function can_add_random_questions() {
+        if ($this->canaddrandom === null) {
+            $quizcontext = $this->quizobj->get_context();
+            $relatedcontexts = new \question_edit_contexts($quizcontext);
+            $usablecontexts = $relatedcontexts->having_cap('moodle/question:useall');
+
+            $this->canaddrandom = !empty($usablecontexts);
+        }
+
+        return $this->canaddrandom;
+    }
 }
diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index fea86fb4e916f..a5ac37f1a3cc5 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -141,11 +141,21 @@ function xmldb_quiz_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018040800, 'quiz');
     }
 
+    if ($oldversion < 2019052001) {
+        // Delete orphaned group overrides.
+        $DB->delete_records_select('quiz_overrides', 'groupid = 0 AND userid IS NULL');
+
+        upgrade_mod_savepoint(true, 2019052001, 'quiz');
+    }
+
     // Automatically generated Moodle v3.5.0 release upgrade line.
     // Put any upgrade step following this.
 
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/grade.php b/mod/quiz/grade.php
index f7ca5cbacb48c..970aa6f5543c7 100644
--- a/mod/quiz/grade.php
+++ b/mod/quiz/grade.php
@@ -81,6 +81,7 @@
     if ($attempt) {
         $attemptobj = new quiz_attempt($attempt, $quiz, $cm, $course, false);
         if ($attemptobj->is_review_allowed()) {
+            $attemptobj->load_questions();
             redirect($attemptobj->review_url());
         }
     }
diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
index bed899502f5cb..763bb08b907db 100644
--- a/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@ -98,6 +98,8 @@
 $string['attemptlast'] = 'Last attempt';
 $string['attemptnumber'] = 'Attempt';
 $string['attemptquiznow'] = 'Attempt quiz now';
+$string['attemptreviewtitle'] = '{$a}: Attempt review';
+$string['attemptreviewtitlepaged'] = '{$a->name}: Attempt review (page {$a->currentpage} of {$a->totalpages})';
 $string['attempts'] = 'Attempts';
 $string['attempts_help'] = 'The total number of attempts allowed (not the number of extra attempts).';
 $string['attemptsallowed'] = 'Attempts allowed';
@@ -110,7 +112,10 @@
 $string['attemptsonly'] = 'Show only students with attempts';
 $string['attemptstate'] = 'State';
 $string['attemptstillinprogress'] = 'Attempt still in progress';
+$string['attemptsummarytitle'] = '{$a}: Attempt summary';
 $string['attemptsunlimited'] = 'Unlimited attempts';
+$string['attempttitle'] = '{$a}';
+$string['attempttitlepaged'] = '{$a->name} (page {$a->currentpage} of {$a->totalpages})';
 $string['autosaveperiod'] = 'Auto-save delay';
 $string['autosaveperiod_desc'] = 'Responses can be saved automatically during quiz attempts. The responses are saved whenever one is changed, and then after this delay. There is a trade-off: a shorter delay increases the server load, but reduces the chance that students lose their work. If you are going to make this delay much shorter, you should change the value gradually and monitor the server load. If the load gets too high, make the delay longer again. Setting the delay to 0 turns off auto-saving.';
 $string['back'] = 'Back to preview question';
@@ -151,12 +156,12 @@
 $string['cannotstartnoquestions'] = 'Cannot start an attempt at this quiz. The quiz has not been set up yet. No questions have been added.';
 $string['cannotwrite'] = 'Cannot write to export file ({$a})';
 $string['canredoquestions'] = 'Allow redo within an attempt';
-$string['canredoquestions_desc'] = 'If enabled, then when students have finished attempting particular question, they will see a Redo question button. This allows them to attempt another version of the same question, without having to submit the entire quiz attempt and start another one. This option is mainly useful for practice quizzes.
+$string['canredoquestions_desc'] = 'If enabled, when a student has finished attempting a question, they will see a Redo question button. This allows them to attempt another version of the same question, without having to submit the entire quiz attempt and start another attempt. This option is useful for practice quizzes.
 
-This setting only affects questions (for example not Essay questions) and behaviours (for example Immediate feedback, or Interactive with multiple tries) where it is possible for student to finish the question before the attempt is submitted.';
-$string['canredoquestions_help'] = 'If enabled, then when students have finished attempting particular question, they will see a Redo question button. This allows them to attempt another version of the same question, without having to submit the entire quiz attempt and start another one. This option is mainly useful for practice quizzes.
+This setting only affects questions and behaviours (such as immediate feedback or interactive with multiple tries) where it is possible for student to finish the question before the attempt is submitted.';
+$string['canredoquestions_help'] = 'If enabled, when a student has finished attempting a question, they will see a Redo question button. This allows them to attempt another version of the same question, without having to submit the entire quiz attempt and start another attempt. This option is useful for practice quizzes.
 
-This setting only affects questions (for example not Essay questions) and behaviours (for example Immediate feedback, or Interactive with multiple tries) where it is possible for student to finish the question before the attempt is submitted.';
+This setting only affects questions and behaviours (such as immediate feedback or interactive with multiple tries) where it is possible for student to finish the question before the attempt is submitted.';
 $string['canredoquestionsyes'] = 'Students may redo another version of any finished question';
 $string['caseno'] = 'No, case is unimportant';
 $string['casesensitive'] = 'Case sensitivity';
@@ -376,8 +381,8 @@
 $string['generalfeedback'] = 'General feedback';
 $string['generalfeedback_help'] = 'General feedback is text which is shown after a question has been attempted. Unlike feedback for a specific question which depends on the response given, the same general feedback is always shown.';
 $string['graceperiod'] = 'Submission grace period';
-$string['graceperiod_desc'] = 'If what to do when time expires is set to \'Allow a grace period to submit, but not change any responses\', this is the default amount of extra time that is allowed.';
-$string['graceperiod_help'] = 'If what to do when time expires is set to \'Allow a grace period to submit, but not change any responses\', this is the amount of extra time that is allowed.';
+$string['graceperiod_desc'] = 'If what to do when the time expires is set to \'There is a grace period...\', then this is the default amount of extra time that is allowed.';
+$string['graceperiod_help'] = 'If what to do when the time expires is set to \'There is a grace period...\', then this is the amount of extra time that is allowed.';
 $string['graceperiodmin'] = 'Last submission grace period';
 $string['graceperiodmin_desc'] = 'There is a potential problem right at the end of the quiz. On the one hand, we want to let students continue working right up until the last second - with the help of the timer that automatically submits the quiz when time runs out. On the other hand, the server may then be overloaded, and take some time to get to process the responses. Therefore, we will accept responses for up to this long after time expires, so they are not penalised for the server being slow. However, the student could cheat and get this many seconds to answer the quiz. You have to make a trade-off based on how much you trust the performance of your server during quizzes.';
 $string['graceperiodtoosmall'] = 'The grace period must be more than {$a}.';
@@ -405,7 +410,7 @@
 $string['gradingmethod'] = 'Grading method: {$a}';
 $string['groupoverrides'] = 'Group overrides';
 $string['groupoverridesdeleted'] = 'Group overrides deleted';
-$string['groupsnone'] = 'There are no groups in this course';
+$string['groupsnone'] = 'No groups you can access.';
 $string['guestsno'] = 'Sorry, guests cannot see or attempt quizzes';
 $string['hidebreaks'] = 'Hide page breaks';
 $string['hidereordertool'] = 'Hide the reordering tool';
@@ -587,7 +592,7 @@
 $string['overdue'] = 'Overdue';
 $string['overduehandling'] = 'When time expires';
 $string['overduehandling_desc'] = 'What should happen by default if a student does not submit the quiz before time expires.';
-$string['overduehandling_help'] = 'This setting controls what happens if the Student fails to submit their quiz attempt before time expires. If the student is actively working on the quiz at the time, then the countdown timer will always automatically submit the attempt for them, but if they have logged out, then this setting controls what happens.';
+$string['overduehandling_help'] = 'This setting controls what happens if a student fails to submit their quiz attempt before the time expires. If the student is actively working on the quiz at the time, then the countdown timer will always automatically submit the attempt for them, but if they have logged out, then this setting controls what happens.';
 $string['overduehandling_link'] = 'mod/quiz/timing';
 $string['overduehandlingautosubmit'] = 'Open attempts are submitted automatically';
 $string['overduehandlinggraceperiod'] = 'There is a grace period when open attempts can be submitted, but no more questions answered';
@@ -666,7 +671,7 @@
 $string['questionbankmanagement'] = 'Question bank management';
 $string['questionbehaviour'] = 'Question behaviour';
 $string['questioncats'] = 'Question categories';
-$string['questiondeleted'] = 'This question has been deleted. Please contact your teacher';
+$string['questiondeleted'] = 'This question has been deleted. Please contact your teacher.';
 $string['questiondependencyadd'] = 'No restriction on when question {$a->thisq} can be attempted • Click to change';
 $string['questiondependencyfree'] = 'No restriction on this question';
 $string['questiondependencyremove'] = 'Question {$a->thisq} cannot be attempted until the previous question {$a->previousq} has been completed • Click to change';
@@ -893,14 +898,14 @@
 $string['showsmallimage'] = 'Small image';
 $string['showteacherattempts'] = 'Show teacher attempts';
 $string['showuserpicture'] = 'Show the user\'s picture';
-$string['showuserpicture_help'] = 'If enabled, the student\'s name and picture will be shown on-screen during the attempt, and on the review screen, making it easier to check that the student is logged in as themself in an invigilated (proctored) exam.';
+$string['showuserpicture_help'] = 'If enabled, a student\'s name and picture will be shown on-screen during the attempt, and on the review screen, making it easier to check that the student is logged in as themselves in an invigilated (proctored) exam.';
 $string['shuffle'] = 'Shuffle';
 $string['shuffleanswers'] = 'Shuffle answers';
 $string['shuffledrandomly'] = 'Shuffled randomly';
 $string['shufflequestions'] = 'Shuffle';
-$string['shufflequestions_help'] = 'If you turn this on, then every time the quiz is attempted, the order of the questions in this section will be shuffled into a different random order.
+$string['shufflequestions_help'] = 'If enabled, every time the quiz is attempted, the order of the questions in this section will be shuffled into a different random order.
 
-This can make it harder for students to share answers, but it also makes it harder for students discuss a particular question with you.';
+This can make it harder for students to share answers, but it also makes it harder for students to discuss a particular question with the teacher.';
 $string['shufflewithin'] = 'Shuffle within questions';
 $string['shufflewithin_help'] = 'If enabled, the parts making up each question will be randomly shuffled each time a student attempts the quiz, provided the option is also enabled in the question settings. This setting only applies to questions that have multiple parts, such as multiple choice or matching questions.';
 $string['singleanswer'] = 'Choose one answer.';
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 9a3baa57acf50..0b3b4ac9bed75 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -1128,6 +1128,14 @@ function quiz_process_options($quiz) {
     $quiz->reviewoverallfeedback = quiz_review_option_form_to_db($quiz, 'overallfeedback');
     $quiz->reviewattempt |= mod_quiz_display_options::DURING;
     $quiz->reviewoverallfeedback &= ~mod_quiz_display_options::DURING;
+
+    // Ensure that disabled checkboxes in completion settings are set to 0.
+    if (empty($quiz->completionusegrade)) {
+        $quiz->completionpass = 0;
+    }
+    if (empty($quiz->completionpass)) {
+        $quiz->completionattemptsexhausted = 0;
+    }
 }
 
 /**
@@ -2158,6 +2166,14 @@ function mod_quiz_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     quiz_update_effective_access($quiz, $userid);
 
     // Check if quiz is closed, if so don't display it.
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 12b54ecb9b121..146313a5e0c51 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -1423,9 +1423,9 @@ function quiz_attempt_state($quiz, $attempt) {
  * The the appropraite mod_quiz_display_options object for this attempt at this
  * quiz right now.
  *
- * @param object $quiz the quiz instance.
- * @param object $attempt the attempt in question.
- * @param $context the quiz context.
+ * @param stdClass $quiz the quiz instance.
+ * @param stdClass $attempt the attempt in question.
+ * @param context $context the quiz context.
  *
  * @return mod_quiz_display_options
  */
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index fda0558604c6c..e372bc2852c84 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -517,11 +517,6 @@ public function data_preprocessing(&$toform) {
                 $toform[$name] = $value;
             }
         }
-
-        // Completion settings check.
-        if (empty($toform['completionusegrade'])) {
-            $toform['completionpass'] = 0; // Forced unchecked.
-        }
     }
 
     public function validation($data, $files) {
diff --git a/mod/quiz/override_form.php b/mod/quiz/override_form.php
index 695f82c668f15..7561c1363586d 100644
--- a/mod/quiz/override_form.php
+++ b/mod/quiz/override_form.php
@@ -78,13 +78,16 @@ public function __construct($submiturl, $cm, $quiz, $context, $groupmode, $overr
     }
 
     protected function definition() {
-        global $CFG, $DB;
+        global $DB;
 
         $cm = $this->cm;
         $mform = $this->_form;
 
         $mform->addElement('header', 'override', get_string('override', 'quiz'));
 
+        $quizgroupmode = groups_get_activity_groupmode($cm);
+        $accessallgroups = ($quizgroupmode == NOGROUPS) || has_capability('moodle/site:accessallgroups', $this->context);
+
         if ($this->groupmode) {
             // Group override.
             if ($this->groupid) {
@@ -96,7 +99,8 @@ protected function definition() {
                 $mform->freeze('groupid');
             } else {
                 // Prepare the list of groups.
-                $groups = groups_get_all_groups($cm->course);
+                // Only include the groups the current can access.
+                $groups = $accessallgroups ? groups_get_all_groups($cm->course) : groups_get_activity_allowed_groups($cm);
                 if (empty($groups)) {
                     // Generate an error.
                     $link = new moodle_url('/mod/quiz/overrides.php', array('cmid'=>$cm->id));
@@ -136,9 +140,17 @@ protected function definition() {
                             'This is unexpected, and a problem because there is no way to pass these ' .
                             'parameters to get_users_by_capability. See MDL-34657.');
                 }
-                $users = get_users_by_capability($this->context, 'mod/quiz:attempt',
-                        'u.id, u.email, ' . get_all_user_name_fields(true, 'u'),
-                        $sort, '', '', '', '', false, true);
+
+                // Get the list of appropriate users, depending on whether and how groups are used.
+                if ($accessallgroups) {
+                    $users = get_users_by_capability($this->context, 'mod/quiz:attempt',
+                            'u.id, u.email, ' . get_all_user_name_fields(true, 'u'),
+                            $sort);
+                } else if ($groups = groups_get_activity_allowed_groups($cm)) {
+                    $users = get_users_by_capability($this->context, 'mod/quiz:attempt',
+                            'u.id, u.email, ' . get_all_user_name_fields(true, 'u'),
+                            $sort, '', '', array_keys($groups));
+                }
 
                 // Filter users based on any fixed restrictions (groups, profile).
                 $info = new \core_availability\info_module($cm);
@@ -220,7 +232,6 @@ protected function definition() {
     }
 
     public function validation($data, $files) {
-        global $COURSE, $DB;
         $errors = parent::validation($data, $files);
 
         $mform =& $this->_form;
diff --git a/mod/quiz/overridedelete.php b/mod/quiz/overridedelete.php
index 5e88eeb50d697..c4b35c4bcb3b4 100644
--- a/mod/quiz/overridedelete.php
+++ b/mod/quiz/overridedelete.php
@@ -49,6 +49,16 @@
 // Check the user has the required capabilities to modify an override.
 require_capability('mod/quiz:manageoverrides', $context);
 
+if ($override->groupid) {
+    if (!groups_group_visible($override->groupid, $course, $cm)) {
+        print_error('invalidoverrideid', 'quiz');
+    }
+} else {
+    if (!groups_user_groups_visible($course, $override->userid, $cm)) {
+        print_error('invalidoverrideid', 'quiz');
+    }
+}
+
 $url = new moodle_url('/mod/quiz/overridedelete.php', array('id'=>$override->id));
 $confirmurl = new moodle_url($url, array('id'=>$override->id, 'confirm'=>1));
 $cancelurl = new moodle_url('/mod/quiz/overrides.php', array('cmid'=>$cm->id));
diff --git a/mod/quiz/overrideedit.php b/mod/quiz/overrideedit.php
index ef1f416e7b4d8..e3c01eb9e1862 100644
--- a/mod/quiz/overrideedit.php
+++ b/mod/quiz/overrideedit.php
@@ -76,6 +76,16 @@
 if ($overrideid) {
     // Editing an override.
     $data = clone $override;
+
+    if ($override->groupid) {
+        if (!groups_group_visible($override->groupid, $course, $cm)) {
+            print_error('invalidoverrideid', 'quiz');
+        }
+    } else {
+        if (!groups_user_groups_visible($course, $override->userid, $cm)) {
+            print_error('invalidoverrideid', 'quiz');
+        }
+    }
 } else {
     // Creating a new override.
     $data = new stdClass();
diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php
index 2b7d7416a9b0a..a42c3d6f96fbe 100644
--- a/mod/quiz/overrides.php
+++ b/mod/quiz/overrides.php
@@ -35,11 +35,18 @@
 list($course, $cm) = get_course_and_cm_from_cmid($cmid, 'quiz');
 $quiz = $DB->get_record('quiz', array('id' => $cm->instance), '*', MUST_EXIST);
 
-// Get the course groups.
-$groups = groups_get_all_groups($cm->course);
-if ($groups === false) {
-    $groups = array();
-}
+require_login($course, false, $cm);
+
+$context = context_module::instance($cm->id);
+
+// Check the user has the required capabilities to list overrides.
+require_capability('mod/quiz:manageoverrides', $context);
+
+$quizgroupmode = groups_get_activity_groupmode($cm);
+$accessallgroups = ($quizgroupmode == NOGROUPS) || has_capability('moodle/site:accessallgroups', $context);
+
+// Get the course groups that the current user can access.
+$groups = $accessallgroups ? groups_get_all_groups($cm->course) : groups_get_activity_allowed_groups($cm);
 
 // Default mode is "group", unless there are no groups.
 if ($mode != "user" and $mode != "group") {
@@ -55,13 +62,6 @@
 
 $PAGE->set_url($url);
 
-require_login($course, false, $cm);
-
-$context = context_module::instance($cm->id);
-
-// Check the user has the required capabilities to list overrides.
-require_capability('mod/quiz:manageoverrides', $context);
-
 // Display a list of overrides.
 $PAGE->set_pagelayout('admin');
 $PAGE->set_title(get_string('overrides', 'quiz'));
@@ -71,38 +71,63 @@
 
 // Delete orphaned group overrides.
 $sql = 'SELECT o.id
-            FROM {quiz_overrides} o LEFT JOIN {groups} g
-            ON o.groupid = g.id
-            WHERE o.groupid IS NOT NULL
-              AND g.id IS NULL
-              AND o.quiz = ?';
+          FROM {quiz_overrides} o
+     LEFT JOIN {groups} g ON o.groupid = g.id
+         WHERE o.groupid IS NOT NULL
+               AND g.id IS NULL
+               AND o.quiz = ?';
 $params = array($quiz->id);
 $orphaned = $DB->get_records_sql($sql, $params);
 if (!empty($orphaned)) {
     $DB->delete_records_list('quiz_overrides', 'id', array_keys($orphaned));
 }
 
+$overrides = [];
+
 // Fetch all overrides.
 if ($groupmode) {
     $colname = get_string('group');
-    $sql = 'SELECT o.*, g.name
-                FROM {quiz_overrides} o
-                JOIN {groups} g ON o.groupid = g.id
-                WHERE o.quiz = :quizid
-                ORDER BY g.name';
-    $params = array('quizid' => $quiz->id);
+    // To filter the result by the list of groups that the current user has access to.
+    if ($groups) {
+        $params = ['quizid' => $quiz->id];
+        list($insql, $inparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params += $inparams;
+
+        $sql = "SELECT o.*, g.name
+                  FROM {quiz_overrides} o
+                  JOIN {groups} g ON o.groupid = g.id
+                 WHERE o.quiz = :quizid AND g.id $insql
+              ORDER BY g.name";
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    }
 } else {
     $colname = get_string('user');
     list($sort, $params) = users_order_by_sql('u');
-    $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
-            FROM {quiz_overrides} o
-            JOIN {user} u ON o.userid = u.id
-            WHERE o.quiz = :quizid
-            ORDER BY ' . $sort;
     $params['quizid'] = $quiz->id;
-}
 
-$overrides = $DB->get_records_sql($sql, $params);
+    if ($accessallgroups) {
+        $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
+                  FROM {quiz_overrides} o
+                  JOIN {user} u ON o.userid = u.id
+                 WHERE o.quiz = :quizid
+              ORDER BY ' . $sort;
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    } else if ($groups) {
+        list($insql, $inparams) = $DB->get_in_or_equal(array_keys($groups), SQL_PARAMS_NAMED);
+        $params += $inparams;
+
+        $sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
+                  FROM {quiz_overrides} o
+                  JOIN {user} u ON o.userid = u.id
+                  JOIN {groups_members} gm ON u.id = gm.userid
+                 WHERE o.quiz = :quizid AND gm.groupid ' . $insql . '
+              ORDER BY ' . $sort;
+
+        $overrides = $DB->get_records_sql($sql, $params);
+    }
+}
 
 // Initialise table.
 $table = new html_table();
@@ -256,13 +281,21 @@
 } else {
     $users = array();
     // See if there are any students in the quiz.
-    $users = get_users_by_capability($context, 'mod/quiz:attempt', 'u.id');
+    if ($accessallgroups) {
+        $users = get_users_by_capability($context, 'mod/quiz:attempt', 'u.id');
+        $nousermessage = get_string('usersnone', 'quiz');
+    } else if ($groups) {
+        $users = get_users_by_capability($context, 'mod/quiz:attempt', 'u.id', '', '', '', array_keys($groups));
+        $nousermessage = get_string('usersnone', 'quiz');
+    } else {
+        $nousermessage = get_string('groupsnone', 'quiz');
+    }
     $info = new \core_availability\info_module($cm);
     $users = $info->filter_user_list($users);
 
     if (empty($users)) {
         // There are no students.
-        echo $OUTPUT->notification(get_string('usersnone', 'quiz'), 'error');
+        echo $OUTPUT->notification($nousermessage, 'error');
         $options['disabled'] = true;
     }
     echo $OUTPUT->single_button($overrideediturl->out(true,
diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
index e9fc84c6f1dde..bd87a36c55778 100644
--- a/mod/quiz/renderer.php
+++ b/mod/quiz/renderer.php
@@ -303,7 +303,7 @@ public function countdown_timer(quiz_attempt $attemptobj, $timenow) {
     /**
      * Create a preview link
      *
-     * @param $url contains a url to the given page
+     * @param moodle_url $url contains a url to the given page
      */
     public function restart_preview_button($url) {
         return $this->single_button($url, get_string('startnewpreview', 'quiz'));
@@ -560,7 +560,8 @@ protected function attempt_navigation_buttons($page, $lastpage, $navmethod = 'fr
      */
     public function redo_question_button($slot, $disabled) {
         $attributes = array('type' => 'submit',  'name' => 'redoslot' . $slot,
-                'value' => get_string('redoquestion', 'quiz'), 'class' => 'mod_quiz-redo_question_button');
+            'value' => get_string('redoquestion', 'quiz'),
+            'class' => 'mod_quiz-redo_question_button btn btn-secondary');
         if ($disabled) {
             $attributes['disabled'] = 'disabled';
         }
diff --git a/mod/quiz/report/attemptsreport.php b/mod/quiz/report/attemptsreport.php
index 95f02101fec04..58163af3926bb 100644
--- a/mod/quiz/report/attemptsreport.php
+++ b/mod/quiz/report/attemptsreport.php
@@ -125,7 +125,8 @@ protected function get_students_joins($cm, $course = null) {
             return array($currentgroup, $empty, $empty, $empty);
         }
 
-        $studentsjoins = get_enrolled_with_capabilities_join($this->context);
+        $studentsjoins = get_enrolled_with_capabilities_join($this->context, '',
+                array('mod/quiz:attempt', 'mod/quiz:reviewmyattempts'));
 
         if (empty($currentgroup)) {
             return array($currentgroup, $studentsjoins, $empty, $studentsjoins);
@@ -351,7 +352,7 @@ protected function delete_selected_attempts($quiz, $cm, $attemptids, \core\dml\s
                          WHERE {$allowedjoins->wheres} AND quiza.id = :attemptid";
             }
             $params = $allowedjoins->params + array('attemptid' => $attemptid);
-            $attempt = $DB->get_record_sql($sql, $params);
+            $attempt = $DB->get_record_sql($sql, $params, IGNORE_MULTIPLE);
             if (!$attempt || $attempt->quiz != $quiz->id || $attempt->preview != 0) {
                 // Ensure the attempt exists, belongs to this quiz and belongs to
                 // a student included in the report. If not skip.
diff --git a/mod/quiz/report/grading/lang/en/quiz_grading.php b/mod/quiz/report/grading/lang/en/quiz_grading.php
index c5e078cf9bb95..2f637922546b0 100644
--- a/mod/quiz/report/grading/lang/en/quiz_grading.php
+++ b/mod/quiz/report/grading/lang/en/quiz_grading.php
@@ -29,7 +29,7 @@
 $string['automaticallygraded'] = 'Automatically graded';
 $string['backtothelistofquestions'] = 'Back to the list of questions';
 $string['bydate'] = 'By date';
-$string['bystudentidnumber'] = 'By student id number';
+$string['bystudentidnumber'] = 'By student ID number';
 $string['bystudentfirstname'] = 'By student first name';
 $string['bystudentlastname'] = 'By student last name';
 $string['cannotloadquestioninfo'] = 'Unable to load questiontype specific question information';
@@ -49,7 +49,7 @@
 $string['gradeungraded'] = 'Grade all {$a} ungraded attempts';
 $string['grading'] = 'Manual grading';
 $string['grading:componentname'] = 'Manual grading report';
-$string['grading:viewidnumber'] = 'See student idnumbers while grading';
+$string['grading:viewidnumber'] = 'See student ID numbers while grading';
 $string['grading:viewstudentnames'] = 'See student names while grading';
 $string['gradingall'] = 'All {$a} attempts on this question.';
 $string['gradingattempt'] = 'Attempt number {$a->attempt} for {$a->fullname}';
diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index c4e843fb7cf6a..39c0c407d77e8 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -551,6 +551,9 @@ protected function get_usage_ids_where_question_in_state($summarystate, $slot,
                 case "studentfirstname":
                     $orderby = "u.firstname, u.lastname";
                     break;
+                case "idnumber":
+                    $orderby = "u.idnumber";
+                    break;
             }
         }
 
diff --git a/mod/quiz/report/grading/tests/behat/grading.feature b/mod/quiz/report/grading/tests/behat/grading.feature
index 840902b045ff8..253f70a2e6835 100644
--- a/mod/quiz/report/grading/tests/behat/grading.feature
+++ b/mod/quiz/report/grading/tests/behat/grading.feature
@@ -1,4 +1,4 @@
-@mod @mod_quiz
+@mod @mod_quiz @quiz @quiz_grading
 Feature: Basic use of the Manual grading report
   In order to easily find students attempts that need manual grading
   As a teacher
@@ -50,8 +50,15 @@ Feature: Basic use of the Manual grading report
     And "Short answer 001" row "To grade" column of "questionstograde" table should contain "0"
     And "Short answer 001" row "Already graded" column of "questionstograde" table should contain "0"
 
-    # Adjust the mark for Student1.
+    # Go to the grading page.
     And I click on "update grades" "link" in the "Short answer 001" "table_row"
+    And I should see "Grading attempts 1 to 1 of 1"
+
+    # Test the display options.
+    And I set the field "Order attempts" to "By student ID number"
+    And I press "Change options"
+
+    # Adjust the mark for Student1.
     And I set the field "Comment" to "I have adjusted your mark to 0.6"
     And I set the field "Mark" to "0.6"
     And I press "Save and go to next page"
diff --git a/mod/quiz/report/overview/db/upgrade.php b/mod/quiz/report/overview/db/upgrade.php
index 13ca01a3ad4b1..8979e3ffe32fa 100644
--- a/mod/quiz/report/overview/db/upgrade.php
+++ b/mod/quiz/report/overview/db/upgrade.php
@@ -79,5 +79,8 @@ function xmldb_quiz_overview_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/report/overview/tests/behat/basic.feature b/mod/quiz/report/overview/tests/behat/basic.feature
index 766f37a83e613..03eb2a57f1ff8 100644
--- a/mod/quiz/report/overview/tests/behat/basic.feature
+++ b/mod/quiz/report/overview/tests/behat/basic.feature
@@ -58,8 +58,7 @@ Feature: Basic use of the Grades report
     # Check changing the form parameters
     And I set the field "Attempts from" to "enrolled users who have not attempted the quiz"
     And I press "Show report"
-    # Check teacher1's grade
-    And I should see "-" in the "T1 Teacher1" "table_row"
+    # Note: teachers should not appear in the report.
     # Check student3's grade
     And I should see "-" in the "S3 Student3" "table_row"
 
@@ -69,8 +68,8 @@ Feature: Basic use of the Grades report
     And I should see "25.00" in the "S1 Student1" "table_row"
     # Check student2's grade
     And I should see "100.00" in the "S2 Student2" "table_row"
-    # Check teacher1's grade
-    And I should see "-" in the "T1 Teacher1" "table_row"
+    # Check student3's grade
+    And I should see "-" in the "S3 Student3" "table_row"
 
     And I set the field "Attempts from" to "all users who have attempted the quiz"
     And I press "Show report"
diff --git a/mod/quiz/report/overview/tests/helpers.php b/mod/quiz/report/overview/tests/helpers.php
new file mode 100644
index 0000000000000..50a365079360f
--- /dev/null
+++ b/mod/quiz/report/overview/tests/helpers.php
@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Makes some protected methods of quiz_attempts_report public to facilitate testing.
+ *
+ * @package   quiz_overview
+ * @copyright 2020 Huong Nguyen <huongnv13@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/mod/quiz/report/attemptsreport.php');
+
+/**
+ * Makes some protected methods of quiz_attempts_report public to facilitate testing.
+ *
+ * @copyright 2020 Huong Nguyen <huongnv13@gmail.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class testable_quiz_attempts_report extends quiz_attempts_report {
+
+    /**
+     * Override this function to displays the report.
+     * @param object $cm the course-module for this quiz.
+     * @param object $course the course we are in.
+     * @param object $quiz this quiz.
+     */
+    public function display($cm, $course, $quiz) {
+
+    }
+
+    /**
+     * Testable delete_selected_attempts function.
+     *
+     * @param object $quiz
+     * @param object $cm
+     * @param array $attemptids
+     * @param \core\dml\sql_join $allowedjoins
+     */
+    public function delete_selected_attempts($quiz, $cm, $attemptids, \core\dml\sql_join $allowedjoins) {
+        parent::delete_selected_attempts($quiz, $cm, $attemptids, $allowedjoins);
+    }
+}
diff --git a/mod/quiz/report/overview/tests/report_test.php b/mod/quiz/report/overview/tests/report_test.php
index 54606daa649dc..20a632a4cdaa6 100644
--- a/mod/quiz/report/overview/tests/report_test.php
+++ b/mod/quiz/report/overview/tests/report_test.php
@@ -29,6 +29,7 @@
 require_once($CFG->dirroot . '/mod/quiz/report/reportlib.php');
 require_once($CFG->dirroot . '/mod/quiz/report/default.php');
 require_once($CFG->dirroot . '/mod/quiz/report/overview/report.php');
+require_once($CFG->dirroot . '/mod/quiz/report/overview/tests/helpers.php');
 
 
 /**
@@ -87,6 +88,12 @@ public function test_report_sql($isdownloading) {
         // student enrolment does not cause duplicate records in this query.
         $generator->enrol_user($student2->id, $course->id, null, 'self');
 
+        // Also create a user who should not appear in the reports,
+        // because they have a role with neither 'mod/quiz:attempt'
+        // nor 'mod/quiz:reviewmyattempts'.
+        $tutor = $generator->create_user();
+        $generator->enrol_user($tutor->id, $course->id, 'teacher');
+
         // The test data.
         $timestamp = 1234567890;
         $attempts = array(
@@ -154,7 +161,8 @@ public function test_report_sql($isdownloading) {
         $context = context_module::instance($quiz->cmid);
         $cm = get_coursemodule_from_id('quiz', $quiz->cmid);
         $qmsubselect = quiz_report_qm_filter_select($quiz);
-        $studentsjoins = get_enrolled_with_capabilities_join($context);
+        $studentsjoins = get_enrolled_with_capabilities_join($context, '',
+                array('mod/quiz:attempt', 'mod/quiz:reviewmyattempts'));
         $empty = new \core\dml\sql_join();
 
         // Set the options.
@@ -256,4 +264,54 @@ public function test_get_bands_count_and_width($grade, $expected) {
         $this->assertEquals($expected, quiz_overview_report::get_bands_count_and_width($quiz));
     }
 
+    /**
+     * Test delete_selected_attempts function.
+     */
+    public function test_delete_selected_attempts() {
+        $this->resetAfterTest(true);
+
+        $timestamp = 1234567890;
+        $timestart = $timestamp + 3600;
+
+        // Create a course and a quiz.
+        $generator = $this->getDataGenerator();
+        $course = $generator->create_course();
+        $quizgenerator = $generator->get_plugin_generator('mod_quiz');
+        $quiz = $quizgenerator->create_instance([
+                'course' => $course->id,
+                'grademethod' => QUIZ_GRADEHIGHEST,
+                'grade' => 100.0,
+                'sumgrades' => 10.0,
+                'attempts' => 10
+        ]);
+
+        // Add one question.
+        $questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $cat = $questiongenerator->create_question_category();
+        $q = $questiongenerator->create_question('essay', 'plain', ['category' => $cat->id]);
+        quiz_add_quiz_question($q->id, $quiz, 0 , 10);
+
+        // Create student and enrol them in the course.
+        // Note: we create two enrolments, to test the problem reported in MDL-67942.
+        $student = $generator->create_user();
+        $generator->enrol_user($student->id, $course->id);
+        $generator->enrol_user($student->id, $course->id, null, 'self');
+
+        $context = context_module::instance($quiz->cmid);
+        $cm = get_coursemodule_from_id('quiz', $quiz->cmid);
+        $allowedjoins = get_enrolled_with_capabilities_join($context, '', ['mod/quiz:attempt', 'mod/quiz:reviewmyattempts']);
+        $quizattemptsreport = new testable_quiz_attempts_report();
+
+        // Create the new attempt and initialize the question sessions.
+        $quizobj = quiz::create($quiz->id, $student->id);
+        $quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
+        $quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
+        $attempt = quiz_create_attempt($quizobj, 1, null, $timestart, false, $student->id);
+        $attempt = quiz_start_new_attempt($quizobj, $quba, $attempt, 1, $timestamp);
+        $attempt = quiz_attempt_save_started($quizobj, $quba, $attempt);
+
+        // Delete the student's attempt.
+        $quizattemptsreport->delete_selected_attempts($quiz, $cm, [$attempt->id], $allowedjoins);
+    }
+
 }
diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php
index a4c0d3fa2e824..264ff74ad1406 100644
--- a/mod/quiz/report/statistics/db/upgrade.php
+++ b/mod/quiz/report/statistics/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php
index 90adc895ad4ec..077763c0b8762 100644
--- a/mod/quiz/report/statistics/statistics_table.php
+++ b/mod/quiz/report/statistics/statistics_table.php
@@ -469,7 +469,7 @@ protected function col_discriminative_efficiency($questionstat) {
         } else if (!is_numeric($questionstat->discriminativeefficiency)) {
             return '';
         } else {
-            return $this->format_percentage($questionstat->discriminativeefficiency);
+            return $this->format_percentage($questionstat->discriminativeefficiency, false);
         }
     }
 
diff --git a/mod/quiz/review.php b/mod/quiz/review.php
index 28e94b0b14f81..a5b955059de28 100644
--- a/mod/quiz/review.php
+++ b/mod/quiz/review.php
@@ -106,7 +106,7 @@
 
 // Set up the page header.
 $headtags = $attemptobj->get_html_head_contributions($page, $showall);
-$PAGE->set_title($attemptobj->get_quiz_name());
+$PAGE->set_title($attemptobj->review_page_title($page, $showall));
 $PAGE->set_heading($attemptobj->get_course()->fullname);
 
 // Summary table start. ============================================================================
diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index e9570cfcf44b9..ba87aa1cb213b 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -39,10 +39,6 @@
     border: 1px solid #dcdcdc;
 }
 
-body.jsenabled .questionflagcheckbox {
-    display: none;
-}
-
 #page-mod-quiz-attempt #connection-ok,
 #page-mod-quiz-attempt #connection-error {
     position: fixed;
@@ -689,13 +685,13 @@ table.quizreviewsummary td.cell {
 }
 
 #page-mod-quiz-edit .section-heading {
-    font-size: 24px;
     margin-left: 20px;
     margin-bottom: 0;
     height: 40px;
 }
 
 #page-mod-quiz-edit .section-heading .instancesectioncontainer {
+    font-size: 24px;
     display: inline;
 }
 
@@ -939,7 +935,7 @@ table.quizreviewsummary td.cell {
 }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-    float: left;
+    float: inherit;
     margin: .2em 0 0;
     padding: 0;
 }
@@ -966,6 +962,15 @@ table.quizreviewsummary td.cell {
     text-align: center;
     padding: 0 2px;
     border: 0 none;
+    vertical-align: top;
+}
+
+#categoryquestions .header.checkbox {
+    vertical-align: bottom;
+}
+
+#categoryquestions .header.qtype {
+    white-space: nowrap;
 }
 
 #categoryquestions th.modifiername .sorters,
diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php
index 1d930456cf1e8..bd98110f5745b 100644
--- a/mod/quiz/summary.php
+++ b/mod/quiz/summary.php
@@ -87,7 +87,7 @@
 $PAGE->blocks->add_fake_block($navbc, reset($regions));
 
 $PAGE->navbar->add(get_string('summaryofattempt', 'quiz'));
-$PAGE->set_title($attemptobj->get_quiz_name());
+$PAGE->set_title($attemptobj->summary_page_title());
 $PAGE->set_heading($attemptobj->get_course()->fullname);
 
 // Display the page.
diff --git a/mod/quiz/tests/attempt_test.php b/mod/quiz/tests/attempt_test.php
index b9c2415f19de6..96e41b45a5e18 100644
--- a/mod/quiz/tests/attempt_test.php
+++ b/mod/quiz/tests/attempt_test.php
@@ -28,281 +28,253 @@
 global $CFG;
 require_once($CFG->dirroot . '/mod/quiz/locallib.php');
 
-
 /**
- * Subclass of quiz_attempt to allow faking of the page layout.
+ * Tests for the quiz_attempt class.
  *
  * @copyright 2014 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_quiz_attempt_testable extends quiz_attempt {
-    /** @var array list of slots to treat as if they contain descriptions in the fake layout. */
-    protected $infos = array();
+class mod_quiz_attempt_testcase extends advanced_testcase {
 
     /**
-     * Set a fake page layout. Used when we test URL generation.
-     * @param int $id assumed attempt id.
+     * Create quiz and attempt data with layout.
+     *
      * @param string $layout layout to set. Like quiz attempt.layout. E.g. '1,2,0,3,4,0,'.
-     * @param array $infos slot numbers which contain 'descriptions', or other non-questions.
-     * @return quiz_attempt attempt object for use in unit tests.
+     * @return quiz_attempt the new quiz_attempt object
      */
-    public static function setup_fake_attempt_layout($id, $layout, $infos = array()) {
-        $attempt = new stdClass();
-        $attempt->id = $id;
-        $attempt->layout = $layout;
+    protected function create_quiz_and_attempt_with_layout($layout) {
+        $this->resetAfterTest(true);
+
+        // Make a user to do the quiz.
+        $user = $this->getDataGenerator()->create_user();
+        $course = $this->getDataGenerator()->create_course();
+        // Make a quiz.
+        $quizgenerator = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
+        $quiz = $quizgenerator->create_instance(['course' => $course->id,
+            'grade' => 100.0, 'sumgrades' => 2, 'layout' => $layout]);
+
+        $quizobj = quiz::create($quiz->id, $user->id);
 
-        $course = new stdClass();
-        $quiz = new stdClass();
-        $cm = new stdClass();
-        $cm->id = 0;
 
-        $attemptobj = new self($attempt, $quiz, $cm, $course, false);
+        $quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
+        $quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
 
-        $attemptobj->slots = array();
+        $questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $cat = $questiongenerator->create_question_category();
+
+        $page = 1;
         foreach (explode(',', $layout) as $slot) {
             if ($slot == 0) {
+                $page += 1;
                 continue;
             }
-            $attemptobj->slots[$slot] = new stdClass();
-            $attemptobj->slots[$slot]->slot = $slot;
-            $attemptobj->slots[$slot]->requireprevious = 0;
-            $attemptobj->slots[$slot]->questionid = 0;
-        }
 
-        $attemptobj->sections = array();
-        $attemptobj->sections[0] = new stdClass();
-        $attemptobj->sections[0]->heading = '';
-        $attemptobj->sections[0]->firstslot = 1;
-        $attemptobj->sections[0]->shufflequestions = 0;
-
-        $attemptobj->infos = $infos;
-        $attemptobj->link_sections_and_slots();
-        $attemptobj->determine_layout();
-        $attemptobj->number_questions();
+            $question = $questiongenerator->create_question('shortanswer', null, ['category' => $cat->id]);
+            quiz_add_quiz_question($question->id, $quiz, $page);
+        }
 
-        return $attemptobj;
-    }
+        $timenow = time();
+        $attempt = quiz_create_attempt($quizobj, 1, false, $timenow, false, $user->id);
+        quiz_start_new_attempt($quizobj, $quba, $attempt, 1, $timenow);
+        quiz_attempt_save_started($quizobj, $quba, $attempt);
 
-    public function is_real_question($slot) {
-        return !in_array($slot, $this->infos);
+        return quiz_attempt::create($attempt->id);
     }
-}
 
-
-/**
- * Tests for the quiz_attempt class.
- *
- * @copyright 2014 Tim Hunt
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class mod_quiz_attempt_testcase extends advanced_testcase {
     /**
      * Test the functions quiz_update_open_attempts() and get_list_of_overdue_attempts()
      */
     public function test_attempt_url() {
-        $attempt = mod_quiz_attempt_testable::setup_fake_attempt_layout(
-                123, '1,2,0,3,4,0,5,6,0');
+        $attempt = $this->create_quiz_and_attempt_with_layout('1,2,0,3,4,0,5,6,0');
 
-        // Attempt pages.
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/attempt.php?attempt=123&cmid=0'),
-                $attempt->attempt_url());
+        $attemptid = $attempt->get_attempt()->id;
+        $cmid = $attempt->get_cmid();
+        $url = '/mod/quiz/attempt.php';
+        $params = ['attempt' => $attemptid, 'cmid' => $cmid, 'page' => 2];
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/attempt.php?attempt=123&page=2&cmid=0'),
-                $attempt->attempt_url(null, 2));
+        $this->assertEquals(new moodle_url($url, $params), $attempt->attempt_url(null, 2));
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/attempt.php?attempt=123&page=1&cmid=0#'),
-                $attempt->attempt_url(3));
+        $params['page'] = 1;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->attempt_url(3));
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/attempt.php?attempt=123&page=1&cmid=0#q4'),
-                $attempt->attempt_url(4));
+        $questionattempt = $attempt->get_question_attempt(4);
+        $expecteanchor = $questionattempt->get_outer_question_div_unique_id();
+        $this->assertEquals(new moodle_url($url, $params, $expecteanchor), $attempt->attempt_url(4));
 
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->attempt_url(null, 2, 2));
+        $this->assertEquals(new moodle_url('#'), $attempt->attempt_url(null, 2, 2));
+        $this->assertEquals(new moodle_url('#'), $attempt->attempt_url(3, -1, 1));
 
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->attempt_url(3, -1, 1));
-
-        $this->assertEquals(new moodle_url(
-                '#q4'),
-                $attempt->attempt_url(4, -1, 1));
+        $questionattempt = $attempt->get_question_attempt(4);
+        $expecteanchor = $questionattempt->get_outer_question_div_unique_id();
+        $this->assertEquals(new moodle_url(null, null, $expecteanchor, null), $attempt->attempt_url(4, -1, 1));
 
         // Summary page.
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/summary.php?attempt=123&cmid=0'),
-                $attempt->summary_url());
+        $url = '/mod/quiz/summary.php';
+        unset($params['page']);
+        $this->assertEquals(new moodle_url($url, $params), $attempt->summary_url());
 
         // Review page.
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&cmid=0'),
-                $attempt->review_url());
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=2&cmid=0'),
-                $attempt->review_url(null, 2));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=1&cmid=0'),
-                $attempt->review_url(3, -1, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=1&cmid=0#q4'),
-                $attempt->review_url(4, -1, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&cmid=0'),
-                $attempt->review_url(null, 2, true));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&cmid=0'),
-                $attempt->review_url(1, -1, true));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=2&cmid=0'),
-                $attempt->review_url(null, 2, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&showall=0&cmid=0'),
-                $attempt->review_url(null, 0, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&showall=0&cmid=0'),
-                $attempt->review_url(1, -1, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=1&cmid=0'),
-                $attempt->review_url(3, -1, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=2&cmid=0'),
-                $attempt->review_url(null, 2));
-
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(null, -1, null, 0));
+        $url = '/mod/quiz/review.php';
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url());
+
+        $params['page'] = 1;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(3, -1, false));
+        $this->assertEquals(new moodle_url($url, $params, $expecteanchor), $attempt->review_url(4, -1, false));
+
+        unset($params['page']);
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2, true));
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(1, -1, true));
+
+        $params['page'] = 2;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2, false));
+        unset($params['page']);
+
+        $params['showall'] = 0;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 0, false));
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(1, -1, false));
+
+        $params['page'] = 1;
+        unset($params['showall']);
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(3, -1, false));
+
+        $params['page'] = 2;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(null, -1, null, 0));
+
+        $questionattempt = $attempt->get_question_attempt(3);
+        $expecteanchor = '#' . $questionattempt->get_outer_question_div_unique_id();
+        $this->assertEquals(new moodle_url($expecteanchor), $attempt->review_url(3, -1, null, 0));
+
+        $questionattempt = $attempt->get_question_attempt(4);
+        $expecteanchor = '#' . $questionattempt->get_outer_question_div_unique_id();
+        $this->assertEquals(new moodle_url($expecteanchor), $attempt->review_url(4, -1, null, 0));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(null, 2, true, 0));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(1, -1, true, 0));
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2, false, 0));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(null, 0, false, 0));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(1, -1, false, 0));
+
+        $params['page'] = 1;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(3, -1, false, 0));
+
+        // Setup another attempt.
+        $attempt = $this->create_quiz_and_attempt_with_layout(
+            '1,2,3,4,5,6,7,8,9,10,0,11,12,13,14,15,16,17,18,19,20,0,' .
+            '21,22,23,24,25,26,27,28,29,30,0,31,32,33,34,35,36,37,38,39,40,0,' .
+            '41,42,43,44,45,46,47,48,49,50,0,51,52,53,54,55,56,57,58,59,60,0');
+
+        $attemptid = $attempt->get_attempt()->id;
+        $cmid = $attempt->get_cmid();
+        $params = ['attempt' => $attemptid, 'cmid' => $cmid];
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url());
+
+        $params['page'] = 2;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2));
+
+        $params['page'] = 1;
+        unset($params['showall']);
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(11, -1, false));
+
+        $questionattempt = $attempt->get_question_attempt(12);
+        $expecteanchor = $questionattempt->get_outer_question_div_unique_id();
+        $this->assertEquals(new moodle_url($url, $params, $expecteanchor), $attempt->review_url(12, -1, false));
+
+        $params['showall'] = 1;
+        unset($params['page']);
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2, true));
+
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(1, -1, true));
+        $params['page'] = 2;
+        unset($params['showall']);
+        $this->assertEquals(new moodle_url($url, $params),  $attempt->review_url(null, 2, false));
+        unset($params['page']);
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 0, false));
+        $params['page'] = 1;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(11, -1, false));
+        $this->assertEquals(new moodle_url($url, $params, $expecteanchor), $attempt->review_url(12, -1, false));
+        $params['page'] = 2;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(null, -1, null, 0));
+
+        $questionattempt = $attempt->get_question_attempt(3);
+        $expecteanchor = $questionattempt->get_outer_question_div_unique_id();
+        $this->assertEquals(new moodle_url(null, null, $expecteanchor), $attempt->review_url(3, -1, null, 0));
+
+        $questionattempt = $attempt->get_question_attempt(4);
+        $expecteanchor = $questionattempt->get_outer_question_div_unique_id();
+        $this->assertEquals(new moodle_url(null, null, $expecteanchor), $attempt->review_url(4, -1, null, 0));
+
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(null, 2, true, 0));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(1, -1, true, 0));
+
+        $params['page'] = 2;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(null, 2, false, 0));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(null, 0, false, 0));
+        $this->assertEquals(new moodle_url('#'), $attempt->review_url(1, -1, false, 0));
+
+        $params['page'] = 1;
+        $this->assertEquals(new moodle_url($url, $params), $attempt->review_url(11, -1, false, 0));
+    }
 
-        $this->assertEquals(new moodle_url(
-                '#q3'),
-                $attempt->review_url(3, -1, null, 0));
+    /**
+     * Tests attempt page titles when all questions are on a single page.
+     */
+    public function test_attempt_titles_single() {
+        $attempt = $this->create_quiz_and_attempt_with_layout('1,2,0');
 
-        $this->assertEquals(new moodle_url(
-                '#q4'),
-                $attempt->review_url(4, -1, null, 0));
+        // Attempt page.
+        $this->assertEquals('Quiz 1', $attempt->attempt_page_title(0));
 
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(null, 2, true, 0));
+        // Summary page.
+        $this->assertEquals('Quiz 1: Attempt summary', $attempt->summary_page_title());
 
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(1, -1, true, 0));
+        // Review page.
+        $this->assertEquals('Quiz 1: Attempt review', $attempt->review_page_title(0));
+    }
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=2&cmid=0'),
-                $attempt->review_url(null, 2, false, 0));
+    /**
+     * Tests attempt page titles when questions are on multiple pages, but are reviewed on a single page.
+     */
+    public function test_attempt_titles_multiple_single() {
+        $attempt = $this->create_quiz_and_attempt_with_layout('1,2,0,3,4,0,5,6,0');
 
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(null, 0, false, 0));
+        // Attempt page.
+        $this->assertEquals('Quiz 1 (page 1 of 3)', $attempt->attempt_page_title(0));
+        $this->assertEquals('Quiz 1 (page 2 of 3)', $attempt->attempt_page_title(1));
+        $this->assertEquals('Quiz 1 (page 3 of 3)', $attempt->attempt_page_title(2));
 
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(1, -1, false, 0));
+        // Summary page.
+        $this->assertEquals('Quiz 1: Attempt summary', $attempt->summary_page_title());
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=123&page=1&cmid=0#'),
-                $attempt->review_url(3, -1, false, 0));
+        // Review page.
+        $this->assertEquals('Quiz 1: Attempt review', $attempt->review_page_title(0, true));
+    }
 
-        // Review with more than 50 questions in the quiz.
-        $attempt = mod_quiz_attempt_testable::setup_fake_attempt_layout(
-                124, '1,2,3,4,5,6,7,8,9,10,0,11,12,13,14,15,16,17,18,19,20,0,' .
+    /**
+     * Tests attempt page titles when questions are on multiple pages, and they are reviewed on multiple pages as well.
+     */
+    public function test_attempt_titles_multiple_multiple() {
+        $attempt = $this->create_quiz_and_attempt_with_layout(
+                '1,2,3,4,5,6,7,8,9,10,0,11,12,13,14,15,16,17,18,19,20,0,' .
                 '21,22,23,24,25,26,27,28,29,30,0,31,32,33,34,35,36,37,38,39,40,0,' .
                 '41,42,43,44,45,46,47,48,49,50,0,51,52,53,54,55,56,57,58,59,60,0');
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&cmid=0'),
-                $attempt->review_url());
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=2&cmid=0'),
-                $attempt->review_url(null, 2));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=1&cmid=0'),
-                $attempt->review_url(11, -1, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=1&cmid=0#q12'),
-                $attempt->review_url(12, -1, false));
+        // Attempt page.
+        $this->assertEquals('Quiz 1 (page 1 of 6)', $attempt->attempt_page_title(0));
+        $this->assertEquals('Quiz 1 (page 2 of 6)', $attempt->attempt_page_title(1));
+        $this->assertEquals('Quiz 1 (page 6 of 6)', $attempt->attempt_page_title(5));
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&showall=1&cmid=0'),
-                $attempt->review_url(null, 2, true));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&showall=1&cmid=0'),
-                $attempt->review_url(1, -1, true));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=2&cmid=0'),
-                $attempt->review_url(null, 2, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&cmid=0'),
-                $attempt->review_url(null, 0, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=1&cmid=0'),
-                $attempt->review_url(11, -1, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=1&cmid=0#q12'),
-                $attempt->review_url(12, -1, false));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=2&cmid=0'),
-                $attempt->review_url(null, 2));
-
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(null, -1, null, 0));
-
-        $this->assertEquals(new moodle_url(
-                '#q3'),
-                $attempt->review_url(3, -1, null, 0));
-
-        $this->assertEquals(new moodle_url(
-                '#q4'),
-                $attempt->review_url(4, -1, null, 0));
-
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(null, 2, true, 0));
-
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(1, -1, true, 0));
-
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=2&cmid=0'),
-                $attempt->review_url(null, 2, false, 0));
-
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(null, 0, false, 0));
+        // Summary page.
+        $this->assertEquals('Quiz 1: Attempt summary', $attempt->summary_page_title());
 
-        $this->assertEquals(new moodle_url(
-                '#'),
-                $attempt->review_url(1, -1, false, 0));
+        // Review page.
+        $this->assertEquals('Quiz 1: Attempt review (page 1 of 6)', $attempt->review_page_title(0));
+        $this->assertEquals('Quiz 1: Attempt review (page 2 of 6)', $attempt->review_page_title(1));
+        $this->assertEquals('Quiz 1: Attempt review (page 6 of 6)', $attempt->review_page_title(5));
 
-        $this->assertEquals(new moodle_url(
-                '/mod/quiz/review.php?attempt=124&page=1&cmid=0#'),
-                $attempt->review_url(11, -1, false, 0));
+        // When all questions are shown.
+        $this->assertEquals('Quiz 1: Attempt review', $attempt->review_page_title(0, true));
+        $this->assertEquals('Quiz 1: Attempt review', $attempt->review_page_title(1, true));
     }
 
     public function test_is_participant() {
@@ -339,4 +311,4 @@ public function test_is_participant() {
         $this->assertEquals(true, $quizobj->is_participant($USER->id),
             'Admin is enrolled, suspended and can participate');
     }
-}
\ No newline at end of file
+}
diff --git a/mod/quiz/tests/behat/add_quiz.feature b/mod/quiz/tests/behat/add_quiz.feature
index a35e68f43029b..7344a0a149c85 100644
--- a/mod/quiz/tests/behat/add_quiz.feature
+++ b/mod/quiz/tests/behat/add_quiz.feature
@@ -11,11 +11,11 @@ Feature: Add a quiz
       | student1 | Sam1      | Student1 | student1@example.com |
     And the following "courses" exist:
       | fullname | shortname | category |
-      | Course 1 | C1 | 0 |
+      | Course 1 | C1        | 0        |
     And the following "course enrolments" exist:
-      | user | course | role |
-      | teacher1 | C1 | editingteacher |
-      | student1 | C1 | student |
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
     When I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
     And I add a "Quiz" to section "1" and I fill the form with:
diff --git a/mod/quiz/tests/behat/attempt_basic.feature b/mod/quiz/tests/behat/attempt_basic.feature
index b38f227d8aa6b..f946e525495ab 100644
--- a/mod/quiz/tests/behat/attempt_basic.feature
+++ b/mod/quiz/tests/behat/attempt_basic.feature
@@ -35,9 +35,7 @@ Feature: Attempt a quiz
       | slot | response |
       |   1  | True     |
       |   2  | False    |
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I follow "Review"
     Then I should see "25.00 out of 100.00"
 
@@ -66,9 +64,7 @@ Feature: Attempt a quiz
       |           | 4         | 1       |
       | Section 3 | 5         | 0       |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
 
     Then I should see "Section 1" in the "Quiz navigation" "block"
@@ -109,9 +105,7 @@ Feature: Attempt a quiz
       | question | page |
       | TF1      | 1    |
       | TF2      | 2    |
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     Then I should see "Text of the first question"
     And I should not see "Text of the second question"
diff --git a/mod/quiz/tests/behat/attempt_begin.feature b/mod/quiz/tests/behat/attempt_begin.feature
index ab48d67dd0647..5ce5fb2d63203 100644
--- a/mod/quiz/tests/behat/attempt_begin.feature
+++ b/mod/quiz/tests/behat/attempt_begin.feature
@@ -29,9 +29,7 @@ Feature: The various checks that may happen when an attept is started
     And quiz "Quiz 1" contains the following questions:
       | question | page |
       | TF1      | 1    |
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     Then I should see "Text of the first question"
 
@@ -43,9 +41,7 @@ Feature: The various checks that may happen when an attept is started
     And quiz "Quiz 1" contains the following questions:
       | question | page |
       | TF1      | 1    |
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     Then I should see "To attempt this quiz you need to know the quiz password" in the "Start attempt" "dialogue"
     And I should see "The quiz has a time limit of 1 hour. Time will " in the "Start attempt" "dialogue"
@@ -61,9 +57,7 @@ Feature: The various checks that may happen when an attept is started
     And quiz "Quiz 1" contains the following questions:
       | question | page |
       | TF1      | 1    |
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     And I click on "Cancel" "button" in the "Start attempt" "dialogue"
     Then I should see "Quiz 1 description"
@@ -77,9 +71,7 @@ Feature: The various checks that may happen when an attept is started
     And quiz "Quiz 1" contains the following questions:
       | question | page |
       | TF1      | 1    |
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     And I set the field "Quiz password" to "Toad"
     And I click on "Start attempt" "button" in the "Start attempt" "dialogue"
@@ -101,9 +93,7 @@ Feature: The various checks that may happen when an attept is started
     And quiz "Quiz 1" contains the following questions:
       | question | page |
       | TF1      | 1    |
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     And I set the field "Quiz password" to "Toad"
     And I click on "Start attempt" "button" in the "Start attempt" "dialogue"
diff --git a/mod/quiz/tests/behat/attempt_redo_questions.feature b/mod/quiz/tests/behat/attempt_redo_questions.feature
index 218976ad8673a..2e63a893f3548 100644
--- a/mod/quiz/tests/behat/attempt_redo_questions.feature
+++ b/mod/quiz/tests/behat/attempt_redo_questions.feature
@@ -30,13 +30,11 @@ Feature: Allow students to redo questions in a practice quiz, without starting a
       | question | page | maxmark |
       | TF1      | 1    | 2       |
       | TF2      | 1    | 1       |
-    And I log in as "student"
-    And I am on "Course 1" course homepage
 
   @javascript
   Scenario: After completing a question, there is a redo question button that restarts the question
-    When I follow "Quiz 1"
-    And I press "Attempt quiz now"
+    Given I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
+    When I press "Attempt quiz now"
     And I click on "False" "radio" in the "First question" "question"
     And I click on "Check" "button" in the "First question" "question"
     And I press "Try another question like this one"
@@ -45,22 +43,20 @@ Feature: Allow students to redo questions in a practice quiz, without starting a
 
   @javascript
   Scenario: The redo question button is visible but disabled for teachers
-    When I follow "Quiz 1"
-    And I press "Attempt quiz now"
+    Given I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
+    When I press "Attempt quiz now"
     And I click on "False" "radio" in the "First question" "question"
     And I click on "Check" "button" in the "First question" "question"
     And I log out
-    And I log in as "teacher"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    And I am on the "Quiz 1" "mod_quiz > View" page logged in as "teacher"
     And I follow "Attempts: 1"
     And I follow "Review attempt"
     Then the "Try another question like this one" "button" should be disabled
 
   @javascript
   Scenario: The redo question buttons are no longer visible after the attempt is submitted.
-    When I follow "Quiz 1"
-    And I press "Attempt quiz now"
+    Given I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
+    When I press "Attempt quiz now"
     And I click on "False" "radio" in the "First question" "question"
     And I click on "Check" "button" in the "First question" "question"
     And I press "Finish attempt ..."
@@ -69,9 +65,9 @@ Feature: Allow students to redo questions in a practice quiz, without starting a
     Then "Try another question like this one" "button" should not exist
 
   @javascript @_switch_window
-  Scenario: Teachers reviewing can see all the qestions attempted in a slot
-    When I follow "Quiz 1"
-    And I press "Attempt quiz now"
+  Scenario: Teachers reviewing can see all the questions attempted in a slot
+    Given I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
+    When I press "Attempt quiz now"
     And I click on "False" "radio" in the "First question" "question"
     And I click on "Check" "button" in the "First question" "question"
     And I press "Try another question like this one"
@@ -79,9 +75,7 @@ Feature: Allow students to redo questions in a practice quiz, without starting a
     And I press "Submit all and finish"
     And I click on "Submit all and finish" "button" in the "Confirmation" "dialogue"
     And I log out
-    And I log in as "teacher"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    And I am on the "Quiz 1" "mod_quiz > View" page logged in as "teacher"
     And I follow "Attempts: 1"
     And I follow "Review attempt"
     And I click on "1" "link" in the "First question" "question"
@@ -100,11 +94,34 @@ Feature: Allow students to redo questions in a practice quiz, without starting a
 
   @javascript
   Scenario: Redoing question 1 should save any changes to question 2 on the same page
-    When I follow "Quiz 1"
-    And I press "Attempt quiz now"
+    Given I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
+    When I press "Attempt quiz now"
     And I click on "False" "radio" in the "First question" "question"
     And I click on "Check" "button" in the "First question" "question"
     And I click on "True" "radio" in the "Second question" "question"
     And I press "Try another question like this one"
     And I click on "Check" "button" in the "Second question" "question"
     Then the state of "Second question" question is shown as "Correct"
+
+  @javascript
+  Scenario: Redoing questions should work with random questions as well
+    Given the following "questions" exist:
+      | questioncategory | qtype       | name                    | questiontext |
+      | Test questions   | random      | Random (Test questions) | 0            |
+    And the following "activities" exist:
+      | activity   | name   | intro              | course | idnumber | preferredbehaviour | canredoquestions |
+      | quiz       | Quiz 2 | Quiz 2 description | C1     | quiz2    | immediatefeedback  | 1                |
+    And quiz "Quiz 2" contains the following questions:
+      | question                | page |
+      | Random (Test questions) | 1    |
+    And user "student" has started an attempt at quiz "Quiz 2" randomised as follows:
+      | slot | actualquestion |
+      | 1    | TF1            |
+    And I am on the "Quiz 2" "mod_quiz > View" page logged in as "student"
+    When I press "Continue the last attempt"
+    And I should see "First question"
+    And I click on "False" "radio"
+    And I click on "Check" "button"
+    And I press "Try another question like this one"
+    Then I should see "Second question"
+    And "Check" "button" should exist
diff --git a/mod/quiz/tests/behat/attempt_require_previous.feature b/mod/quiz/tests/behat/attempt_require_previous.feature
index 6155408b6b00b..0caf8aff3467f 100644
--- a/mod/quiz/tests/behat/attempt_require_previous.feature
+++ b/mod/quiz/tests/behat/attempt_require_previous.feature
@@ -34,20 +34,14 @@ Feature: Attempt a quiz where some questions require that the previous question
       | TF1      | 1    | 0               |
       | TF2      | 1    | 1               |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
 
     Then I should see "First question"
     And I should see "This question cannot be attempted until the previous question has been completed."
     And I should not see "Second question"
     And I log out
-    And I log in as "teacher"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I follow "Attempts: 1"
-    And I follow "Review attempt"
+    And I am on the "Quiz 1 > student > Attempt 1" "mod_quiz > Attempt review" page logged in as "teacher"
     And I should see "First question"
     And I should see "This question cannot be attempted until the previous question has been completed."
     And I should not see "Second question"
@@ -68,9 +62,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | TF1      | 1    | 0               |
       | TF2      | 1    | 1               |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     And I click on "True" "radio" in the "First question" "question"
     And I press "Check"
@@ -95,9 +87,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | TF1      | 1    | 0               |
       | TF2      | 1    | 1               |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     And I press "Finish attempt ..."
     And I press "Submit all and finish"
@@ -120,9 +110,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | TF1      | 1    | 0               |
       | TF2      | 1    | 1               |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
 
     Then I should see "First question"
@@ -146,9 +134,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | heading   | firstslot | shuffle |
       | Section 1 | 1         | 1       |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
 
     Then I should see "First question"
@@ -173,9 +159,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | Section 1 | 1         | 1       |
       | Section 2 | 2         | 0       |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
     And I press "Next page"
 
@@ -196,9 +180,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | TF1      | 1    | 1               |
       | TF2      | 1    | 1               |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
 
     Then I should see "First question"
@@ -219,9 +201,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | Story    | 1    | 0               |
       | TF2      | 1    | 1               |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
 
     Then I should see "First question"
@@ -242,9 +222,7 @@ Feature: Attempt a quiz where some questions require that the previous question
       | Info     | 1    | 0               |
       | TF1      | 1    | 1               |
 
-    When I log in as "student"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "student"
     And I press "Attempt quiz now"
 
     Then I should see "Read me"
diff --git a/mod/quiz/tests/behat/backup.feature b/mod/quiz/tests/behat/backup.feature
index 99fb72fc49a8d..18f3353e5c1b6 100644
--- a/mod/quiz/tests/behat/backup.feature
+++ b/mod/quiz/tests/behat/backup.feature
@@ -29,8 +29,7 @@ Feature: Backup and restore of quizzes
     When I am on "Course 1" course homepage with editing mode on
     And I duplicate "Quiz 1" activity editing the new copy with:
       | Name | Quiz 2 |
-    And I follow "Quiz 2"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then I should see "TF1"
     And I should see "TF2"
 
@@ -42,7 +41,6 @@ Feature: Backup and restore of quizzes
     And I upload "mod/quiz/tests/fixtures/moodle_28_quiz.mbz" file to "Files" filemanager
     And I press "Save changes"
     And I restore "moodle_28_quiz.mbz" backup into "Course 1" course using this options:
-    And I follow "Restored Moodle 2.8 quiz"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Restored Moodle 2.8 quiz" "mod_quiz > Edit" page
     Then I should see "TF1"
     And I should see "TF2"
diff --git a/mod/quiz/tests/behat/behat_mod_quiz.php b/mod/quiz/tests/behat/behat_mod_quiz.php
index cfa4e45928136..563ffbe468138 100644
--- a/mod/quiz/tests/behat/behat_mod_quiz.php
+++ b/mod/quiz/tests/behat/behat_mod_quiz.php
@@ -40,6 +40,115 @@
  */
 class behat_mod_quiz extends behat_question_base {
 
+    /**
+     * Convert page names to URLs for steps like 'When I am on the "[page name]" page'.
+     *
+     * Recognised page names are:
+     * | None so far!      |                                                              |
+     *
+     * @param string $page name of the page, with the component name removed e.g. 'Admin notification'.
+     * @return moodle_url the corresponding URL.
+     * @throws Exception with a meaningful error message if the specified page cannot be found.
+     */
+    protected function resolve_page_url(string $page): moodle_url {
+        switch ($page) {
+            default:
+                throw new Exception('Unrecognised quiz page type "' . $page . '."');
+        }
+    }
+
+    /**
+     * Convert page names to URLs for steps like 'When I am on the "[identifier]" "[page type]" page'.
+     *
+     * Recognised page names are:
+     * | pagetype          | name meaning                                | description                                  |
+     * | View              | Quiz name                                   | The quiz info page (view.php)                |
+     * | Edit              | Quiz name                                   | The edit quiz page (edit.php)                |
+     * | Group overrides   | Quiz name                                   | The manage group overrides page              |
+     * | User overrides    | Quiz name                                   | The manage user overrides page               |
+     * | Grades report     | Quiz name                                   | The overview report for a quiz               |
+     * | Responses report  | Quiz name                                   | The responses report for a quiz              |
+     * | Statistics report | Quiz name                                   | The statistics report for a quiz             |
+     * | Attempt review    | Quiz name > username > [Attempt] attempt no | Review page for a given attempt (review.php) |
+     *
+     * @param string $type identifies which type of page this is, e.g. 'Attempt review'.
+     * @param string $identifier identifies the particular page, e.g. 'Test quiz > student > Attempt 1'.
+     * @return moodle_url the corresponding URL.
+     * @throws Exception with a meaningful error message if the specified page cannot be found.
+     */
+    protected function resolve_page_instance_url(string $type, string $identifier): moodle_url {
+        global $DB;
+
+        switch ($type) {
+            case 'View':
+                return new moodle_url('/mod/quiz/view.php',
+                        ['id' => $this->get_cm_by_quiz_name($identifier)->id]);
+
+            case 'Edit':
+                return new moodle_url('/mod/quiz/edit.php',
+                        ['cmid' => $this->get_cm_by_quiz_name($identifier)->id]);
+
+            case 'Group overrides':
+                return new moodle_url('/mod/quiz/overrides.php',
+                    ['cmid' => $this->get_cm_by_quiz_name($identifier)->id, 'mode' => 'group']);
+
+            case 'User overrides':
+                return new moodle_url('/mod/quiz/overrides.php',
+                    ['cmid' => $this->get_cm_by_quiz_name($identifier)->id, 'mode' => 'user']);
+
+            case 'Grades report':
+                return new moodle_url('/mod/quiz/report.php',
+                    ['id' => $this->get_cm_by_quiz_name($identifier)->id, 'mode' => 'overview']);
+
+            case 'Responses report':
+                return new moodle_url('/mod/quiz/report.php',
+                    ['id' => $this->get_cm_by_quiz_name($identifier)->id, 'mode' => 'responses']);
+
+            case 'Statistics report':
+                return new moodle_url('/mod/quiz/report.php',
+                    ['id' => $this->get_cm_by_quiz_name($identifier)->id, 'mode' => 'statistics']);
+
+            case 'Attempt review':
+                if (substr_count($identifier, ' > ') !== 2) {
+                    throw new coding_exception('For "attempt review", name must be ' .
+                            '"{Quiz name} > {username} > Attempt {attemptnumber}", ' .
+                            'for example "Quiz 1 > student > Attempt 1".');
+                }
+                list($quizname, $username, $attemptno) = explode(' > ', $identifier);
+                $attemptno = (int) trim(str_replace ('Attempt', '', $attemptno));
+                $quiz = $this->get_quiz_by_name($quizname);
+                $user = $DB->get_record('user', ['username' => $username], '*', MUST_EXIST);
+                $attempt = $DB->get_record('quiz_attempts',
+                        ['quiz' => $quiz->id, 'userid' => $user->id, 'attempt' => $attemptno], '*', MUST_EXIST);
+                return new moodle_url('/mod/quiz/review.php', ['attempt' => $attempt->id]);
+
+            default:
+                throw new Exception('Unrecognised quiz page type "' . $type . '."');
+        }
+    }
+
+    /**
+     * Get a quiz by name.
+     *
+     * @param string $name quiz name.
+     * @return stdClass the corresponding DB row.
+     */
+    protected function get_quiz_by_name(string $name): stdClass {
+        global $DB;
+        return $DB->get_record('quiz', array('name' => $name), '*', MUST_EXIST);
+    }
+
+    /**
+     * Get a quiz cmid from the quiz name.
+     *
+     * @param string $name quiz name.
+     * @return stdClass cm from get_coursemodule_from_instance.
+     */
+    protected function get_cm_by_quiz_name(string $name): stdClass {
+        $quiz = $this->get_quiz_by_name($name);
+        return get_coursemodule_from_instance('quiz', $quiz->id, $quiz->course);
+    }
+
     /**
      * Put the specified questions on the specified pages of a given quiz.
      *
@@ -67,7 +176,7 @@ class behat_mod_quiz extends behat_question_base {
     public function quiz_contains_the_following_questions($quizname, TableNode $data) {
         global $DB;
 
-        $quiz = $DB->get_record('quiz', array('name' => $quizname), '*', MUST_EXIST);
+        $quiz = $this->get_quiz_by_name($quizname);
 
         // Deal with backwards-compatibility, optional first row.
         $firstrow = $data->getRow(0);
@@ -631,7 +740,8 @@ protected function extract_responses_from_attempt_info(TableNode $attemptinfo) {
      *                random questions. If so, this will let you control which actual
      *                question gets picked when this slot is 'randomised' at the
      *                start of the attempt. If you don't specify, then one will be picked
-     *                at random (which might make the reponse meaningless).
+     *                at random (which might make the response meaningless).
+     *                Give the question name.
      * variant        This column is similar, and also options. It is only needed if
      *                the question that ends up in this slot returns something greater
      *                than 1 for $question->get_num_variants(). Like with actualquestion,
@@ -708,7 +818,7 @@ public function user_has_started_an_attempt_at_quiz($username, $quizname) {
      * @param string $username the username of the user that will attempt.
      * @param string $quizname the name of the quiz the user will attempt.
      * @param TableNode $attemptinfo information about the questions to add, as above.
-     * @Given /^user "([^"]*)" has started an attempt at quiz "([^"]*) randomised as follows:"$/
+     * @Given /^user "([^"]*)" has started an attempt at quiz "([^"]*)" randomised as follows:$/
      */
     public function user_has_started_an_attempt_at_quiz_with_details($username, $quizname, TableNode $attemptinfo) {
         global $DB;
diff --git a/mod/quiz/tests/behat/completion_condition_attempts_used.feature b/mod/quiz/tests/behat/completion_condition_attempts_used.feature
index 7e87610f57ac3..370c9638276d4 100644
--- a/mod/quiz/tests/behat/completion_condition_attempts_used.feature
+++ b/mod/quiz/tests/behat/completion_condition_attempts_used.feature
@@ -25,8 +25,8 @@ Feature: Set a quiz to be marked complete when the student uses all attempts all
       | questioncategory | qtype     | name           | questiontext              |
       | Test questions   | truefalse | First question | Answer the first question |
     And the following "activities" exist:
-      | activity   | name           | course | idnumber | attempts | gradepass | completion | completionattemptsexhausted |
-      | quiz       | Test quiz name | C1     | quiz1    | 2        | 5.00      | 2          | 1                           |
+      | activity | name           | course | idnumber | attempts | gradepass | completion | completionusegrade | completionpass | completionattemptsexhausted |
+      | quiz     | Test quiz name | C1     | quiz1    | 2        | 5.00      | 2          | 1                  | 1              | 1                           |
     And quiz "Test quiz name" contains the following questions:
       | question       | page |
       | First question | 1    |
diff --git a/mod/quiz/tests/behat/completion_condition_passing_grade.feature b/mod/quiz/tests/behat/completion_condition_passing_grade.feature
index 668c563bfb013..d5ec91bcf9984 100644
--- a/mod/quiz/tests/behat/completion_condition_passing_grade.feature
+++ b/mod/quiz/tests/behat/completion_condition_passing_grade.feature
@@ -25,8 +25,8 @@ Feature: Set a quiz to be marked complete when the student passes
       | questioncategory | qtype     | name           | questiontext              |
       | Test questions   | truefalse | First question | Answer the first question |
     And the following "activities" exist:
-      | activity   | name           | course | idnumber | attempts | gradepass | completion | completionpass |
-      | quiz       | Test quiz name | C1     | quiz1    | 4        | 5.00      | 2          | 1              |
+      | activity | name           | course | idnumber | attempts | gradepass | completion | completionusegrade | completionpass |
+      | quiz     | Test quiz name | C1     | quiz1    | 4        | 5.00      | 2          | 1                  | 1              |
     And quiz "Test quiz name" contains the following questions:
       | question       | page |
       | First question | 1    |
diff --git a/mod/quiz/tests/behat/editing_add.feature b/mod/quiz/tests/behat/editing_add.feature
index 3888204dc8c75..41071b64cabcb 100644
--- a/mod/quiz/tests/behat/editing_add.feature
+++ b/mod/quiz/tests/behat/editing_add.feature
@@ -17,15 +17,12 @@ Feature: Edit quiz page - adding things
     And the following "activities" exist:
       | activity   | name   | intro                           | course | idnumber |
       | quiz       | Quiz 1 | Quiz 1 for testing the Add menu | C1     | quiz1    |
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
-    Then I should see "Editing quiz: Quiz 1"
+    And I am on the "Quiz 1" "mod_quiz > Edit" page logged in as "teacher1"
+    And I should see "Editing quiz: Quiz 1"
 
   @javascript
   Scenario: Add some new question to the quiz using '+ a new question' options of the 'Add' menu.
-    And I open the "last" add to quiz menu
+    When I open the "last" add to quiz menu
     And I follow "a new question"
     And I set the field "item_qtype_essay" to "1"
     And I press "submitbutton"
@@ -108,7 +105,7 @@ Feature: Edit quiz page - adding things
       in various categories and add them to the question bank.
 
     # Create a couple of sub categories.
-    And I am on "Course 1" course homepage
+    When I am on "Course 1" course homepage
     And I navigate to "Question bank > Categories" in current page administration
     Then I should see "Add category"
     Then I set the field "Parent category" to "Default for C1"
@@ -190,9 +187,7 @@ Feature: Edit quiz page - adding things
 
     # Add questions from question bank using the Add menu.
     # Add Essay 03 from question bank.
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     And I open the "last" add to quiz menu
     And I follow "from question bank"
     Then the "Add selected questions to the quiz" "button" should be disabled
diff --git a/mod/quiz/tests/behat/editing_add_from_question_bank.feature b/mod/quiz/tests/behat/editing_add_from_question_bank.feature
index 56e983d5f4c3b..3a857772a0677 100644
--- a/mod/quiz/tests/behat/editing_add_from_question_bank.feature
+++ b/mod/quiz/tests/behat/editing_add_from_question_bank.feature
@@ -29,17 +29,15 @@ Feature: Adding questions to a quiz from the question bank
     Given I log in as "teacher1"
     And I am on "Course 1" course homepage
     When I navigate to "Question bank > Questions" in current page administration
-    And I click on "Edit" "link" in the "question 01 name" "table_row"
+    And I choose "Edit question" action for "question 01 name" in the question bank
     And I set the following fields to these values:
       | Tags | foo |
     And I press "id_submitbutton"
-    And I click on "Edit" "link" in the "question 02 name" "table_row"
+    And I choose "Edit question" action for "question 02 name" in the question bank
     And I set the following fields to these values:
       | Tags | bar |
     And I press "id_submitbutton"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     And I open the "last" add to quiz menu
     And I follow "from question bank"
     And I set the field "Filter by tags..." to "foo"
@@ -71,9 +69,7 @@ Feature: Adding questions to a quiz from the question bank
       | Test questions   | essay     | question 21 name | teacher1 | Question 21 text |
       | Test questions   | essay     | question 22 name | teacher1 | Question 22 text |
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     And I open the "last" add to quiz menu
     And I follow "from question bank"
     And I click on "2" "link" in the ".pagination" "css_element"
@@ -94,10 +90,8 @@ Feature: Adding questions to a quiz from the question bank
       | Section 1 | 1         | 0       |
       | Section 2 | 2         | 0       |
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    When I navigate to "Edit quiz" in current page administration
-    And I open the "Page 1" add to quiz menu
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
+    When I open the "Page 1" add to quiz menu
     And I follow "from question bank"
     And I set the field with xpath "//tr[contains(normalize-space(.), 'question 03 name')]//input[@type='checkbox']" to "1"
     And I click on "Add selected questions to the quiz" "button"
diff --git a/mod/quiz/tests/behat/editing_add_random.feature b/mod/quiz/tests/behat/editing_add_random.feature
index bd5feac605287..4f8e4a2ff9ead 100644
--- a/mod/quiz/tests/behat/editing_add_random.feature
+++ b/mod/quiz/tests/behat/editing_add_random.feature
@@ -30,19 +30,26 @@ Feature: Adding random questions to a quiz based on category and tags
     Given I log in as "teacher1"
     And I am on "Course 1" course homepage
     When I navigate to "Question bank > Questions" in current page administration
-    And I click on "Edit" "link" in the "question 1 name" "table_row"
+    And I choose "Edit question" action for "question 1 name" in the question bank
     And I set the following fields to these values:
       | Tags | foo |
     And I press "id_submitbutton"
-    And I click on "Manage tags" "link" in the "question 2 name" "table_row"
+    And I choose "Manage tags" action for "question 2 name" in the question bank
     And I set the following fields to these values:
       | Tags | bar |
     And I press "Save changes"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     And I open the "last" add to quiz menu
     And I follow "a random question"
     And I open the autocomplete suggestions list
     Then "foo" "autocomplete_suggestions" should exist
-    And "bar" "autocomplete_suggestions" should exist
\ No newline at end of file
+    And "bar" "autocomplete_suggestions" should exist
+
+  Scenario: Teacher without moodle/question:useall should not see the add a random question menu item
+    Given the following "permission overrides" exist:
+      | capability             | permission | role           | contextlevel | reference |
+      | moodle/question:useall | Prevent    | editingteacher | Course       | C1        |
+    And I log in as "teacher1"
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
+    When I open the "last" add to quiz menu
+    Then I should not see "a random question"
diff --git a/mod/quiz/tests/behat/editing_move_by_click.feature b/mod/quiz/tests/behat/editing_move_by_click.feature
index 6a0d36bc640a5..7f838d6665b05 100644
--- a/mod/quiz/tests/behat/editing_move_by_click.feature
+++ b/mod/quiz/tests/behat/editing_move_by_click.feature
@@ -31,9 +31,7 @@ Feature: Edit quiz page - drag-and-drop
       | Question B | 1    |
       | Question C | 2    |
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
   @javascript
   Scenario: Re-order questions by clicking on the move icon.
diff --git a/mod/quiz/tests/behat/editing_remove_multiple_questions.feature b/mod/quiz/tests/behat/editing_remove_multiple_questions.feature
index 069ad84995d5c..262f5f649957c 100644
--- a/mod/quiz/tests/behat/editing_remove_multiple_questions.feature
+++ b/mod/quiz/tests/behat/editing_remove_multiple_questions.feature
@@ -21,8 +21,6 @@ Feature: Edit quiz page - remove multiple questions
       | activity   | name   | course | idnumber |
       | quiz       | Quiz 1 | C1     | quiz1    |
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
 
   @javascript
   Scenario: Delete selected question using select multiple items feature.
@@ -36,7 +34,7 @@ Feature: Edit quiz page - remove multiple questions
       | Question A | 1    |
       | Question B | 1    |
       | Question C | 2    |
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
     # Confirm the starting point.
     Then I should see "Question A" on quiz page "1"
@@ -70,7 +68,7 @@ Feature: Edit quiz page - remove multiple questions
       | Question A | 1    |
       | Question B | 2    |
       | Question C | 2    |
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
   # Confirm the starting point.
     Then I should see "Question A" on quiz page "1"
@@ -100,8 +98,8 @@ Feature: Edit quiz page - remove multiple questions
     And quiz "Quiz 1" contains the following questions:
       | question   | page |
       | Question A | 1    |
-    When I navigate to "Edit quiz" in current page administration
-    And I click on "Select multiple items" "button"
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
+    When I click on "Select multiple items" "button"
     And I click on "selectquestion-1" "checkbox"
     And I click on "Delete selected" "button"
     And I click on "Yes" "button" in the "Confirm" "dialogue"
@@ -119,9 +117,9 @@ Feature: Edit quiz page - remove multiple questions
       | Question A | 1    |
       | Question B | 1    |
       | Question C | 2    |
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
-  # Confirm the starting point.
+    # Confirm the starting point.
     Then I should see "Question A" on quiz page "1"
     And I should see "Question B" on quiz page "1"
     And I should see "Question C" on quiz page "2"
@@ -129,7 +127,7 @@ Feature: Edit quiz page - remove multiple questions
     And I should see "Questions: 3"
     And I should see "This quiz is open"
 
-  # Delete all questions in page. Page contains multiple questions
+    # Delete all questions in page. Page contains multiple questions
     When I click on "Select multiple items" "button"
     Then I click on "Select all" "link"
     And I click on "Delete selected" "button"
@@ -153,7 +151,7 @@ Feature: Edit quiz page - remove multiple questions
       | Question A | 1    |
       | Question B | 1    |
       | Question C | 2    |
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
   # Confirm the starting point.
     Then I should see "Question A" on quiz page "1"
@@ -191,7 +189,7 @@ Feature: Edit quiz page - remove multiple questions
       | Section 1 | 1         | 0       |
       | Section 2 | 2         | 0       |
       | Section 3 | 4         | 0       |
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
     When I click on "Select multiple items" "button"
     And I click on "selectquestion-3" "checkbox"
@@ -230,7 +228,7 @@ Feature: Edit quiz page - remove multiple questions
       | Section 1 | 1         | 0       |
       | Section 2 | 2         | 0       |
       | Section 3 | 4         | 0       |
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
     When I click on "Select multiple items" "button"
     And I click on "selectquestion-2" "checkbox"
diff --git a/mod/quiz/tests/behat/editing_remove_question.feature b/mod/quiz/tests/behat/editing_remove_question.feature
index a5d37a153dea9..1ae73b6e90ad5 100644
--- a/mod/quiz/tests/behat/editing_remove_question.feature
+++ b/mod/quiz/tests/behat/editing_remove_question.feature
@@ -21,8 +21,6 @@ Feature: Edit quiz page - remove questions
       | activity   | name   | course | idnumber |
       | quiz       | Quiz 1 | C1     | quiz1    |
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
 
   @javascript
   Scenario: Delete questions by clicking on the delete icon.
@@ -36,7 +34,7 @@ Feature: Edit quiz page - remove questions
       | Question A | 1    |
       | Question B | 1    |
       | Question C | 2    |
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
     # Confirm the starting point.
     Then I should see "Question A" on quiz page "1"
@@ -81,7 +79,7 @@ Feature: Edit quiz page - remove questions
       | heading   | firstslot | shuffle |
       | Heading 1 | 1         | 1       |
       | Heading 2 | 2         | 1       |
-    When I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "Delete" "link" in the "Question A" "list_item" should not be visible
     Then "Delete" "link" in the "Question B" "list_item" should be visible
     Then "Delete" "link" in the "Question C" "list_item" should be visible
@@ -94,6 +92,6 @@ Feature: Edit quiz page - remove questions
     And quiz "Quiz 1" contains the following questions:
       | question   | page |
       | Question A | 1    |
-    When I navigate to "Edit quiz" in current page administration
-    And I delete "Question A" in the quiz by clicking the delete icon
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
+    When I delete "Question A" in the quiz by clicking the delete icon
     Then I should see "Questions: 0"
diff --git a/mod/quiz/tests/behat/editing_repaginate.feature b/mod/quiz/tests/behat/editing_repaginate.feature
index 3fa35745c0b63..0fe66564419b0 100644
--- a/mod/quiz/tests/behat/editing_repaginate.feature
+++ b/mod/quiz/tests/behat/editing_repaginate.feature
@@ -19,9 +19,7 @@ Feature: Edit quiz page - pagination
       | quiz       | Quiz 1 | Quiz 1 description | C1     | quiz1    |
 
     When I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
   @javascript
   Scenario: Repaginate questions with N question(s) per page as well as clicking
diff --git a/mod/quiz/tests/behat/editing_require_previous.feature b/mod/quiz/tests/behat/editing_require_previous.feature
index 813ab55b4073a..079b21204109e 100644
--- a/mod/quiz/tests/behat/editing_require_previous.feature
+++ b/mod/quiz/tests/behat/editing_require_previous.feature
@@ -30,9 +30,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
     And quiz "Quiz 1" contains the following questions:
       | question | page | requireprevious |
       | TF1      | 1    | 1               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "be attempted" "link" should not be visible
     # The text "be attempted" is used as a relatively unique string in both the add and remove links.
 
@@ -49,9 +47,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | question | page | requireprevious |
       | TF1      | 1    | 0               |
       | TF2      | 1    | 1               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "This question cannot be attempted until the previous question has been completed." "link" should be visible
 
   @javascript
@@ -67,9 +63,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | question                | page | requireprevious |
       | Random (Test questions) | 1    | 0               |
       | TF1                     | 1    | 1               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "This question cannot be attempted until the previous question has been completed." "link" should be visible
 
   @javascript
@@ -87,9 +81,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | TF1      | 1    | 0               |
       | TF2      | 1    | 0               |
       | TF3      | 1    | 0               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     When I follow "No restriction on when question 2 can be attempted • Click to change"
     Then "Question 2 cannot be attempted until the previous question 1 has been completed • Click to change" "link" should be visible
     And "No restriction on when question 3 can be attempted • Click to change" "link" should be visible
@@ -109,9 +101,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | TF1      | 1    | 0               |
       | TF2      | 1    | 1               |
       | TF3      | 1    | 1               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     When I follow "Question 3 cannot be attempted until the previous question 2 has been completed • Click to change"
     Then "Question 2 cannot be attempted until the previous question 1 has been completed • Click to change" "link" should be visible
     And "No restriction on when question 3 can be attempted • Click to change" "link" should be visible
@@ -131,9 +121,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | Random (Test questions) | 1    | 0               |
       | TF1                     | 1    | 1               |
       | TF2                     | 1    | 1               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "be attempted" "link" in the "TF1" "list_item" should not be visible
     Then "be attempted" "link" in the "TF2" "list_item" should not be visible
 
@@ -153,9 +141,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
     And quiz "Quiz 1" contains the following sections:
       | heading   | firstslot | shuffle |
       | Section 1 | 1         | 1       |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "be attempted" "link" in the "TF2" "list_item" should not be visible
 
   @javascript
@@ -175,9 +161,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | heading   | firstslot | shuffle |
       | Section 1 | 1         | 1       |
       | Section 2 | 2         | 0       |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "be attempted" "link" in the "TF2" "list_item" should not be visible
 
   @javascript
@@ -193,9 +177,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | question | page | requireprevious |
       | TF1      | 1    | 1               |
       | TF2      | 1    | 1               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "be attempted" "link" in the "TF2" "list_item" should not be visible
 
   @javascript
@@ -211,9 +193,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | question | page | requireprevious |
       | Story    | 1    | 0               |
       | TF1      | 1    | 0               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "be attempted" "link" in the "TF1" "list_item" should not be visible
 
   @javascript
@@ -229,9 +209,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | question | page | requireprevious |
       | Info     | 1    | 0               |
       | TF1      | 1    | 0               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "be attempted" "link" in the "TF1" "list_item" should not be visible
 
   @javascript
@@ -249,9 +227,7 @@ Feature: Edit quizzes where some questions require the previous one to have been
       | TF1      | 1    | 0               |
       | TF2      | 1    | 1               |
       | TF3      | 1    | 1               |
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     When I move "Question 1" to "After Question 3" in the quiz by clicking the move icon
     Then "Question 2 cannot be attempted until the previous question 1 has been completed • Click to change" "link" should be visible
     And "No restriction on when question 3 can be attempted • Click to change" "link" should be visible
diff --git a/mod/quiz/tests/behat/editing_section_headings.feature b/mod/quiz/tests/behat/editing_section_headings.feature
index a771b99eefad5..fbb0d0eaf7bb5 100644
--- a/mod/quiz/tests/behat/editing_section_headings.feature
+++ b/mod/quiz/tests/behat/editing_section_headings.feature
@@ -35,9 +35,7 @@ Feature: Edit quiz page - section headings
       | TF1      | 1    |
       | TF2      | 2    |
       | TF3      | 3    |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     Then I should see "Shuffle"
 
   @javascript
@@ -45,13 +43,11 @@ Feature: Edit quiz page - section headings
     Given the following "activities" exist:
       | activity   | name   | intro              | course | idnumber |
       | quiz       | Quiz 1 | Quiz 1 description | C1     | quiz1    |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I change quiz section heading "" to "This is section one"
     Then I should see "This is section one"
 
- @javascript
+  @javascript
   Scenario: Modify section headings
     Given the following "activities" exist:
       | activity   | name   | intro              | course | idnumber |
@@ -74,9 +70,7 @@ Feature: Edit quiz page - section headings
       |           | 1         | 0       |
       | Heading 2 | 2         | 0       |
       | Heading 3 | 3         | 1       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I change quiz section heading "" to "This is section one"
     And I change quiz section heading "Heading 2" to "This is section two"
     Then I should see "This is section one"
@@ -105,9 +99,7 @@ Feature: Edit quiz page - section headings
       | Heading 1 | 1         | 0       |
       | Heading 2 | 2         | 0       |
       | Heading 3 | 3         | 1       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     When I change quiz section heading "Heading 1" to ""
     Then I should not see "Heading 1"
     And I should see "Heading 2"
@@ -143,9 +135,7 @@ Feature: Edit quiz page - section headings
       | Heading 1 | 1         | 0       |
       | Heading 2 | 2         | 0       |
       | Heading 3 | 3         | 1       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I follow "Remove heading 'Heading 2'"
     And I should see "Are you sure you want to remove the 'Heading 2' section heading?"
     And I click on "Yes" "button" in the "Confirm" "dialogue"
@@ -172,9 +162,7 @@ Feature: Edit quiz page - section headings
       | heading   | firstslot | shuffle |
       | Heading 1 | 1         | 0       |
       | Heading 2 | 2         | 0       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I change quiz section heading "Heading 2" to "Edited heading"
     Then I should see "Edited heading"
     And "Edit heading 'Edited heading'" "link" should be visible
@@ -206,9 +194,7 @@ Feature: Edit quiz page - section headings
       | Heading 1 | 1         | 0       |
       | Heading 2 | 3         | 0       |
       | Heading 3 | 5         | 1       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I move "TF5" to "After Question 2" in the quiz by clicking the move icon
     Then I should see "TF5" on quiz page "2"
 
@@ -238,9 +224,7 @@ Feature: Edit quiz page - section headings
       | Heading 1 | 1         | 0       |
       | Heading 2 | 3         | 0       |
       | Heading 3 | 5         | 1       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I move "TF1" to "After Question 3" in the quiz by clicking the move icon
     Then I should see "TF1" on quiz page "2"
 
@@ -264,9 +248,7 @@ Feature: Edit quiz page - section headings
       | Heading 1 | 1         | 0       |
       | Heading 2 | 2         | 0       |
       | Heading 3 | 3         | 1       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     Then "Remove heading 'Heading 1'" "link" should not exist
     And "Remove heading 'Heading 2'" "link" should exist
     And "Remove heading 'Heading 3'" "link" should exist
@@ -291,9 +273,7 @@ Feature: Edit quiz page - section headings
       | Heading 1 | 1         | 0       |
       | Heading 2 | 2         | 0       |
       | Heading 3 | 3         | 0       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I click on shuffle for section "Heading 1" on the quiz edit page
     And I click on shuffle for section "Heading 2" on the quiz edit page
     Then shuffle for section "Heading 1" should be "On" on the quiz edit page
@@ -319,9 +299,7 @@ Feature: Edit quiz page - section headings
       | Heading 1 | 1         | 1       |
       | Heading 2 | 2         | 1       |
       | Heading 3 | 3         | 1       |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I click on shuffle for section "Heading 1" on the quiz edit page
     And I click on shuffle for section "Heading 2" on the quiz edit page
     Then shuffle for section "Heading 1" should be "Off" on the quiz edit page
@@ -345,9 +323,7 @@ Feature: Edit quiz page - section headings
       | TF1      | 1    |
       | TF2      | 1    |
       | TF3      | 2    |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I click on the "Add" page break icon after question "TF1"
     And I open the action menu in "Page 1" "list_item"
     Then "a new section heading" "link" in the "Page 1" "list_item" should not be visible
@@ -380,9 +356,7 @@ Feature: Edit quiz page - section headings
       | TF3      | 3    |
       | TF4      | 4    |
 
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I click on the "Remove" page break icon after question "TF1"
     And I open the "Page 2" add to quiz menu
     And I choose "a new section heading" in the open action menu
@@ -419,9 +393,7 @@ Feature: Edit quiz page - section headings
       | TF9      | 9    |
       | TF10     | 10   |
       | TF11     | 11   |
-    When I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     And I click on the "Remove" page break icon after question "TF10"
     And I open the "Page 10" add to quiz menu
     And I choose "a new section heading" in the open action menu
diff --git a/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature b/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature
index 90088eec26370..7b4184dcfbb33 100644
--- a/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature
+++ b/mod/quiz/tests/behat/editing_set_marks_no_attempts.feature
@@ -68,7 +68,7 @@ Feature: Edit quiz marks with no attempts
       | Decimal places in grades | 3 |
       | Decimal places in question grades | 5 |
     And I press "Save and display"
-    And I navigate to "Edit quiz" in current page administration
+    When I am on the "Quiz 1" "mod_quiz > Edit" page
     # Then the field "maxgrade" matches value "20.000" -- with exact match on decimal places.
     Then "//input[@name = 'maxgrade' and @value = '20.000']" "xpath_element" should exist
     And I should see "2.00000"
diff --git a/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature b/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature
index 5236cac72b9f7..a23acfbc58eb4 100644
--- a/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature
+++ b/mod/quiz/tests/behat/editing_set_marks_with_attempts.feature
@@ -36,9 +36,7 @@ Feature: Edit quiz marks with attempts
     And I press "Attempt quiz now"
     And I log out
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
 
   @javascript
   Scenario: Set the max mark for a question.
@@ -80,7 +78,7 @@ Feature: Edit quiz marks with attempts
       | Decimal places in grades | 3 |
       | Decimal places in question grades | 5 |
     And I press "Save and display"
-    And I navigate to "Edit quiz" in current page administration
+    And I am on the "Quiz 1" "mod_quiz > Edit" page
     # Then the field "maxgrade" matches value "20.000" -- with exact match on decimal places.
     Then "//input[@name = 'maxgrade' and @value = '20.000']" "xpath_element" should exist
     And I should see "2.00000"
diff --git a/mod/quiz/tests/behat/manually_mark_question.feature b/mod/quiz/tests/behat/manually_mark_question.feature
index e361b2afdc6fe..d8218f3d0f595 100644
--- a/mod/quiz/tests/behat/manually_mark_question.feature
+++ b/mod/quiz/tests/behat/manually_mark_question.feature
@@ -30,7 +30,7 @@ Feature: Teachers can override the grade for any question
       | TF1      | 1    |
     And I log in as "student1"
     And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    And I am on the "Quiz 1" "mod_quiz > View" page
     And I press "Attempt quiz now"
     And I follow "Finish attempt ..."
     And I press "Submit all and finish"
@@ -40,10 +40,7 @@ Feature: Teachers can override the grade for any question
   @javascript @_switch_window @_bug_phantomjs
   Scenario: Validating the marking of an essay question attempt.
     When I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I follow "Attempts: 1"
-    And I follow "Review attempt"
+    And I am on the "Quiz 1 > student1 > Attempt 1" "mod_quiz > Attempt review" page
     And I follow "Make comment or override mark"
     And I switch to "commentquestion" window
     And I set the field "Mark" to "25"
@@ -64,10 +61,7 @@ Feature: Teachers can override the grade for any question
     And I follow "Manage private files"
     And I upload "mod/quiz/tests/fixtures/moodle_logo.jpg" file to "Files" filemanager
     And I click on "Save changes" "button"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
-    And I follow "Attempts: 1"
-    And I follow "Review attempt"
+    And I am on the "Quiz 1 > student1 > Attempt 1" "mod_quiz > Attempt review" page
     And I follow "Make comment or override mark"
     And I switch to "commentquestion" window
     And I set the field "Comment" to "Administrator's comment"
diff --git a/mod/quiz/tests/behat/preview.feature b/mod/quiz/tests/behat/preview.feature
index a410d0e0c01c7..d8c8733bba7ea 100644
--- a/mod/quiz/tests/behat/preview.feature
+++ b/mod/quiz/tests/behat/preview.feature
@@ -35,9 +35,7 @@ Feature: Preview a quiz as a teacher
 
   @javascript
   Scenario: Preview a quiz
-    When I log in as "teacher"
-    And I am on "Course 1" course homepage
-    When I follow "Quiz 1"
+    When I am on the "Quiz 1" "mod_quiz > View" page logged in as "teacher"
     And I follow "Review"
     Then I should see "25.00 out of 100.00"
     And I follow "Finish review"
diff --git a/mod/quiz/tests/behat/quiz_group_override.feature b/mod/quiz/tests/behat/quiz_group_override.feature
new file mode 100644
index 0000000000000..c20ac9fbffd26
--- /dev/null
+++ b/mod/quiz/tests/behat/quiz_group_override.feature
@@ -0,0 +1,95 @@
+@mod @mod_quiz
+Feature: Quiz group override
+  In order to grant a group special access to a quiz
+  As a teacher
+  I need to create an override for thta group.
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname  | lastname  | email                |
+      | teacher1 | Terry 1    | Teacher 1 | teacher1@example.com |
+      | student1 | Sam 1      | Student 1 | student1@example.com |
+      | teacher2 | Terry 2    | Teacher 2 | teacher2@example.com |
+      | student2 | Sam 2      | Student 2 | student2@example.com |
+      | teacher3 | Terry 3    | Teacher 3 | teacher3@example.com |
+      | student3 | Sam 3      | Student 3 | student3@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+      | teacher2 | C1     | editingteacher |
+      | student2 | C1     | student        |
+      | teacher3 | C1     | editingteacher |
+      | student3 | C1     | student        |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+      | Group 3 | C1     | G3       |
+    And the following "group members" exist:
+      | user     | group |
+      | student1 | G1    |
+      | teacher1 | G1    |
+      | teacher1 | G3    |
+      | student2 | G2    |
+      | teacher2 | G2    |
+      | teacher2 | G3    |
+      | student3 | G3    |
+    And the following "activities" exist:
+      | activity | name      | intro                 | course | idnumber | groupmode |
+      | quiz     | Test quiz | Test quiz description | C1     | quiz1    | 1         |
+
+  Scenario: Override Group 1 as teacher of Group 1
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    When I am on the "Test quiz" "mod_quiz > Group overrides" page logged in as "teacher1"
+    And I press "Add group override"
+    Then the "Override group" select box should contain "Group 1"
+    And the "Override group" select box should not contain "Group 2"
+
+  Scenario: Override Group 1 as teacher in no group
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    When I am on the "Test quiz" "mod_quiz > Group overrides" page logged in as "teacher3"
+    Then I should see "No groups you can access."
+    And the "Add group override" "button" should be disabled
+
+  Scenario: A teacher with accessallgroups permission should see all group overrides
+    When I am on the "Test quiz" "mod_quiz > Group overrides" page logged in as "admin"
+    And I press "Add group override"
+    And I set the following fields to these values:
+      | Override group | Group 1 |
+      | Attempts allowed | 2 |
+    And I press "Save and enter another override"
+    And I set the following fields to these values:
+      | Override group   | Group 2 |
+      | Attempts allowed | 2       |
+    And I press "Save"
+    And I log out
+    And I am on the "Test quiz" "mod_quiz > Group overrides" page logged in as "teacher1"
+    Then I should see "Group 1" in the ".generaltable" "css_element"
+    And I should see "Group 2" in the ".generaltable" "css_element"
+
+  Scenario: A teacher without accessallgroups permission should only see the group overrides within his/her groups, when the activity's group mode is "separate groups"
+    Given the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    When I am on the "Test quiz" "mod_quiz > Group overrides" page logged in as "admin"
+    And I press "Add group override"
+    And I set the following fields to these values:
+      | Override group | Group 1 |
+      | Attempts allowed | 2 |
+    And I press "Save and enter another override"
+    And I set the following fields to these values:
+      | Override group | Group 2 |
+      | Attempts allowed | 2 |
+    And I press "Save"
+    And I log out
+    When I am on the "Test quiz" "mod_quiz > Group overrides" page logged in as "teacher1"
+    Then I should see "Group 1" in the ".generaltable" "css_element"
+    And I should not see "Group 2" in the ".generaltable" "css_element"
diff --git a/mod/quiz/tests/behat/quiz_no_calendar_capabilities.feature b/mod/quiz/tests/behat/quiz_no_calendar_capabilities.feature
index 52b1f216b7043..4bd2b0bc3a0da 100644
--- a/mod/quiz/tests/behat/quiz_no_calendar_capabilities.feature
+++ b/mod/quiz/tests/behat/quiz_no_calendar_capabilities.feature
@@ -37,9 +37,7 @@ Feature: Quiz with no calendar capabilites
       | id_timeclose_month | 2 |
       | id_timeclose_year | 2017 |
     And I log out
-    When I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I follow "Test quiz name"
+    When I am on the "Test quiz name" "mod_quiz > View" page logged in as "teacher1"
     And I navigate to "Edit settings" in current page administration
     And I set the following fields to these values:
       | id_timeopen_year | 2018 |
diff --git a/mod/quiz/tests/behat/quiz_reset.feature b/mod/quiz/tests/behat/quiz_reset.feature
index 1337e976e003d..71724d79986d5 100644
--- a/mod/quiz/tests/behat/quiz_reset.feature
+++ b/mod/quiz/tests/behat/quiz_reset.feature
@@ -41,55 +41,35 @@ Feature: Quiz reset
     And I am on "Course 1" course homepage
     And I navigate to "Reset" in current page administration
     And I set the following fields to these values:
-        | Delete all quiz attempts | 1  |
+        | Delete all quiz attempts | 1 |
     And I press "Reset course"
     And I press "Continue"
-    And I am on "Course 1" course homepage
-    And I follow "Test quiz name"
-    And I navigate to "Results" in current page administration
+    And I am on the "Test quiz name" "mod_quiz > Grades report" page
     Then I should see "Attempts: 0"
 
-  @javascript
   Scenario: Use course reset to remove user overrides.
+    Given the following "mod_quiz > user overrides" exist:
+      | quiz           | user     | attempts |
+      | Test quiz name | student1 | 2        |
     When I log in as "teacher1"
     And I am on "Course 1" course homepage
-    And I follow "Test quiz name"
-    And I navigate to "User overrides" in current page administration
-    And I press "Add user override"
-    And I set the following fields to these values:
-        | Override user    | Student1  |
-        | Attempts allowed | 2 |
-    And I press "Save"
-    And I should see "Sam1 Student1"
-    And I am on "Course 1" course homepage
     And I navigate to "Reset" in current page administration
-    And I set the following fields to these values:
-        | Delete all user overrides | 1  |
+    And I set the field "Delete all user overrides" to "1"
     And I press "Reset course"
     And I press "Continue"
-    And I am on "Course 1" course homepage
-    And I follow "Test quiz name"
-    And I navigate to "User overrides" in current page administration
+    And I am on the "Test quiz name" "mod_quiz > User overrides" page
     Then I should not see "Sam1 Student1"
 
   Scenario: Use course reset to remove group overrides.
+    Given the following "mod_quiz > group overrides" exist:
+      | quiz           | group | attempts |
+      | Test quiz name | G1    | 2        |
     When I log in as "teacher1"
     And I am on "Course 1" course homepage
-    And I follow "Test quiz name"
-    And I navigate to "Group overrides" in current page administration
-    And I press "Add group override"
-    And I set the following fields to these values:
-        | Override group    | Group 1  |
-        | Attempts allowed | 2 |
-    And I press "Save"
-    And I should see "Group 1"
-    And I am on "Course 1" course homepage
     And I navigate to "Reset" in current page administration
     And I set the following fields to these values:
-        | Delete all group overrides | 1  |
+        | Delete all group overrides | 1 |
     And I press "Reset course"
     And I press "Continue"
-    And I am on "Course 1" course homepage
-    And I follow "Test quiz name"
-    And I navigate to "Group overrides" in current page administration
+    And I am on the "Test quiz name" "mod_quiz > Group overrides" page
     Then I should not see "Group 1"
diff --git a/mod/quiz/tests/behat/quiz_user_override.feature b/mod/quiz/tests/behat/quiz_user_override.feature
index 4b7a5bfe210df..344488fa7e1de 100644
--- a/mod/quiz/tests/behat/quiz_user_override.feature
+++ b/mod/quiz/tests/behat/quiz_user_override.feature
@@ -1,4 +1,4 @@
-@mod @mod_quiz @javascript
+@mod @mod_quiz
 Feature: Quiz user override
   In order to grant a student special access to a quiz
   As a teacher
@@ -18,24 +18,14 @@ Feature: Quiz user override
       | teacher1 | C1     | editingteacher |
       | student1 | C1     | student        |
       | student2 | C1     | student        |
-    And the following "question categories" exist:
-      | contextlevel | reference | name           |
-      | Course       | C1        | Test questions |
     And the following "activities" exist:
       | activity   | name   | intro              | course | idnumber |
       | quiz       | Quiz 1 | Quiz 1 description | C1     | quiz1    |
-    And the following "questions" exist:
-      | questioncategory | qtype       | name  | questiontext    |
-      | Test questions   | truefalse   | TF1   | First question  |
-      | Test questions   | truefalse   | TF2   | Second question |
-    And quiz "Quiz 1" contains the following questions:
-      | question | page | maxmark |
-      | TF1      | 1    |         |
-      | TF2      | 1    | 3.0     |
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage
 
+  @javascript
   Scenario: Add, modify then delete a user override
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage
     When I follow "Quiz 1"
     And I navigate to "User overrides" in current page administration
     And I press "Add user override"
@@ -58,8 +48,11 @@ Feature: Quiz user override
     And I press "Continue"
     And I should not see "Student One"
 
+  @javascript
   Scenario: Being able to modify a user override when the quiz is not available to the student
-    Given I follow "Quiz 1"
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Quiz 1"
     And I navigate to "Edit settings" in current page administration
     And I expand all fieldsets
     And I set the field "Availability" to "Hide from students"
@@ -71,3 +64,48 @@ Feature: Quiz user override
       | Attempts allowed | 1        |
     And I press "Save"
     Then "Edit" "icon" should exist in the "Student One" "table_row"
+
+  Scenario: A teacher without accessallgroups permission should only be able to add user override for users that he/she shares groups with,
+        when the activity's group mode is to "separate groups"
+    Given the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+    And the following "group members" exist:
+      | user     | group |
+      | student1 | G1    |
+      | teacher1 | G1    |
+      | student2 | G2    |
+    And the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name   | intro              | course | idnumber | groupmode |
+      | quiz     | Quiz 2 | Quiz 2 description | C1     | quiz2    | 1         |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Quiz 2"
+    And I navigate to "User overrides" in current page administration
+    And I press "Add user override"
+    Then the "Override user" select box should contain "Student One, student1@example.com"
+    And the "Override user" select box should not contain "Student Two, student2@example.com"
+
+  Scenario: Override user in an activity with group mode set to "separate groups" as a teacher who is not a member in any group, and does not have accessallgroups permission
+    Given the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+    And the following "group members" exist:
+      | user     | group |
+      | student1 | G1    |
+    And the following "permission overrides" exist:
+      | capability                  | permission | role           | contextlevel | reference |
+      | moodle/site:accessallgroups | Prevent    | editingteacher | Course       | C1        |
+    And the following "activities" exist:
+      | activity | name   | intro              | course | idnumber | groupmode |
+      | quiz     | Quiz 2 | Quiz 2 description | C1     | quiz2    | 1         |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "Quiz 2"
+    And I navigate to "User overrides" in current page administration
+    Then I should see "No groups you can access."
+    And the "Add user override" "button" should be disabled
diff --git a/mod/quiz/tests/events_test.php b/mod/quiz/tests/events_test.php
index ca6bfe70bded3..1771846bb7955 100644
--- a/mod/quiz/tests/events_test.php
+++ b/mod/quiz/tests/events_test.php
@@ -39,11 +39,11 @@
 class mod_quiz_events_testcase extends advanced_testcase {
 
     /**
-     * Setup some convenience test data with a single attempt.
+     * Setup a quiz.
      *
-     * @param bool $ispreview Make the attempt a preview attempt when true.
+     * @return quiz the generated quiz.
      */
-    protected function prepare_quiz_data($ispreview = false) {
+    protected function prepare_quiz() {
 
         $this->resetAfterTest(true);
 
@@ -53,8 +53,8 @@ protected function prepare_quiz_data($ispreview = false) {
         // Make a quiz.
         $quizgenerator = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
 
-        $quiz = $quizgenerator->create_instance(array('course'=>$course->id, 'questionsperpage' => 0,
-            'grade' => 100.0, 'sumgrades' => 2));
+        $quiz = $quizgenerator->create_instance(array('course' => $course->id, 'questionsperpage' => 0,
+                'grade' => 100.0, 'sumgrades' => 2));
 
         $cm = get_coursemodule_from_instance('quiz', $quiz->id, $course->id);
 
@@ -73,8 +73,17 @@ protected function prepare_quiz_data($ispreview = false) {
         $user1 = $this->getDataGenerator()->create_user();
         $this->setUser($user1);
 
-        $quizobj = quiz::create($quiz->id, $user1->id);
+        return quiz::create($quiz->id, $user1->id);
+    }
 
+    /**
+     * Setup a quiz attempt at the quiz created by {@link prepare_quiz()}.
+     *
+     * @param quiz $quizobj the generated quiz.
+     * @param bool $ispreview Make the attempt a preview attempt when true.
+     * @return array with three elements, array($quizobj, $quba, $attempt)
+     */
+    protected function prepare_quiz_attempt($quizobj, $ispreview = false) {
         // Start the attempt.
         $quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
         $quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
@@ -87,6 +96,17 @@ protected function prepare_quiz_data($ispreview = false) {
         return array($quizobj, $quba, $attempt);
     }
 
+    /**
+     * Setup some convenience test data with a single attempt.
+     *
+     * @param bool $ispreview Make the attempt a preview attempt when true.
+     * @return array with three elements, array($quizobj, $quba, $attempt)
+     */
+    protected function prepare_quiz_data($ispreview = false) {
+        $quizobj = $this->prepare_quiz();
+        return $this->prepare_quiz_attempt($quizobj, $ispreview);
+    }
+
     public function test_attempt_submitted() {
 
         list($quizobj, $quba, $attempt) = $this->prepare_quiz_data();
@@ -194,10 +214,14 @@ public function test_attempt_abandoned() {
     }
 
     public function test_attempt_started() {
-        list($quizobj, $quba, $attempt) = $this->prepare_quiz_data();
+        $quizobj = $this->prepare_quiz();
 
-        // Create another attempt.
-        $attempt = quiz_create_attempt($quizobj, 1, false, time(), false, 2);
+        $quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
+        $quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
+
+        $timenow = time();
+        $attempt = quiz_create_attempt($quizobj, 1, false, $timenow);
+        quiz_start_new_attempt($quizobj, $quba, $attempt, 1, $timenow);
 
         // Trigger and capture the event.
         $sink = $this->redirectEvents();
@@ -666,11 +690,14 @@ public function test_attempt_viewed() {
      * Test the attempt previewed event.
      */
     public function test_attempt_preview_started() {
-        list($quizobj, $quba, $attempt) = $this->prepare_quiz_data();
+        $quizobj = $this->prepare_quiz();
 
-        // We want to preview this attempt.
-        $attempt = quiz_create_attempt($quizobj, 1, false, time(), false, 2);
-        $attempt->preview = 1;
+        $quba = question_engine::make_questions_usage_by_activity('mod_quiz', $quizobj->get_context());
+        $quba->set_preferred_behaviour($quizobj->get_quiz()->preferredbehaviour);
+
+        $timenow = time();
+        $attempt = quiz_create_attempt($quizobj, 1, false, $timenow, true);
+        quiz_start_new_attempt($quizobj, $quba, $attempt, 1, $timenow);
 
         // Trigger and capture the event.
         $sink = $this->redirectEvents();
diff --git a/mod/quiz/tests/external_test.php b/mod/quiz/tests/external_test.php
index a5072f2f4326f..14dec66b12f37 100644
--- a/mod/quiz/tests/external_test.php
+++ b/mod/quiz/tests/external_test.php
@@ -176,6 +176,7 @@ public function test_mod_quiz_get_quizzes_by_courses() {
         // Second quiz.
         $record = new stdClass();
         $record->course = $course2->id;
+        $record->intro = '<button>Test with HTML allowed.</button>';
         $quiz2 = self::getDataGenerator()->create_module('quiz', $record);
 
         // Execute real Moodle enrolment as we'll call unenrol() method on the instance later.
diff --git a/mod/quiz/tests/generator/behat_mod_quiz_generator.php b/mod/quiz/tests/generator/behat_mod_quiz_generator.php
new file mode 100644
index 0000000000000..55a814534f6c6
--- /dev/null
+++ b/mod/quiz/tests/generator/behat_mod_quiz_generator.php
@@ -0,0 +1,66 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Behat data generator for mod_quiz.
+ *
+ * @package   mod_quiz
+ * @category  test
+ * @copyright 2019 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+
+/**
+ * Behat data generator for mod_quiz.
+ *
+ * @copyright 2019 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class behat_mod_quiz_generator extends behat_generator_base {
+
+    protected function get_creatable_entities(): array {
+        return [
+            'group overrides' => [
+                'datagenerator' => 'override',
+                'required' => ['quiz', 'group'],
+                'switchids' => ['quiz' => 'quiz', 'group' => 'groupid'],
+            ],
+            'user overrides' => [
+                'datagenerator' => 'override',
+                'required' => ['quiz', 'user'],
+                'switchids' => ['quiz' => 'quiz', 'user' => 'userid'],
+            ],
+        ];
+    }
+
+    /**
+     * Look up the id of a quiz from its name.
+     *
+     * @param string $quizname the quiz name, for example 'Test quiz'.
+     * @return int corresponding id.
+     */
+    protected function get_quiz_id(string $quizname): int {
+        global $DB;
+
+        if (!$id = $DB->get_field('quiz', 'id', ['name' => $quizname])) {
+            throw new Exception('There is no quiz with name "' . $quizname . '" does not exist');
+        }
+        return $id;
+    }
+}
diff --git a/mod/quiz/tests/generator/lib.php b/mod/quiz/tests/generator/lib.php
index 5b18decb3332c..d45e8e79ca891 100644
--- a/mod/quiz/tests/generator/lib.php
+++ b/mod/quiz/tests/generator/lib.php
@@ -170,4 +170,27 @@ public function submit_responses($attemptid, array $responses, $checkbutton, $fi
             $attemptobj->process_finish(time(), false);
         }
     }
+
+    /**
+     * Create a quiz override (either user or group).
+     *
+     * @param array $data must specify quizid, and one of userid or groupid.
+     */
+    public function create_override(array $data): void {
+        global $DB;
+
+        if (!isset($data['quiz'])) {
+            throw new coding_exception('Must specify quiz (id) when creating a quiz override.');
+        }
+
+        if (!isset($data['userid']) && !isset($data['groupid'])) {
+            throw new coding_exception('Must specify one of userid or groupid when creating a quiz override.');
+        }
+
+        if (isset($data['userid']) && isset($data['groupid'])) {
+            throw new coding_exception('Cannot specify both userid and groupid when creating a quiz override.');
+        }
+
+        $DB->insert_record('quiz_overrides', (object) $data);
+    }
 }
diff --git a/mod/quiz/tests/lib_test.php b/mod/quiz/tests/lib_test.php
index bf822270a12e1..cccfed7e6932f 100644
--- a/mod/quiz/tests/lib_test.php
+++ b/mod/quiz/tests/lib_test.php
@@ -166,6 +166,7 @@ public function test_quiz_get_completion_state() {
                       'questionsperpage' => 0,
                       'sumgrades' => 1,
                       'completion' => COMPLETION_TRACKING_AUTOMATIC,
+                      'completionusegrade' => 1,
                       'completionpass' => 1);
         $quiz = $quizgenerator->create_instance($data);
         $cm = get_coursemodule_from_id('quiz', $quiz->cmid);
@@ -845,6 +846,71 @@ public function test_quiz_core_calendar_provide_event_action_already_finished_fo
         $this->assertNull(mod_quiz_core_calendar_provide_event_action($event, $factory, $student->id));
     }
 
+    public function test_quiz_core_calendar_provide_event_action_already_completed() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $quiz = $this->getDataGenerator()->create_module('quiz', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('quiz', $quiz->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $quiz->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_quiz_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_quiz_core_calendar_provide_event_action_already_completed_for_user() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $quiz = $this->getDataGenerator()->create_module('quiz', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('quiz', $quiz->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $quiz->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_quiz_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
@@ -880,14 +946,14 @@ public function test_mod_quiz_completion_get_active_rule_descriptions() {
         $quiz1 = $this->getDataGenerator()->create_module('quiz', [
             'course' => $course->id,
             'completion' => 2,
+            'completionusegrade' => 1,
             'completionattemptsexhausted' => 1,
             'completionpass' => 1
         ]);
         $quiz2 = $this->getDataGenerator()->create_module('quiz', [
             'course' => $course->id,
             'completion' => 2,
-            'completionattemptsexhausted' => 0,
-            'completionpass' => 0
+            'completionusegrade' => 0
         ]);
         $cm1 = cm_info::create(get_coursemodule_from_instance('quiz', $quiz1->id));
         $cm2 = cm_info::create(get_coursemodule_from_instance('quiz', $quiz2->id));
diff --git a/mod/quiz/tests/restore_override_test.php b/mod/quiz/tests/restore_override_test.php
new file mode 100644
index 0000000000000..7836a9942ecc9
--- /dev/null
+++ b/mod/quiz/tests/restore_override_test.php
@@ -0,0 +1,107 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Restore override tests.
+ *
+ * @package    mod_quiz
+ * @author   2019 Nathan Nguyen <nathannguyen@catalyst-au.net>
+ * @copyright Catalyst IT
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->libdir . "/phpunit/classes/restore_date_testcase.php");
+/**
+ * Restore override tests.
+ *
+ * @package    mod_quiz
+ * @author   2019 Nathan Nguyen <nathannguyen@catalyst-au.net>
+ * @copyright Catalyst IT
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mod_quiz_restore_override_testcase extends restore_date_testcase {
+
+    /**
+     * Test restore overrides.
+     */
+    public function test_restore_overrides() {
+        global $DB, $USER;
+        $this->resetAfterTest();
+
+        $course = $this->getDataGenerator()->create_course();
+        $quizgen = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
+        $quiz = $quizgen->create_instance(['course' => $course->id]);
+
+        $group1 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+        $group2 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+
+        $now = 100;
+
+        // Group overrides.
+        $groupoverride1 = (object)[
+            'quiz' => $quiz->id,
+            'groupid' => $group1->id,
+            'timeopen' => $now,
+            'timeclose' => $now + 20
+        ];
+        $DB->insert_record('quiz_overrides', $groupoverride1);
+
+        $groupoverride2 = (object)[
+            'quiz' => $quiz->id,
+            'groupid' => $group2->id,
+            'timeopen' => $now,
+            'timeclose' => $now + 40
+        ];
+        $DB->insert_record('quiz_overrides', $groupoverride2);
+
+        // Current quiz overrides.
+        $overrides = $DB->get_records('quiz_overrides', ['quiz' => $quiz->id]);
+        $this->assertEquals(2, count($overrides));
+
+        // User Override.
+        $useroverride = (object)[
+            'quiz' => $quiz->id,
+            'userid' => $USER->id,
+            'sortorder' => 1,
+            'timeopen' => 100,
+            'timeclose' => 200
+        ];
+        $DB->insert_record('quiz_overrides', $useroverride);
+
+        // Current quiz overrides.
+        $overrides = $DB->get_records('quiz_overrides', ['quiz' => $quiz->id]);
+        $this->assertEquals(3, count($overrides));
+
+        // Back up and restore including group info and user info.
+        set_config('backup_general_groups', 1, 'backup');
+        $newcourseid = $this->backup_and_restore($course);
+        $newquiz = $DB->get_record('quiz', ['course' => $newcourseid]);
+        $overrides = $DB->get_records('quiz_overrides', ['quiz' => $newquiz->id]);
+        // 2 groups overrides and 1 user override.
+        $this->assertEquals(3, count($overrides));
+
+        // Back up and restore with user info and without group info.
+        set_config('backup_general_groups', 0, 'backup');
+        $newcourseid = $this->backup_and_restore($course);
+        $newquiz = $DB->get_record('quiz', ['course' => $newcourseid]);
+        $overrides = $DB->get_records('quiz_overrides', ['quiz' => $newquiz->id]);
+        // 1 user override.
+        $this->assertEquals(1, count($overrides));
+    }
+}
diff --git a/mod/quiz/tests/structure_test.php b/mod/quiz/tests/structure_test.php
index 8bf69cbcb0bc9..5388b9883a726 100644
--- a/mod/quiz/tests/structure_test.php
+++ b/mod/quiz/tests/structure_test.php
@@ -1051,4 +1051,26 @@ public function test_get_slot_tags_for_slot($layout, $tagnames, $slotnumber, $ex
 
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * Test for can_add_random_questions.
+     */
+    public function test_can_add_random_questions() {
+        $this->resetAfterTest();
+
+        $quiz = $this->create_test_quiz([]);
+        $course = $quiz->get_course();
+
+        $generator = $this->getDataGenerator();
+        $teacher = $generator->create_and_enrol($course, 'editingteacher');
+        $noneditingteacher = $generator->create_and_enrol($course, 'teacher');
+
+        $this->setUser($teacher);
+        $structure = \mod_quiz\structure::create_for_quiz($quiz);
+        $this->assertTrue($structure->can_add_random_questions());
+
+        $this->setUser($noneditingteacher);
+        $structure = \mod_quiz\structure::create_for_quiz($quiz);
+        $this->assertFalse($structure->can_add_random_questions());
+    }
 }
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index 472a6edf3d4a8..a4c191f20887b 100644
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019052000;
+$plugin->version   = 2019052001;
 $plugin->requires  = 2019051100;
 $plugin->component = 'mod_quiz';
diff --git a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-debug.js b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-debug.js
index 07a85562b1909..99e5e2de9751a 100644
--- a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-debug.js
+++ b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-debug.js
@@ -335,6 +335,14 @@ M.mod_quiz.autosave = {
         if (typeof window.tinyMCE !== 'undefined') {
             window.tinyMCE.triggerSave();
         }
+
+        // YUI io.form incorrectly (in my opinion) sends the value of all submit
+        // buttons in the ajax request. We don't want any submit buttons.
+        // Therefore, temporarily change the type.
+        // (Yes, this is a nasty hack. One day this will be re-written as AMD, hopefully).
+        var allsubmitbuttons = this.form.all('input[type=submit], button[type=submit]');
+        allsubmitbuttons.setAttribute('type', 'button');
+
         this.save_transaction = Y.io(this.AUTOSAVE_HANDLER, {
             method:  'POST',
             form:    {id: this.form},
@@ -344,6 +352,9 @@ M.mod_quiz.autosave = {
             },
             context: this
         });
+
+        // Change the button types back.
+        allsubmitbuttons.setAttribute('type', 'submit');
     },
 
     save_done: function(transactionid, response) {
diff --git a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-min.js b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-min.js
index 01b5deecc2a71..6da00660e9f9a 100644
--- a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-min.js
+++ b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-min.js
@@ -1 +1 @@
-YUI.add("moodle-mod_quiz-autosave",function(e,t){M.mod_quiz=M.mod_quiz||{},M.mod_quiz.autosave={TINYMCE_DETECTION_DELAY:500,TINYMCE_DETECTION_REPEATS:20,WATCH_HIDDEN_DELAY:1e3,FAILURES_BEFORE_NOTIFY:1,FIRST_SUCCESSFUL_SAVE:-1,SELECTORS:{QUIZ_FORM:"#responseform",VALUE_CHANGE_ELEMENTS:'input, textarea, [contenteditable="true"]',CHANGE_ELEMENTS:"input, select",HIDDEN_INPUTS:"input[type=hidden]",CONNECTION_ERROR:"#connection-error",CONNECTION_OK:"#connection-ok"},AUTOSAVE_HANDLER:M.cfg.wwwroot+"/mod/quiz/autosave.ajax.php",delay:12e4,form:null,dirty:!1,delay_timer:null,save_transaction:null,savefailures:0,editor_change_handler:null,hidden_field_values:{},init:function(t){this.form=e.one(this.SELECTORS.QUIZ_FORM);if(!this.form)return;this.delay=t*1e3,this.form.delegate("valuechange",this.value_changed,this.SELECTORS.VALUE_CHANGE_ELEMENTS,this),this.form.delegate("change",this.value_changed,this.SELECTORS.CHANGE_ELEMENTS,this),this.form.on("submit",this.stop_autosaving,this),this.init_tinymce(this.TINYMCE_DETECTION_REPEATS),this.save_hidden_field_values(),this.watch_hidden_fields()},save_hidden_field_values:function(){this.form.all(this.SELECTORS.HIDDEN_INPUTS).each(function(e){var t=e.get("name");if(!t)return;this.hidden_field_values[t]=e.get("value")},this)},watch_hidden_fields:function(){this.detect_hidden_field_changes(),e.later(this.WATCH_HIDDEN_DELAY,this,this.watch_hidden_fields)},detect_hidden_field_changes:function(){this.form.all(this.SELECTORS.HIDDEN_INPUTS).each(function(e){var t=e.get("name"),n=e.get("value");if(!t)return;if(!(t in this.hidden_field_values)||n!==this.hidden_field_values[t])this.hidden_field_values[t]=n,this.value_changed({target:e})},this)},init_tinymce:function(t){if(typeof window.tinyMCE=="undefined"){t>0&&e.later(this.TINYMCE_DETECTION_DELAY,this,this.init_tinymce,[t-1]);return}this.editor_change_handler=e.bind(this.editor_changed,this),window.tinyMCE.onAddEditor.add(e.bind(this.init_tinymce_editor,this))},init_tinymce_editor:function(e,t){t.onChange.add(this.editor_change_handler),t.onRedo.add(this.editor_change_handler),t.onUndo.add(this.editor_change_handler),t.onKeyDown.add(this.editor_change_handler)},value_changed:function(e){var t=e.target.getAttribute("name");if(t==="thispage"||t==="scrollpos"||t&&t.match(/_:flagged$/))return;t=t||"#"+e.target.getAttribute("id"),this.start_save_timer_if_necessary()},editor_changed:function(e){this.start_save_timer_if_necessary()},start_save_timer_if_necessary:function(){this.dirty=!0;if(this.delay_timer||this.save_transaction)return;this.start_save_timer()},start_save_timer:function(){this.cancel_delay(),this.delay_timer=e.later(this.delay,this,this.save_changes)},cancel_delay:function(){this.delay_timer&&this.delay_timer!==!0&&this.delay_timer.cancel(),this.delay_timer=null},save_changes:function(){this.cancel_delay(),this.dirty=!1;if(this.is_time_nearly_over()){this.stop_autosaving();return}typeof window.tinyMCE!="undefined"&&window.tinyMCE.triggerSave(),this.save_transaction=e.io(this.AUTOSAVE_HANDLER,{method:"POST",form:{id:this.form},on:{success:this.save_done,failure:this.save_failed},context:this})},save_done:function(t,n){if(n.responseText!=="OK"){this.save_failed(t,n);return}this.save_transaction=null,this.dirty&&this.start_save_timer(),this.savefailures>0?(e.one(this.SELECTORS.CONNECTION_ERROR).hide(),e.one(this.SELECTORS.CONNECTION_OK).show(),this.savefailures=this.FIRST_SUCCESSFUL_SAVE):this.savefailures===this.FIRST_SUCCESSFUL_SAVE&&(e.one(this.SELECTORS.CONNECTION_OK).hide(),this.savefailures=0)},save_failed:function(){this.save_transaction=null,this.start_save_timer(),this.savefailures=Math.max(1,this.savefailures+1),this.savefailures===this.FAILURES_BEFORE_NOTIFY&&(e.one(this.SELECTORS.CONNECTION_ERROR).show(),e.one(this.SELECTORS.CONNECTION_OK).hide())},is_time_nearly_over:function(){return M.mod_quiz.timer&&M.mod_quiz.timer.endtime&&(new Date).getTime()+2*this.delay>M.mod_quiz.timer.endtime},stop_autosaving:function(){this.cancel_delay(),this.delay_timer=!0,this.save_transaction&&this.save_transaction.abort()}}},"@VERSION@",{requires:["base","node","event","event-valuechange","node-event-delegate","io-form"]});
+YUI.add("moodle-mod_quiz-autosave",function(e,t){M.mod_quiz=M.mod_quiz||{},M.mod_quiz.autosave={TINYMCE_DETECTION_DELAY:500,TINYMCE_DETECTION_REPEATS:20,WATCH_HIDDEN_DELAY:1e3,FAILURES_BEFORE_NOTIFY:1,FIRST_SUCCESSFUL_SAVE:-1,SELECTORS:{QUIZ_FORM:"#responseform",VALUE_CHANGE_ELEMENTS:'input, textarea, [contenteditable="true"]',CHANGE_ELEMENTS:"input, select",HIDDEN_INPUTS:"input[type=hidden]",CONNECTION_ERROR:"#connection-error",CONNECTION_OK:"#connection-ok"},AUTOSAVE_HANDLER:M.cfg.wwwroot+"/mod/quiz/autosave.ajax.php",delay:12e4,form:null,dirty:!1,delay_timer:null,save_transaction:null,savefailures:0,editor_change_handler:null,hidden_field_values:{},init:function(t){this.form=e.one(this.SELECTORS.QUIZ_FORM);if(!this.form)return;this.delay=t*1e3,this.form.delegate("valuechange",this.value_changed,this.SELECTORS.VALUE_CHANGE_ELEMENTS,this),this.form.delegate("change",this.value_changed,this.SELECTORS.CHANGE_ELEMENTS,this),this.form.on("submit",this.stop_autosaving,this),this.init_tinymce(this.TINYMCE_DETECTION_REPEATS),this.save_hidden_field_values(),this.watch_hidden_fields()},save_hidden_field_values:function(){this.form.all(this.SELECTORS.HIDDEN_INPUTS).each(function(e){var t=e.get("name");if(!t)return;this.hidden_field_values[t]=e.get("value")},this)},watch_hidden_fields:function(){this.detect_hidden_field_changes(),e.later(this.WATCH_HIDDEN_DELAY,this,this.watch_hidden_fields)},detect_hidden_field_changes:function(){this.form.all(this.SELECTORS.HIDDEN_INPUTS).each(function(e){var t=e.get("name"),n=e.get("value");if(!t)return;if(!(t in this.hidden_field_values)||n!==this.hidden_field_values[t])this.hidden_field_values[t]=n,this.value_changed({target:e})},this)},init_tinymce:function(t){if(typeof window.tinyMCE=="undefined"){t>0&&e.later(this.TINYMCE_DETECTION_DELAY,this,this.init_tinymce,[t-1]);return}this.editor_change_handler=e.bind(this.editor_changed,this),window.tinyMCE.onAddEditor.add(e.bind(this.init_tinymce_editor,this))},init_tinymce_editor:function(e,t){t.onChange.add(this.editor_change_handler),t.onRedo.add(this.editor_change_handler),t.onUndo.add(this.editor_change_handler),t.onKeyDown.add(this.editor_change_handler)},value_changed:function(e){var t=e.target.getAttribute("name");if(t==="thispage"||t==="scrollpos"||t&&t.match(/_:flagged$/))return;t=t||"#"+e.target.getAttribute("id"),this.start_save_timer_if_necessary()},editor_changed:function(e){this.start_save_timer_if_necessary()},start_save_timer_if_necessary:function(){this.dirty=!0;if(this.delay_timer||this.save_transaction)return;this.start_save_timer()},start_save_timer:function(){this.cancel_delay(),this.delay_timer=e.later(this.delay,this,this.save_changes)},cancel_delay:function(){this.delay_timer&&this.delay_timer!==!0&&this.delay_timer.cancel(),this.delay_timer=null},save_changes:function(){this.cancel_delay(),this.dirty=!1;if(this.is_time_nearly_over()){this.stop_autosaving();return}typeof window.tinyMCE!="undefined"&&window.tinyMCE.triggerSave();var t=this.form.all("input[type=submit], button[type=submit]");t.setAttribute("type","button"),this.save_transaction=e.io(this.AUTOSAVE_HANDLER,{method:"POST",form:{id:this.form},on:{success:this.save_done,failure:this.save_failed},context:this}),t.setAttribute("type","submit")},save_done:function(t,n){if(n.responseText!=="OK"){this.save_failed(t,n);return}this.save_transaction=null,this.dirty&&this.start_save_timer(),this.savefailures>0?(e.one(this.SELECTORS.CONNECTION_ERROR).hide(),e.one(this.SELECTORS.CONNECTION_OK).show(),this.savefailures=this.FIRST_SUCCESSFUL_SAVE):this.savefailures===this.FIRST_SUCCESSFUL_SAVE&&(e.one(this.SELECTORS.CONNECTION_OK).hide(),this.savefailures=0)},save_failed:function(){this.save_transaction=null,this.start_save_timer(),this.savefailures=Math.max(1,this.savefailures+1),this.savefailures===this.FAILURES_BEFORE_NOTIFY&&(e.one(this.SELECTORS.CONNECTION_ERROR).show(),e.one(this.SELECTORS.CONNECTION_OK).hide())},is_time_nearly_over:function(){return M.mod_quiz.timer&&M.mod_quiz.timer.endtime&&(new Date).getTime()+2*this.delay>M.mod_quiz.timer.endtime},stop_autosaving:function(){this.cancel_delay(),this.delay_timer=!0,this.save_transaction&&this.save_transaction.abort()}}},"@VERSION@",{requires:["base","node","event","event-valuechange","node-event-delegate","io-form"]});
diff --git a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave.js b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave.js
index cf42204e8f9da..21abfc50409c4 100644
--- a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave.js
+++ b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave.js
@@ -327,6 +327,14 @@ M.mod_quiz.autosave = {
         if (typeof window.tinyMCE !== 'undefined') {
             window.tinyMCE.triggerSave();
         }
+
+        // YUI io.form incorrectly (in my opinion) sends the value of all submit
+        // buttons in the ajax request. We don't want any submit buttons.
+        // Therefore, temporarily change the type.
+        // (Yes, this is a nasty hack. One day this will be re-written as AMD, hopefully).
+        var allsubmitbuttons = this.form.all('input[type=submit], button[type=submit]');
+        allsubmitbuttons.setAttribute('type', 'button');
+
         this.save_transaction = Y.io(this.AUTOSAVE_HANDLER, {
             method:  'POST',
             form:    {id: this.form},
@@ -336,6 +344,9 @@ M.mod_quiz.autosave = {
             },
             context: this
         });
+
+        // Change the button types back.
+        allsubmitbuttons.setAttribute('type', 'submit');
     },
 
     save_done: function(transactionid, response) {
diff --git a/mod/quiz/yui/src/autosave/js/autosave.js b/mod/quiz/yui/src/autosave/js/autosave.js
index ec4669f74d441..cce5017374b9f 100644
--- a/mod/quiz/yui/src/autosave/js/autosave.js
+++ b/mod/quiz/yui/src/autosave/js/autosave.js
@@ -333,6 +333,14 @@ M.mod_quiz.autosave = {
         if (typeof window.tinyMCE !== 'undefined') {
             window.tinyMCE.triggerSave();
         }
+
+        // YUI io.form incorrectly (in my opinion) sends the value of all submit
+        // buttons in the ajax request. We don't want any submit buttons.
+        // Therefore, temporarily change the type.
+        // (Yes, this is a nasty hack. One day this will be re-written as AMD, hopefully).
+        var allsubmitbuttons = this.form.all('input[type=submit], button[type=submit]');
+        allsubmitbuttons.setAttribute('type', 'button');
+
         this.save_transaction = Y.io(this.AUTOSAVE_HANDLER, {
             method:  'POST',
             form:    {id: this.form},
@@ -342,6 +350,9 @@ M.mod_quiz.autosave = {
             },
             context: this
         });
+
+        // Change the button types back.
+        allsubmitbuttons.setAttribute('type', 'submit');
     },
 
     save_done: function(transactionid, response) {
diff --git a/mod/resource/classes/external.php b/mod/resource/classes/external.php
index 539aaf5279aa7..35a23fce88e9d 100644
--- a/mod/resource/classes/external.php
+++ b/mod/resource/classes/external.php
@@ -156,9 +156,10 @@ public static function get_resources_by_courses($courseids = array()) {
                 $context = context_module::instance($resource->coursemodule);
                 // Entry to return.
                 $resource->name = external_format_string($resource->name, $context->id);
-
-                list($resource->intro, $resource->introformat) = external_format_text($resource->intro,
-                                                                $resource->introformat, $context->id, 'mod_resource', 'intro', null);
+                $options = array('noclean' => true);
+                list($resource->intro, $resource->introformat) =
+                    external_format_text($resource->intro, $resource->introformat, $context->id, 'mod_resource', 'intro', null,
+                        $options);
                 $resource->introfiles = external_util::get_area_files($context->id, 'mod_resource', 'intro', false, false);
                 $resource->contentfiles = external_util::get_area_files($context->id, 'mod_resource', 'content');
 
diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php
index 85b16c1ee7423..fc005c7de60c6 100644
--- a/mod/resource/db/upgrade.php
+++ b/mod/resource/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_resource_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/resource/lang/en/resource.php b/mod/resource/lang/en/resource.php
index 284ae1a704928..2448f2a6874a8 100644
--- a/mod/resource/lang/en/resource.php
+++ b/mod/resource/lang/en/resource.php
@@ -69,7 +69,7 @@
 $string['legacyfilesdone'] = 'Finished';
 $string['modifieddate'] = 'Modified {$a}';
 $string['modulename'] = 'File';
-$string['modulename_help'] = 'The file module enables a teacher to provide a file as a course resource. Where possible, the file will be displayed within the course interface; otherwise students will be prompted to download it. The file may include supporting files, for example an HTML page may have embedded images or Flash objects.
+$string['modulename_help'] = 'The file module enables a teacher to provide a file as a course resource. Where possible, the file will be displayed within the course interface; otherwise students will be prompted to download it. The file may include supporting files, for example an HTML page may have embedded images.
 
 Note that students need to have the appropriate software on their computers in order to open the file.
 
@@ -77,7 +77,7 @@
 
 * To share presentations given in class
 * To include a mini website as a course resource
-* To provide draft files of certain software programs (eg Photoshop .psd) so students can edit and submit them for assessment';
+* To provide draft files of software programs so students can edit and submit them for assessment';
 $string['modulename_link'] = 'mod/resource/view';
 $string['modulenameplural'] = 'Files';
 $string['notmigrated'] = 'This legacy resource type ({$a}) was not yet migrated, sorry.';
diff --git a/mod/scorm/classes/external.php b/mod/scorm/classes/external.php
index fa84cd67a2f29..25a99c2dc423f 100644
--- a/mod/scorm/classes/external.php
+++ b/mod/scorm/classes/external.php
@@ -691,8 +691,9 @@ public static function get_scorms_by_courses($courseids = array()) {
                 $module['coursemodule'] = $scorm->coursemodule;
                 $module['course'] = $scorm->course;
                 $module['name']  = external_format_string($scorm->name, $context->id);
+                $options = array('noclean' => true);
                 list($module['intro'], $module['introformat']) =
-                    external_format_text($scorm->intro, $scorm->introformat, $context->id, 'mod_scorm', 'intro', null);
+                    external_format_text($scorm->intro, $scorm->introformat, $context->id, 'mod_scorm', 'intro', null, $options);
                 $module['introfiles'] = external_util::get_area_files($context->id, 'mod_scorm', 'intro', false, false);
 
                 // Check if the SCORM open and return warnings if so.
@@ -859,7 +860,9 @@ public static function launch_sco_parameters() {
      * @throws moodle_exception
      */
     public static function launch_sco($scormid, $scoid = 0) {
-        global $DB;
+        global $DB, $CFG;
+
+        require_once($CFG->libdir . '/completionlib.php');
 
         $params = self::validate_parameters(self::launch_sco_parameters(),
                                             array(
@@ -882,6 +885,10 @@ public static function launch_sco($scormid, $scoid = 0) {
             throw new moodle_exception('cannotfindsco', 'scorm');
         }
 
+        // Mark module viewed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
         list($sco, $scolaunchurl) = scorm_get_sco_and_launch_url($scorm, $params['scoid'], $context);
         // Trigger the SCO launched event.
         scorm_launch_sco($scorm, $sco, $cm, $context, $scolaunchurl);
diff --git a/mod/scorm/datamodels/aicc.js b/mod/scorm/datamodels/aicc.js
index cc103bbabab3e..bf84bd05389cc 100644
--- a/mod/scorm/datamodels/aicc.js
+++ b/mod/scorm/datamodels/aicc.js
@@ -508,6 +508,7 @@ function AICCapi(def, cmiobj, scormauto, cfgwwwroot, scormid, scoid, attempt, vi
     }
 
     function StoreData(data,storetotaltime) {
+        var datastring = '';
         if (storetotaltime) {
             if (cmi.core.lesson_mode == 'normal') {
                 if (cmi.core.credit == 'credit') {
@@ -531,9 +532,13 @@ function AICCapi(def, cmiobj, scormauto, cfgwwwroot, scormid, scoid, attempt, vi
             datastring = CollectData(data,'cmi');
         }
 
-        //popupwin(datastring);
         var myRequest = NewHttpReq();
-        result = DoRequest(myRequest,datamodelurl,datamodelurlparams + datastring);
+        var result = DoRequest(myRequest, datamodelurl, datamodelurlparams + datastring);
+
+        if (result === false) {
+            return false;
+        }
+
         results = String(result).split('\n');
         errorCode = results[1];
         return results[0];
diff --git a/mod/scorm/datamodels/scorm_12.js b/mod/scorm/datamodels/scorm_12.js
index a6d035859b185..4d540ba897f50 100644
--- a/mod/scorm/datamodels/scorm_12.js
+++ b/mod/scorm/datamodels/scorm_12.js
@@ -619,6 +619,7 @@ function SCORMapi1_2(def, cmiobj, cmiint, cmistring256, cmistring4096, scormdebu
     }
 
     function StoreData(data,storetotaltime) {
+        var datastring = '';
         if (storetotaltime) {
             if (cmi.core.lesson_status == 'not attempted') {
                 cmi.core.lesson_status = 'completed';
@@ -647,7 +648,12 @@ function SCORMapi1_2(def, cmiobj, cmiint, cmistring256, cmistring4096, scormdebu
 
         var myRequest = NewHttpReq();
         //alert('going to:' + "<?php p($CFG->wwwroot) ?>/mod/scorm/datamodel.php" + "id=<?php p($id) ?>&a=<?php p($a) ?>&sesskey=<?php echo sesskey() ?>"+datastring);
-        result = DoRequest(myRequest,datamodelurl,datamodelurlparams + datastring);
+        var result = DoRequest(myRequest, datamodelurl, datamodelurlparams + datastring);
+
+        if (result === false) {
+            return false;
+        }
+
         results = String(result).split('\n');
         errorCode = results[1];
         return results[0];
diff --git a/mod/scorm/datamodels/scorm_13.js b/mod/scorm/datamodels/scorm_13.js
index ac520e9f456d9..703e410dc5371 100644
--- a/mod/scorm/datamodels/scorm_13.js
+++ b/mod/scorm/datamodels/scorm_13.js
@@ -1216,7 +1216,11 @@ function SCORMapi1_3(def, cmiobj, cmiint, cmicommentsuser, cmicommentslms, scorm
         datastring += navrequest;
 
         var myRequest = NewHttpReq();
-        result = DoRequest(myRequest, datamodelurl, datamodelurlparams + datastring);
+        var result = DoRequest(myRequest, datamodelurl, datamodelurlparams + datastring);
+
+        if (result === false) {
+            return false;
+        }
 
         var results = String(result).split('\n');
         if ((results.length > 2) && (navrequest != '')) {
diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php
index 5d2380ff5c331..f1e661e07bc0b 100644
--- a/mod/scorm/db/upgrade.php
+++ b/mod/scorm/db/upgrade.php
@@ -79,5 +79,8 @@ function xmldb_scorm_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018123100, 'scorm');
     }
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index ae9672e885eba..0c49fe3f5332d 100644
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -1709,6 +1709,14 @@ function mod_scorm_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     if (!empty($cm->customdata['timeclose']) && $cm->customdata['timeclose'] < time()) {
         // The scorm has closed so the user can no longer submit anything.
         return null;
diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index b772c935fc7d5..ad2cdf2787701 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -551,8 +551,13 @@ public function data_postprocessing($data) {
         // Convert completionstatusrequired to a proper integer, if any.
         $total = 0;
         if (isset($data->completionstatusrequired) && is_array($data->completionstatusrequired)) {
-            foreach (array_keys($data->completionstatusrequired) as $state) {
-                $total |= $state;
+            foreach ($data->completionstatusrequired as $state => $value) {
+                if ($value) {
+                    $total |= $state;
+                }
+            }
+            if (!$total) {
+                $total  = null;
             }
             $data->completionstatusrequired = $total;
         }
diff --git a/mod/scorm/module.js b/mod/scorm/module.js
index b1df94ff04980..0fd411a436112 100644
--- a/mod/scorm/module.js
+++ b/mod/scorm/module.js
@@ -460,9 +460,16 @@ M.mod_scorm.init = function(Y, nav_display, navposition_left, navposition_top, h
             if (scoes_nav[launch_sco].flow === 1) {
                 var datastring = scoes_nav[launch_sco].url + '&function=scorm_seq_flow&request=backward';
                 result = scorm_ajax_request(M.cfg.wwwroot + '/mod/scorm/datamodels/sequencinghandler.php?', datastring);
-                mod_scorm_seq = encodeURIComponent(result);
-                result = Y.JSON.parse (result);
-                if (typeof result.nextactivity.id != undefined) {
+
+                if (result === false) {
+                    // Either the outcome was a failure, or we are unloading and simply just don't know
+                    // what the outcome actually was.
+                    result = {};
+                } else {
+                    result = Y.JSON.parse(result);
+                }
+
+                if (typeof result.nextactivity !== 'undefined' && typeof result.nextactivity.id !== 'undefined') {
                         var node = scorm_prev(scorm_tree_node.getSelectedNodes()[0]);
                         if (node == null) {
                             // Avoid use of TreeView for Navigation.
@@ -492,8 +499,15 @@ M.mod_scorm.init = function(Y, nav_display, navposition_left, navposition_top, h
             if (scoes_nav[launch_sco].flow === 1) {
                 var datastring = scoes_nav[launch_sco].url + '&function=scorm_seq_flow&request=forward';
                 result = scorm_ajax_request(M.cfg.wwwroot + '/mod/scorm/datamodels/sequencinghandler.php?', datastring);
-                mod_scorm_seq = encodeURIComponent(result);
-                result = Y.JSON.parse (result);
+
+                if (result === false) {
+                    // Either the outcome was a failure, or we are unloading and simply just don't know
+                    // what the outcome actually was.
+                    result = {};
+                } else {
+                    result = Y.JSON.parse(result);
+                }
+
                 if (typeof result.nextactivity !== 'undefined' && typeof result.nextactivity.id !== 'undefined') {
                     var node = scorm_next(scorm_tree_node.getSelectedNodes()[0]);
                     if (node === null) {
diff --git a/mod/scorm/request.js b/mod/scorm/request.js
index 190fe95700304..4bea10b9c2056 100644
--- a/mod/scorm/request.js
+++ b/mod/scorm/request.js
@@ -37,6 +37,34 @@ function NewHttpReq() {
 
 function DoRequest(httpReq,url,param) {
 
+    // If we are unloading, and we can use sendBeacon then do that, Chrome does not permit synchronous XHR requests on unload.
+    if (window.mod_scorm_is_window_closing && navigator && navigator.sendBeacon && FormData) {
+        // Ok, old API alert, the param is a URI encoded string. We need to split it and convert it to a supported format.
+        // I've chosen FormData and FormData.append as they are compatible with our supported browsers:
+        //  - https://developer.mozilla.org/en-US/docs/Web/API/FormData/FormData
+        //  - https://developer.mozilla.org/en-US/docs/Web/API/FormData/append
+
+        var vars = param.split('&'),
+            i = 0,
+            pair,
+            key,
+            value,
+            formData = new FormData();
+        for (i = 0; i < vars.length; i++) {
+            pair = vars[i].split('=');
+            key = decodeURIComponent(pair[0]);
+            value = decodeURIComponent(pair[1]);
+            formData.append(key, value);
+        }
+        // We'll also inform it that we are unloading, potentially useful in the future.
+        formData.append('unloading', '1');
+
+        // The results is true or false, we don't get the response from the server. Make it look like it was a success.
+        navigator.sendBeacon(url, formData);
+        // This is what a success looks like when it comes back from the server.
+        return "true\n0";
+    }
+
     // httpReq.open (Method("get","post"), URL(string), Asyncronous(true,false))
     //popupwin(url+"\n"+param);
     httpReq.open("POST", url,false);
@@ -60,3 +88,24 @@ function popupwin(content) {
     op.document.write(content);
     op.document.close();
 }
+
+/**
+ * We wire up a small marker for the unload events triggered when the user is navigating away or closing the tab.
+ * This is done because Chrome does not allow synchronous XHR requests on the following unload events:
+ *  - beforeunload
+ *  - unload
+ *  - pagehide
+ *  - visibilitychange
+ */
+(function() {
+    // Set up a global var. Sorry about this, old code ... old ways.
+    window.mod_scorm_is_window_closing = false;
+    var toggle = function() {
+        window.mod_scorm_is_window_closing = true;
+    };
+    // Listen to the four events known to represent an unload operation.
+    window.addEventListener('beforeunload', toggle);
+    window.addEventListener('unload', toggle);
+    window.addEventListener('pagehide', toggle);
+    window.addEventListener('visibilitychange', toggle);
+})();
\ No newline at end of file
diff --git a/mod/scorm/tests/behat/behat_mod_scorm.php b/mod/scorm/tests/behat/behat_mod_scorm.php
new file mode 100644
index 0000000000000..ed7e16f182174
--- /dev/null
+++ b/mod/scorm/tests/behat/behat_mod_scorm.php
@@ -0,0 +1,54 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Steps definitions related to the SCORM activity module.
+ *
+ * @package    mod_scorm
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// NOTE: no MOODLE_INTERNAL test here, this file may be required by behat before including /config.php.
+
+require_once(__DIR__ . '/../../../../lib/behat/behat_base.php');
+
+use Behat\Behat\Hook\Scope\AfterScenarioScope;
+
+/**
+ * Steps definitions related to the SCORM activity module.
+ *
+ * @package    mod_scorm
+ * @category   test
+ * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class behat_mod_scorm extends behat_base {
+
+    /**
+     * Restart the Seleium Session after each mod_scorm Scenario.
+     *
+     * This prevents issues with the scorm player's onbeforeunload event, and cached SCORM content being served to the
+     * browser in subsequent tests.
+     *
+     * @AfterScenario @mod_scorm
+     * @param AfterScenarioScope $scope The scenario scope
+     */
+    public function reset_after_scorm(AfterScenarioScope $scope) {
+        $this->getSession()->stop();
+    }
+}
diff --git a/mod/scorm/tests/behat/save_progress_on_unload.feature b/mod/scorm/tests/behat/save_progress_on_unload.feature
new file mode 100644
index 0000000000000..66c274aeb0610
--- /dev/null
+++ b/mod/scorm/tests/behat/save_progress_on_unload.feature
@@ -0,0 +1,51 @@
+@mod @mod_scorm @_file_upload @_switch_iframe @_alert
+Feature: Confirm progress gets saved on unload events
+  In order to let students access a scorm package
+  As a teacher
+  I need to add scorm activity to a course
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
+      | student1 | Student | 1 | student1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1 | 0 |
+    And the following "course enrolments" exist:
+      | user | course | role |
+      | teacher1 | C1 | editingteacher |
+      | student1 | C1 | student |
+
+  @javascript
+  Scenario: Test progress gets saved correctly when the user navigates away from the scorm activity
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "SCORM package" to section "1"
+    And I set the following fields to these values:
+      | Name | Runtime Basic Calls SCORM 2004 3rd Edition package |
+      | Description | Description |
+    And I upload "mod/scorm/tests/packages/RuntimeBasicCalls_SCORM20043rdEdition.zip" file to "Package file" filemanager
+    And I click on "Save and display" "button"
+    And I should see "Runtime Basic Calls SCORM 2004 3rd Edition package"
+    And I log out
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Runtime Basic Calls SCORM 2004 3rd Edition package"
+    Then I should see "Normal"
+    And I press "Enter"
+    And I switch to "scorm_object" iframe
+    And I press "Next"
+    And I press "Next"
+    And I switch to "contentFrame" iframe
+    And I should see "Scoring"
+    And I switch to the main frame
+    And I follow "C1"
+    And I follow "Runtime Basic Calls SCORM 2004 3rd Edition package"
+    And I should see "Normal"
+    And I click on "Enter" "button" confirming the dialogue
+    And I switch to "scorm_object" iframe
+    And I switch to "contentFrame" iframe
+    And I should see "Scoring"
+    And I switch to the main frame
+    # Go away from the scorm to stop background requests
+    And I am on homepage
diff --git a/mod/scorm/tests/externallib_test.php b/mod/scorm/tests/externallib_test.php
index 5978297930468..b6ac0fddf758e 100644
--- a/mod/scorm/tests/externallib_test.php
+++ b/mod/scorm/tests/externallib_test.php
@@ -46,13 +46,15 @@ class mod_scorm_external_testcase extends externallib_advanced_testcase {
      * Set up for every test
      */
     public function setUp() {
-        global $DB;
+        global $DB, $CFG;
         $this->resetAfterTest();
         $this->setAdminUser();
 
+        $CFG->enablecompletion = 1;
         // Setup test data.
-        $this->course = $this->getDataGenerator()->create_course();
-        $this->scorm = $this->getDataGenerator()->create_module('scorm', array('course' => $this->course->id));
+        $this->course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $this->scorm = $this->getDataGenerator()->create_module('scorm', array('course' => $this->course->id),
+            array('completion' => 2, 'completionview' => 1));
         $this->context = context_module::instance($this->scorm->cmid);
         $this->cm = get_coursemodule_from_instance('scorm', $this->scorm->id);
 
@@ -849,8 +851,8 @@ public function test_launch_sco() {
         $result = external_api::clean_returnvalue(mod_scorm_external::launch_sco_returns(), $result);
 
         $events = $sink->get_events();
-        $this->assertCount(1, $events);
-        $event = array_shift($events);
+        $this->assertCount(3, $events);
+        $event = array_pop($events);
 
         // Checking that the event contains the expected values.
         $this->assertInstanceOf('\mod_scorm\event\sco_launched', $event);
@@ -860,6 +862,14 @@ public function test_launch_sco() {
         $this->assertEventContextNotUsed($event);
         $this->assertNotEmpty($event->get_name());
 
+        $event = array_shift($events);
+        $this->assertInstanceOf('\core\event\course_module_completion_updated', $event);
+
+        // Check completion status.
+        $completion = new completion_info($this->course);
+        $completiondata = $completion->get_data($this->cm);
+        $this->assertEquals(COMPLETION_VIEWED, $completiondata->completionstate);
+
         // Invalid SCO.
         try {
             mod_scorm_external::launch_sco($this->scorm->id, -1);
diff --git a/mod/scorm/tests/lib_test.php b/mod/scorm/tests/lib_test.php
index b41bb3f6bbae4..bc6971f34fec7 100644
--- a/mod/scorm/tests/lib_test.php
+++ b/mod/scorm/tests/lib_test.php
@@ -408,6 +408,71 @@ public function test_scorm_core_calendar_provide_event_action_no_time_specified(
         $this->assertTrue($actionevent->is_actionable());
     }
 
+    public function test_scorm_core_calendar_provide_event_action_already_completed() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $scorm = $this->getDataGenerator()->create_module('scorm', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('scorm', $scorm->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $scorm->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_scorm_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_scorm_core_calendar_provide_event_action_already_completed_for_user() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $scorm = $this->getDataGenerator()->create_module('scorm', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('scorm', $scorm->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $scorm->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_scorm_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
diff --git a/mod/survey/classes/external.php b/mod/survey/classes/external.php
index 0d53c41e18da6..8b361c14e7a09 100644
--- a/mod/survey/classes/external.php
+++ b/mod/survey/classes/external.php
@@ -104,8 +104,10 @@ public static function get_surveys_by_courses($courseids = array()) {
                     }
 
                     // Format intro.
+                    $options = array('noclean' => true);
                     list($surveydetails['intro'], $surveydetails['introformat']) =
-                        external_format_text($survey->intro, $survey->introformat, $context->id, 'mod_survey', 'intro', null);
+                        external_format_text($survey->intro, $survey->introformat, $context->id, 'mod_survey', 'intro', null,
+                            $options);
                     $surveydetails['introfiles'] = external_util::get_area_files($context->id, 'mod_survey', 'intro', false,
                                                                                     false);
 
diff --git a/mod/survey/db/upgrade.php b/mod/survey/db/upgrade.php
index 4a008999f4a28..33a81e6f8ad9d 100644
--- a/mod/survey/db/upgrade.php
+++ b/mod/survey/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_survey_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/survey/report.php b/mod/survey/report.php
index 7c147cd29e18c..a3ad94541c74d 100644
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -118,7 +118,7 @@
     $PAGE->set_title("$course->shortname: ".format_string($survey->name));
     $PAGE->set_heading($course->fullname);
     echo $OUTPUT->header();
-    echo $OUTPUT->heading($survey->name);
+    echo $OUTPUT->heading(format_string($survey->name));
 
 /// Check to see if groups are being used in this survey
     if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used
diff --git a/mod/survey/save.php b/mod/survey/save.php
index afa25b20ecd73..5ea69c97b85e6 100644
--- a/mod/survey/save.php
+++ b/mod/survey/save.php
@@ -59,7 +59,7 @@
     $PAGE->set_title($strsurveysaved);
     $PAGE->set_heading($course->fullname);
     echo $OUTPUT->header();
-    echo $OUTPUT->heading($survey->name);
+    echo $OUTPUT->heading(format_string($survey->name));
 
     if (survey_already_done($survey->id, $USER->id)) {
         notice(get_string("alreadysubmitted", "survey"), get_local_referer(false));
diff --git a/mod/survey/view.php b/mod/survey/view.php
index 884feb6c8e1f9..97a528357c650 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -69,7 +69,7 @@
 $PAGE->set_title($survey->name);
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();
-echo $OUTPUT->heading($survey->name);
+echo $OUTPUT->heading(format_string($survey->name));
 
 // Check to see if groups are being used in this survey.
 if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used.
diff --git a/mod/url/classes/external.php b/mod/url/classes/external.php
index aba5d4079ea09..458a4c8aadba5 100644
--- a/mod/url/classes/external.php
+++ b/mod/url/classes/external.php
@@ -157,8 +157,9 @@ public static function get_urls_by_courses($courseids = array()) {
                 // Entry to return.
                 $url->name = external_format_string($url->name, $context->id);
 
-                list($url->intro, $url->introformat) = external_format_text($url->intro,
-                                                                $url->introformat, $context->id, 'mod_url', 'intro', null);
+                $options = array('noclean' => true);
+                list($url->intro, $url->introformat) =
+                    external_format_text($url->intro, $url->introformat, $context->id, 'mod_url', 'intro', null, $options);
                 $url->introfiles = external_util::get_area_files($context->id, 'mod_url', 'intro', false, false);
 
                 $returnedurls[] = $url;
diff --git a/mod/url/db/upgrade.php b/mod/url/db/upgrade.php
index 3065e640010c3..5543f205aba5d 100644
--- a/mod/url/db/upgrade.php
+++ b/mod/url/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_url_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/url/lib.php b/mod/url/lib.php
index 2229bd0cba3d3..23d11a0f4a795 100644
--- a/mod/url/lib.php
+++ b/mod/url/lib.php
@@ -212,7 +212,7 @@ function url_get_coursemodule_info($coursemodule) {
     require_once("$CFG->dirroot/mod/url/locallib.php");
 
     if (!$url = $DB->get_record('url', array('id'=>$coursemodule->instance),
-            'id, name, course, display, displayoptions, externalurl, parameters, intro, introformat')) {
+            'id, name, display, displayoptions, externalurl, parameters, intro, introformat')) {
         return NULL;
     }
 
@@ -243,9 +243,6 @@ function url_get_coursemodule_info($coursemodule) {
         $info->content = format_module_intro('url', $url, $coursemodule->id, false);
     }
 
-    $course = get_course($url->course); // Get cached course.
-    $info->customdata = array('fullurl' => str_replace('&amp;', '&', url_get_full_url($url, $coursemodule, $course)));
-
     return $info;
 }
 
diff --git a/mod/url/locallib.php b/mod/url/locallib.php
index 7d9bba291cf8f..128db0207492a 100644
--- a/mod/url/locallib.php
+++ b/mod/url/locallib.php
@@ -460,18 +460,18 @@ function url_get_variable_values($url, $cm, $course, $config) {
 
     $values = array (
         'courseid'        => $course->id,
-        'coursefullname'  => format_string($course->fullname),
+        'coursefullname'  => format_string($course->fullname, true, array('context' => $coursecontext)),
         'courseshortname' => format_string($course->shortname, true, array('context' => $coursecontext)),
         'courseidnumber'  => $course->idnumber,
         'coursesummary'   => $course->summary,
         'courseformat'    => $course->format,
         'lang'            => current_language(),
-        'sitename'        => format_string($site->fullname),
+        'sitename'        => format_string($site->fullname, true, array('context' => $coursecontext)),
         'serverurl'       => $CFG->wwwroot,
         'currenttime'     => time(),
         'urlinstance'     => $url->id,
         'urlcmid'         => $cm->id,
-        'urlname'         => format_string($url->name),
+        'urlname'         => format_string($url->name, true, array('context' => $coursecontext)),
         'urlidnumber'     => $cm->idnumber,
     );
 
diff --git a/mod/wiki/classes/external.php b/mod/wiki/classes/external.php
index 34a91c3240a51..4a1475595177b 100644
--- a/mod/wiki/classes/external.php
+++ b/mod/wiki/classes/external.php
@@ -102,8 +102,9 @@ public static function get_wikis_by_courses($courseids = array()) {
 
                 $viewablefields = [];
                 if (has_capability('mod/wiki:viewpage', $context)) {
+                    $options = array('noclean' => true);
                     list($module['intro'], $module['introformat']) =
-                        external_format_text($wiki->intro, $wiki->introformat, $context->id, 'mod_wiki', 'intro', null);
+                        external_format_text($wiki->intro, $wiki->introformat, $context->id, 'mod_wiki', 'intro', null, $options);
                     $module['introfiles'] = external_util::get_area_files($context->id, 'mod_wiki', 'intro', false, false);
 
                     $viewablefields = array('firstpagetitle', 'wikimode', 'defaultformat', 'forceformat', 'editbegin', 'editend',
diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index 5b179a96d3ff0..ad21e702fd847 100644
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_wiki_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/classes/external/workshop_summary_exporter.php b/mod/workshop/classes/external/workshop_summary_exporter.php
index d7a833280cd43..45edd78d9625e 100644
--- a/mod/workshop/classes/external/workshop_summary_exporter.php
+++ b/mod/workshop/classes/external/workshop_summary_exporter.php
@@ -325,6 +325,7 @@ protected function get_format_parameters_for_intro() {
         return [
             'component' => 'mod_workshop',
             'filearea' => 'intro',
+            'options' => array('noclean' => true),
         ];
     }
 
diff --git a/mod/workshop/classes/task/cron_task.php b/mod/workshop/classes/task/cron_task.php
index cf64925926d42..892c658bbd178 100644
--- a/mod/workshop/classes/task/cron_task.php
+++ b/mod/workshop/classes/task/cron_task.php
@@ -65,7 +65,7 @@ public function execute() {
                 $cm = get_coursemodule_from_instance('workshop', $workshop->id, $workshop->course, false, MUST_EXIST);
                 $course = $DB->get_record('course', ['id' => $cm->course], '*', MUST_EXIST);
                 $workshop = new \workshop($workshop, $cm, $course);
-                $workshop->switch_phase(workshop::PHASE_ASSESSMENT);
+                $workshop->switch_phase(\workshop::PHASE_ASSESSMENT);
 
                 $params = [
                     'objectid' => $workshop->id,
diff --git a/mod/workshop/db/upgrade.php b/mod/workshop/db/upgrade.php
index 9acd30f4053b2..fe16f0faeb4bb 100644
--- a/mod/workshop/db/upgrade.php
+++ b/mod/workshop/db/upgrade.php
@@ -109,5 +109,8 @@ function xmldb_workshop_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/accumulative/db/upgrade.php b/mod/workshop/form/accumulative/db/upgrade.php
index c5cb7bb941390..c2f52d5c774c5 100644
--- a/mod/workshop/form/accumulative/db/upgrade.php
+++ b/mod/workshop/form/accumulative/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/comments/db/upgrade.php b/mod/workshop/form/comments/db/upgrade.php
index 79b166b2f09fb..eacb0e9c9a806 100644
--- a/mod/workshop/form/comments/db/upgrade.php
+++ b/mod/workshop/form/comments/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/numerrors/db/upgrade.php b/mod/workshop/form/numerrors/db/upgrade.php
index 9d53ee94518e4..5eade3ab416dd 100644
--- a/mod/workshop/form/numerrors/db/upgrade.php
+++ b/mod/workshop/form/numerrors/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/rubric/db/upgrade.php b/mod/workshop/form/rubric/db/upgrade.php
index d40d5e58e5075..0984cb7caad57 100644
--- a/mod/workshop/form/rubric/db/upgrade.php
+++ b/mod/workshop/form/rubric/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/lang/en/workshop.php b/mod/workshop/lang/en/workshop.php
index 1db7f8d1ffec9..898f6bc36e9f0 100644
--- a/mod/workshop/lang/en/workshop.php
+++ b/mod/workshop/lang/en/workshop.php
@@ -93,7 +93,7 @@
 $string['configgradinggrade'] = 'Default maximum grade for assessment in workshops';
 $string['configmaxbytes'] = 'Default maximum submission file size for all workshops on the site (subject to course limits and other local settings)';
 $string['configstrategy'] = 'Default grading strategy for workshops';
-$string['createsubmission'] = 'Start preparing your submission';
+$string['createsubmission'] = 'Add submission';
 $string['crontask'] = 'Background processing for workshop module';
 $string['daysago'] = '{$a} days ago';
 $string['daysleft'] = '{$a} days left';
diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index e6da52610e228..866a3d15de326 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1807,6 +1807,14 @@ function mod_workshop_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
+    $completion = new \completion_info($cm->get_course());
+
+    $completiondata = $completion->get_data($cm, false, $userid);
+
+    if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
+        return null;
+    }
+
     return $factory->create_instance(
         get_string('viewworkshopsummary', 'workshop'),
         new \moodle_url('/mod/workshop/view.php', array('id' => $cm->id)),
diff --git a/mod/workshop/tests/behat/file_type_restriction.feature b/mod/workshop/tests/behat/file_type_restriction.feature
index 5ceedd9c22bae..9a985a7524bc8 100644
--- a/mod/workshop/tests/behat/file_type_restriction.feature
+++ b/mod/workshop/tests/behat/file_type_restriction.feature
@@ -38,7 +38,7 @@ Feature: File types of the submission and feedback attachments can be limitted
     And I log in as "student1"
     And I am on "Course1" course homepage
     And I follow "TestWorkshop"
-    And I press "Start preparing your submission"
+    And I press "Add submission"
     And I set the following fields to these values:
       | Title              | Submission1           |
       | Submission content | See the attached file |
diff --git a/mod/workshop/tests/behat/submission_types.feature b/mod/workshop/tests/behat/submission_types.feature
index d5970f1383e26..36280231a662b 100644
--- a/mod/workshop/tests/behat/submission_types.feature
+++ b/mod/workshop/tests/behat/submission_types.feature
@@ -73,7 +73,7 @@ Feature: Submission types
     And I follow "All required"
     And I follow "Switch to the submission phase"
     And I press "Continue"
-    And I press "Start preparing your submission"
+    And I press "Add submission"
     And I set the field "Title" to "Test submission"
     When I press "Save changes"
     Then I should see "You must supply a value here." in the "Submission content" "form_row"
@@ -95,7 +95,7 @@ Feature: Submission types
     And I follow "Optional file"
     And I follow "Switch to the submission phase"
     And I press "Continue"
-    And I press "Start preparing your submission"
+    And I press "Add submission"
     And I set the field "Title" to "Test submission"
     When I press "Save changes"
     Then I should see "You must supply a value here." in the "Submission content" "form_row"
@@ -115,7 +115,7 @@ Feature: Submission types
     And I follow "Optional text"
     And I follow "Switch to the submission phase"
     And I press "Continue"
-    And I press "Start preparing your submission"
+    And I press "Add submission"
     And I set the field "Title" to "Test submission"
     When I press "Save changes"
     Then I should see "You must supply a value here." in the "Attachment" "form_row"
@@ -134,7 +134,7 @@ Feature: Submission types
     And I follow "Only text"
     And I follow "Switch to the submission phase"
     And I press "Continue"
-    When I press "Start preparing your submission"
+    When I press "Add submission"
     Then "Attachment" "field" should not exist
     And I set the field "Title" to "Test submission"
     And I press "Save changes"
@@ -155,7 +155,7 @@ Feature: Submission types
     And I follow "Only file"
     And I follow "Switch to the submission phase"
     And I press "Continue"
-    When I press "Start preparing your submission"
+    When I press "Add submission"
     Then "Submission content" "field" should not exist
     And I set the field "Title" to "Test submission"
     And I press "Save changes"
@@ -177,7 +177,7 @@ Feature: Submission types
     And I follow "Neither required"
     And I follow "Switch to the submission phase"
     And I press "Continue"
-    And I press "Start preparing your submission"
+    And I press "Add submission"
     And I set the field "Title" to "Test submission"
     When I press "Save changes"
     Then I should see "You need to add a file or enter some text." in the "Attachment" "form_row"
diff --git a/mod/workshop/tests/cron_task_test.php b/mod/workshop/tests/cron_task_test.php
new file mode 100644
index 0000000000000..7a3971846c4cd
--- /dev/null
+++ b/mod/workshop/tests/cron_task_test.php
@@ -0,0 +1,76 @@
+<?php
+// This file is part of Moodle - https://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Provides the {@link mod_workshop_cron_task_testcase} class.
+ *
+ * @package     mod_workshop
+ * @category    test
+ * @copyright   2019 David Mudrák <david@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+
+require_once($CFG->dirroot.'/mod/workshop/lib.php');
+
+/**
+ * Test the functionality provided by  the {@link mod_workshop\task\cron_task} scheduled task.
+ *
+ * @copyright 2019 David Mudrák <david@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mod_workshop_cron_task_testcase extends advanced_testcase {
+
+    /**
+     * Test that the phase is automatically switched after the submissions deadline.
+     */
+    public function test_phase_switching() {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Set up a test workshop with 'Switch to the next phase after the submissions deadline' enabled.
+        $generator = $this->getDataGenerator();
+        $course = $generator->create_course();
+        $workshop = $generator->create_module('workshop', [
+            'course' => $course,
+            'name' => 'Test Workshop',
+        ]);
+
+        $DB->update_record('workshop', [
+            'id' => $workshop->id,
+            'phase' => workshop::PHASE_SUBMISSION,
+            'phaseswitchassessment' => 1,
+            'submissionend' => time() - 1,
+        ]);
+
+        // Execute the cron.
+        ob_start();
+        cron_setup_user();
+        $cron = new \mod_workshop\task\cron_task();
+        $cron->execute();
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        // Assert that the phase has been switched.
+        $this->assertContains('Processing automatic assessment phase switch', $output);
+        $this->assertEquals(workshop::PHASE_ASSESSMENT, $DB->get_field('workshop', 'phase', ['id' => $workshop->id]));
+    }
+}
diff --git a/mod/workshop/tests/lib_test.php b/mod/workshop/tests/lib_test.php
index dd4b425a02681..e06b16f9ebad9 100644
--- a/mod/workshop/tests/lib_test.php
+++ b/mod/workshop/tests/lib_test.php
@@ -309,6 +309,71 @@ public function test_workshop_core_calendar_provide_event_action_no_time_specifi
         $this->assertNull($actionevent);
     }
 
+    public function test_workshop_core_calendar_provide_event_action_already_completed() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $workshop = $this->getDataGenerator()->create_module('workshop', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('workshop', $workshop->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $workshop->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event.
+        $actionevent = mod_workshop_core_calendar_provide_event_action($event, $factory);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
+    public function test_workshop_core_calendar_provide_event_action_already_completed_for_user() {
+        $this->resetAfterTest();
+        set_config('enablecompletion', 1);
+        $this->setAdminUser();
+
+        // Create the activity.
+        $course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
+        $workshop = $this->getDataGenerator()->create_module('workshop', array('course' => $course->id),
+            array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
+
+        // Enrol a student in the course.
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+
+        // Get some additional data.
+        $cm = get_coursemodule_from_instance('workshop', $workshop->id);
+
+        // Create a calendar event.
+        $event = $this->create_action_event($course->id, $workshop->id,
+            \core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
+
+        // Mark the activity as completed for the student.
+        $completion = new completion_info($course);
+        $completion->set_module_viewed($cm, $student->id);
+
+        // Create an action factory.
+        $factory = new \core_calendar\action_factory();
+
+        // Decorate action event for the student.
+        $actionevent = mod_workshop_core_calendar_provide_event_action($event, $factory, $student->id);
+
+        // Ensure result was null.
+        $this->assertNull($actionevent);
+    }
+
     /**
      * Creates an action event.
      *
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c48859308695d..52c3c9cb9c551 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2804,38 +2804,36 @@
       "dev": true
     },
     "jshint": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-0.9.1.tgz",
-      "integrity": "sha1-/zLsfwn4QAH3SY7q/WPJ5Puy3A4=",
-      "dev": true,
-      "requires": {
-        "cli": "0.4.3",
-        "minimatch": "0.0.x"
+      "version": "2.10.2",
+      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz",
+      "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==",
+      "dev": true,
+      "requires": {
+        "cli": "~1.0.0",
+        "console-browserify": "1.1.x",
+        "exit": "0.1.x",
+        "htmlparser2": "3.8.x",
+        "lodash": "~4.17.11",
+        "minimatch": "~3.0.2",
+        "shelljs": "0.3.x",
+        "strip-json-comments": "1.0.x"
       },
       "dependencies": {
         "cli": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/cli/-/cli-0.4.3.tgz",
-          "integrity": "sha1-5oGcjV+qlX9k+Y9mqFBiaMHR8X0=",
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
+          "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=",
           "dev": true,
           "requires": {
-            "glob": ">= 3.1.4"
+            "exit": "0.1.2",
+            "glob": "^7.1.1"
           }
         },
-        "lru-cache": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz",
-          "integrity": "sha1-qlD5cEdCKsclQ72hd6nJ0BjZhFI=",
+        "strip-json-comments": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
           "dev": true
-        },
-        "minimatch": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz",
-          "integrity": "sha1-lrtJC707poNrv6wRGt91MBsVhN4=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "~1.0.2"
-          }
         }
       }
     },
@@ -4396,6 +4394,40 @@
         "yuitest-coverage": ">=0.0.5"
       },
       "dependencies": {
+        "cli": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/cli/-/cli-0.4.3.tgz",
+          "integrity": "sha1-5oGcjV+qlX9k+Y9mqFBiaMHR8X0=",
+          "dev": true,
+          "requires": {
+            "glob": ">= 3.1.4"
+          }
+        },
+        "jshint": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/jshint/-/jshint-0.9.1.tgz",
+          "integrity": "sha1-/zLsfwn4QAH3SY7q/WPJ5Puy3A4=",
+          "dev": true,
+          "requires": {
+            "cli": "0.4.3",
+            "minimatch": "0.0.x"
+          }
+        },
+        "lru-cache": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz",
+          "integrity": "sha1-qlD5cEdCKsclQ72hd6nJ0BjZhFI=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz",
+          "integrity": "sha1-lrtJC707poNrv6wRGt91MBsVhN4=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "~1.0.2"
+          }
+        },
         "progress": {
           "version": "0.1.0",
           "resolved": "https://registry.npmjs.org/progress/-/progress-0.1.0.tgz",
diff --git a/package.json b/package.json
index 102c8b9332786..7ec3197411f42 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "grunt-eslint": "20.1.0",
     "grunt-sass": "2.1.0",
     "grunt-stylelint": "0.6.0",
+    "jshint": "^2.10.2",
     "semver": "5.3.0",
     "shifter": "0.5.0",
     "stylelint": "8.0.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2361ad6162973..1ba7628d72b62 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,6 @@
         processIsolation="false"
         backupGlobals="false"
         backupStaticAttributes="false"
-        forceCoversAnnotation="true"
         stopOnError="false"
         stopOnFailure="false"
         stopOnIncomplete="false"
@@ -68,7 +67,7 @@
         <testsuite name="core_cohort_testsuite">
             <directory suffix="_test.php">cohort/tests</directory>
         </testsuite>
-        <testsuite name="core_grade_testsuite">
+        <testsuite name="core_grades_testsuite">
             <directory suffix="_test.php">lib/grade/tests</directory>
             <directory suffix="_test.php">grade/tests</directory>
             <directory suffix="_test.php">grade/grading/tests</directory>
diff --git a/pix/s/angry.svg b/pix/s/angry.svg
index 796a2033548d5..2beafa938f89a 100644
--- a/pix/s/angry.svg
+++ b/pix/s/angry.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_25);}.cls-2,.cls-3{fill:#fff;}.cls-2{stroke-width:13px;}.cls-3{stroke-width:15px;}</style><linearGradient id="Unbenannter_Verlauf_25" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffa9a9"/><stop offset="0.49" stop-color="#ff8787"/><stop offset="1" stop-color="#ff6767"/></linearGradient></defs><title>angry</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M166.5,189.5c-3-30-8.1-50.46-30.08-52.65-93.92-9.35-57,35-57,35,3,0,1.62-8.63,58,5C152.5,180.5,167.2,196.54,166.5,189.5Z" transform="translate(-0.25 -2)"/><ellipse class="cls-3" cx="87.67" cy="77.5" rx="33.92" ry="27.5"/><circle class="cls-4" cx="91.13" cy="91.46" r="8.25"/><ellipse class="cls-3" cx="157.67" cy="77.5" rx="33.92" ry="27.5"/><circle class="cls-4" cx="161.13" cy="91.46" r="8.25"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_25);}.cls-2,.cls-3{fill:#fff;}.cls-2{stroke-width:13px;}.cls-3{stroke-width:15px;}</style><linearGradient id="Unbenannter_Verlauf_25" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffa9a9"/><stop offset="0.49" stop-color="#ff8787"/><stop offset="1" stop-color="#ff6767"/></linearGradient></defs><title>angry</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M166.5,189.5c-3-30-8.1-50.46-30.08-52.65-93.92-9.35-57,35-57,35,3,0,1.62-8.63,58,5C152.5,180.5,167.2,196.54,166.5,189.5Z" transform="translate(-0.25 -2)"/><ellipse class="cls-3" cx="87.67" cy="77.5" rx="33.92" ry="27.5"/><circle class="cls-4" cx="91.13" cy="91.46" r="8.25"/><ellipse class="cls-3" cx="157.67" cy="77.5" rx="33.92" ry="27.5"/><circle class="cls-4" cx="161.13" cy="91.46" r="8.25"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/approve.svg b/pix/s/approve.svg
index 9d2b2cdf345ab..10babba60bc14 100644
--- a/pix/s/approve.svg
+++ b/pix/s/approve.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:none;stroke-width:13px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>approve</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M39,97c4.28,32.47,48.25,37,81,37s76.72-4.53,81-37" transform="translate(-0.25)"/><circle class="cls-3" cx="81.75" cy="65" r="16"/><circle class="cls-3" cx="161.75" cy="65" r="16"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:none;stroke-width:13px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>approve</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M39,97c4.28,32.47,48.25,37,81,37s76.72-4.53,81-37" transform="translate(-0.25)"/><circle class="cls-3" cx="81.75" cy="65" r="16"/><circle class="cls-3" cx="161.75" cy="65" r="16"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/biggrin.svg b/pix/s/biggrin.svg
index 8039f807e1e47..da3a9974ace7d 100644
--- a/pix/s/biggrin.svg
+++ b/pix/s/biggrin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:none;}.cls-2,.cls-3{stroke-width:13px;}.cls-3{fill:#fff;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>biggrin</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M55.5,79.5c.28-13.06,11-24.72,24-25s25,13,25,25" transform="translate(-0.25)"/><path class="cls-2" d="M184.5,79.5c-.28-13.06-10.95-24.72-24-25s-25,13-25,25" transform="translate(-0.25)"/><path class="cls-3" d="M39.5,102.5s-1,97,80,97c80,0,81-97,81-97-3,0-22,33-80,33C66.5,135.5,40.5,102.5,39.5,102.5Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:none;}.cls-2,.cls-3{stroke-width:13px;}.cls-3{fill:#fff;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>biggrin</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M55.5,79.5c.28-13.06,11-24.72,24-25s25,13,25,25" transform="translate(-0.25)"/><path class="cls-2" d="M184.5,79.5c-.28-13.06-10.95-24.72-24-25s-25,13-25,25" transform="translate(-0.25)"/><path class="cls-3" d="M39.5,102.5s-1,97,80,97c80,0,81-97,81-97-3,0-22,33-80,33C66.5,135.5,40.5,102.5,39.5,102.5Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/blackeye.svg b/pix/s/blackeye.svg
index 1054fe3bbd73e..4020d5b077785 100644
--- a/pix/s/blackeye.svg
+++ b/pix/s/blackeye.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{fill:none;stroke-width:16px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>blackeye</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="80.75" cy="96" r="16"/><ellipse class="cls-2" cx="160.25" cy="104" rx="32" ry="39.5"/><line class="cls-3" x1="79.25" y1="183.5" x2="160.25" y2="183.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{fill:none;stroke-width:16px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>blackeye</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="80.75" cy="96" r="16"/><ellipse class="cls-2" cx="160.25" cy="104" rx="32" ry="39.5"/><line class="cls-3" x1="79.25" y1="183.5" x2="160.25" y2="183.5"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/blush.svg b/pix/s/blush.svg
index bb025f4abb4de..563dcb8d4a864 100644
--- a/pix/s/blush.svg
+++ b/pix/s/blush.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-5{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_13);}.cls-3{fill:url(#Unbenannter_Verlauf_26);}.cls-4{fill:url(#Unbenannter_Verlauf_26-2);}.cls-5{fill:none;stroke-width:13px;}</style><linearGradient id="Unbenannter_Verlauf_13" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffcece"/><stop offset="0.47" stop-color="#ffcece" stop-opacity="0.99"/><stop offset="0.65" stop-color="#ffcece" stop-opacity="0.97"/><stop offset="0.77" stop-color="#ffcece" stop-opacity="0.92"/><stop offset="0.87" stop-color="#ffcece" stop-opacity="0.85"/><stop offset="0.95" stop-color="#ffcece" stop-opacity="0.77"/><stop offset="1" stop-color="#ffcece" stop-opacity="0.7"/></linearGradient><radialGradient id="Unbenannter_Verlauf_26" cx="91.29" cy="131.28" r="18.11" gradientTransform="translate(-165.8 -168.13) scale(2.41 2.25)" gradientUnits="userSpaceOnUse"><stop offset="0.19" stop-color="#ff2f15"/><stop offset="0.27" stop-color="#ff331a" stop-opacity="0.98"/><stop offset="0.37" stop-color="#ff3f27" stop-opacity="0.92"/><stop offset="0.48" stop-color="#ff523d" stop-opacity="0.83"/><stop offset="0.6" stop-color="#ff6e5b" stop-opacity="0.7"/><stop offset="0.71" stop-color="#ff9183" stop-opacity="0.53"/><stop offset="0.84" stop-color="#ffbcb3" stop-opacity="0.32"/><stop offset="0.96" stop-color="#ffedeb" stop-opacity="0.08"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></radialGradient><radialGradient id="Unbenannter_Verlauf_26-2" cx="146.15" cy="130.83" r="18.11" xlink:href="#Unbenannter_Verlauf_26"/></defs><title>blush</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.25" cy="64.5" r="16"/><circle class="cls-2" cx="79.25" cy="64.5" r="16"/><ellipse class="cls-3" cx="53.88" cy="127.25" rx="43.58" ry="40.75"/><ellipse class="cls-4" cx="185.88" cy="126.25" rx="43.58" ry="40.75"/><path class="cls-5" d="M159,186c-13.54,5-60.44,8.74-76-28" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-5{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_13);}.cls-3{fill:url(#Unbenannter_Verlauf_26);}.cls-4{fill:url(#Unbenannter_Verlauf_26-2);}.cls-5{fill:none;stroke-width:13px;}</style><linearGradient id="Unbenannter_Verlauf_13" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffcece"/><stop offset="0.47" stop-color="#ffcece" stop-opacity="0.99"/><stop offset="0.65" stop-color="#ffcece" stop-opacity="0.97"/><stop offset="0.77" stop-color="#ffcece" stop-opacity="0.92"/><stop offset="0.87" stop-color="#ffcece" stop-opacity="0.85"/><stop offset="0.95" stop-color="#ffcece" stop-opacity="0.77"/><stop offset="1" stop-color="#ffcece" stop-opacity="0.7"/></linearGradient><radialGradient id="Unbenannter_Verlauf_26" cx="91.29" cy="131.28" r="18.11" gradientTransform="translate(-165.8 -168.13) scale(2.41 2.25)" gradientUnits="userSpaceOnUse"><stop offset="0.19" stop-color="#ff2f15"/><stop offset="0.27" stop-color="#ff331a" stop-opacity="0.98"/><stop offset="0.37" stop-color="#ff3f27" stop-opacity="0.92"/><stop offset="0.48" stop-color="#ff523d" stop-opacity="0.83"/><stop offset="0.6" stop-color="#ff6e5b" stop-opacity="0.7"/><stop offset="0.71" stop-color="#ff9183" stop-opacity="0.53"/><stop offset="0.84" stop-color="#ffbcb3" stop-opacity="0.32"/><stop offset="0.96" stop-color="#ffedeb" stop-opacity="0.08"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></radialGradient><radialGradient id="Unbenannter_Verlauf_26-2" cx="146.15" cy="130.83" r="18.11" xlink:href="#Unbenannter_Verlauf_26"/></defs><title>blush</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.25" cy="64.5" r="16"/><circle class="cls-2" cx="79.25" cy="64.5" r="16"/><ellipse class="cls-3" cx="53.88" cy="127.25" rx="43.58" ry="40.75"/><ellipse class="cls-4" cx="185.88" cy="126.25" rx="43.58" ry="40.75"/><path class="cls-5" d="M159,186c-13.54,5-60.44,8.74-76-28" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/clown.svg b/pix/s/clown.svg
index 4c55d51303a0d..62089a9eedf79 100644
--- a/pix/s/clown.svg
+++ b/pix/s/clown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:#ebebeb;stroke-width:7px;}.cls-1,.cls-4,.cls-5{stroke:#000;}.cls-1,.cls-2,.cls-3,.cls-4,.cls-5{stroke-miterlimit:10;}.cls-2{fill:#e20000;}.cls-2,.cls-3{stroke:#e20000;}.cls-2,.cls-3,.cls-4{stroke-width:13px;}.cls-3{fill:#fff;}.cls-4{fill:none;}.cls-6{fill:url(#Unbenannter_Verlauf_17);}</style><radialGradient id="Unbenannter_Verlauf_17" cx="118.67" cy="132.03" r="19.3" gradientTransform="translate(-165.8 -168.13) scale(2.41 2.25)" gradientUnits="userSpaceOnUse"><stop offset="0.51" stop-color="#ff2f15"/><stop offset="0.58" stop-color="#ff3218"/><stop offset="0.65" stop-color="#ff3c23"/><stop offset="0.71" stop-color="#ff4c35"/><stop offset="0.77" stop-color="#ff624f"/><stop offset="0.83" stop-color="#ff7f6f"/><stop offset="0.89" stop-color="#ffa397"/><stop offset="0.94" stop-color="#ffcdc7"/><stop offset="1" stop-color="#fffdfc"/><stop offset="1" stop-color="#fff"/></radialGradient></defs><title>clown</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M151,44.7c-1,.81-7.5,48.36,13.5,51.8,17.84,2.93,50.53-6.88,50-8s-28.79-24.4-44-32C160.5,51.5,152,43.93,151,44.7Z" transform="translate(-0.25)"/><path class="cls-2" d="M89.77,45.7c1,.81,7.5,48.36-13.5,51.8-17.83,2.93-50.52-6.88-50-8s28.8-24.4,44-32C80.27,52.5,88.83,44.93,89.77,45.7Z" transform="translate(-0.25)"/><path class="cls-3" d="M50.5,138.5s-12,61,69,61c80,0,66-59,66-59-3,0-28,37-68,37C79.17,177.5,51.5,138.5,50.5,138.5Z" transform="translate(-0.25)"/><path class="cls-4" d="M54,146c4.28,24.93,31.25,43.19,64,43,33.42-.19,59.93-18.13,64-43" transform="translate(-0.25)"/><circle class="cls-5" cx="80.75" cy="81" r="16"/><ellipse class="cls-6" cx="119.75" cy="128.94" rx="46.45" ry="43.44"/><circle class="cls-5" cx="159.75" cy="80" r="16"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:#ebebeb;stroke-width:7px;}.cls-1,.cls-4,.cls-5{stroke:#000;}.cls-1,.cls-2,.cls-3,.cls-4,.cls-5{stroke-miterlimit:10;}.cls-2{fill:#e20000;}.cls-2,.cls-3{stroke:#e20000;}.cls-2,.cls-3,.cls-4{stroke-width:13px;}.cls-3{fill:#fff;}.cls-4{fill:none;}.cls-6{fill:url(#Unbenannter_Verlauf_17);}</style><radialGradient id="Unbenannter_Verlauf_17" cx="118.67" cy="132.03" r="19.3" gradientTransform="translate(-165.8 -168.13) scale(2.41 2.25)" gradientUnits="userSpaceOnUse"><stop offset="0.51" stop-color="#ff2f15"/><stop offset="0.58" stop-color="#ff3218"/><stop offset="0.65" stop-color="#ff3c23"/><stop offset="0.71" stop-color="#ff4c35"/><stop offset="0.77" stop-color="#ff624f"/><stop offset="0.83" stop-color="#ff7f6f"/><stop offset="0.89" stop-color="#ffa397"/><stop offset="0.94" stop-color="#ffcdc7"/><stop offset="1" stop-color="#fffdfc"/><stop offset="1" stop-color="#fff"/></radialGradient></defs><title>clown</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M151,44.7c-1,.81-7.5,48.36,13.5,51.8,17.84,2.93,50.53-6.88,50-8s-28.79-24.4-44-32C160.5,51.5,152,43.93,151,44.7Z" transform="translate(-0.25)"/><path class="cls-2" d="M89.77,45.7c1,.81,7.5,48.36-13.5,51.8-17.83,2.93-50.52-6.88-50-8s28.8-24.4,44-32C80.27,52.5,88.83,44.93,89.77,45.7Z" transform="translate(-0.25)"/><path class="cls-3" d="M50.5,138.5s-12,61,69,61c80,0,66-59,66-59-3,0-28,37-68,37C79.17,177.5,51.5,138.5,50.5,138.5Z" transform="translate(-0.25)"/><path class="cls-4" d="M54,146c4.28,24.93,31.25,43.19,64,43,33.42-.19,59.93-18.13,64-43" transform="translate(-0.25)"/><circle class="cls-5" cx="80.75" cy="81" r="16"/><ellipse class="cls-6" cx="119.75" cy="128.94" rx="46.45" ry="43.44"/><circle class="cls-5" cx="159.75" cy="80" r="16"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/cool.svg b/pix/s/cool.svg
index 41c3470843e9a..d9f70ed352050 100644
--- a/pix/s/cool.svg
+++ b/pix/s/cool.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" preserveAspectRatio="xMinYMid meet"><style>.st3,.st6{stroke:#000;stroke-miterlimit:10}.st6{fill:none;stroke-width:14}</style><g id="Ebene_3"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="37.791" y1="37.666" x2="202.459" y2="202.334"><stop offset="0" stop-color="#ffe600"/><stop offset=".413" stop-color="#fde401" stop-opacity=".876"/><stop offset=".562" stop-color="#f6df06" stop-opacity=".832"/><stop offset=".668" stop-color="#ebd50e" stop-opacity=".8"/><stop offset=".753" stop-color="#dac719" stop-opacity=".774"/><stop offset=".827" stop-color="#c4b428" stop-opacity=".752"/><stop offset=".892" stop-color="#a89e3a" stop-opacity=".733"/><stop offset=".949" stop-color="#89834f" stop-opacity=".715"/><stop offset="1" stop-color="#666" stop-opacity=".7"/></linearGradient><ellipse cx="120.1" cy="120" rx="116.4" ry="116.5" fill="url(#SVGID_1_)" stroke="#000" stroke-width="7" stroke-miterlimit="10"/><path d="M69.5 148.5s-4 51 50 51c48 0 57-50 57-50-3 0 2 15-56 15-54 0-50-16-51-16z" fill="#fff" stroke="#000" stroke-width="9" stroke-miterlimit="10"/><circle class="st3" cx="163.2" cy="94.3" r="34.4"/><path d="M62 100c-1-.8 5-20.6 26-24 17.8-2.9 21.5 13.9 21 15-.5 1-4.2-6.8-21-4-20.4 3.4-25.1 13.8-26 13z" stroke="#000" stroke-width="5" stroke-miterlimit="10"/><circle class="st3" cx="76.3" cy="94.3" r="34.4"/><path class="st6" d="M108 90h25M187 90h45M8 88h51"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><style>.st3,.st6{stroke:#000;stroke-miterlimit:10}.st6{fill:none;stroke-width:14}</style><g id="Ebene_3"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="37.791" y1="37.666" x2="202.459" y2="202.334"><stop offset="0" stop-color="#ffe600"/><stop offset=".413" stop-color="#fde401" stop-opacity=".876"/><stop offset=".562" stop-color="#f6df06" stop-opacity=".832"/><stop offset=".668" stop-color="#ebd50e" stop-opacity=".8"/><stop offset=".753" stop-color="#dac719" stop-opacity=".774"/><stop offset=".827" stop-color="#c4b428" stop-opacity=".752"/><stop offset=".892" stop-color="#a89e3a" stop-opacity=".733"/><stop offset=".949" stop-color="#89834f" stop-opacity=".715"/><stop offset="1" stop-color="#666" stop-opacity=".7"/></linearGradient><ellipse cx="120.1" cy="120" rx="116.4" ry="116.5" fill="url(#SVGID_1_)" stroke="#000" stroke-width="7" stroke-miterlimit="10"/><path d="M69.5 148.5s-4 51 50 51c48 0 57-50 57-50-3 0 2 15-56 15-54 0-50-16-51-16z" fill="#fff" stroke="#000" stroke-width="9" stroke-miterlimit="10"/><circle class="st3" cx="163.2" cy="94.3" r="34.4"/><path d="M62 100c-1-.8 5-20.6 26-24 17.8-2.9 21.5 13.9 21 15-.5 1-4.2-6.8-21-4-20.4 3.4-25.1 13.8-26 13z" stroke="#000" stroke-width="5" stroke-miterlimit="10"/><circle class="st3" cx="76.3" cy="94.3" r="34.4"/><path class="st6" d="M108 90h25M187 90h45M8 88h51"/></g></svg>
diff --git a/pix/s/dead.svg b/pix/s/dead.svg
index 068323a6c532f..f500f704cbb24 100644
--- a/pix/s/dead.svg
+++ b/pix/s/dead.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_11);}.cls-2{font-size:67.03px;font-family:Arial-BoldMT, Arial;font-weight:700;}.cls-3{fill:none;stroke-width:13px;}.cls-4{fill:url(#Unbenannter_Verlauf_7);}</style><linearGradient id="Unbenannter_Verlauf_11" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d1d1d1"/><stop offset="0.44" stop-color="#cfcfcf"/><stop offset="0.6" stop-color="#c8c8c8"/><stop offset="0.72" stop-color="#bdbdbd"/><stop offset="0.81" stop-color="#acacac"/><stop offset="0.89" stop-color="#969696"/><stop offset="0.96" stop-color="#7b7b7b"/><stop offset="1" stop-color="#666"/></linearGradient><linearGradient id="Unbenannter_Verlauf_7" x1="91.73" y1="211.48" x2="135.5" y2="135.67" gradientTransform="matrix(-1, 0, 0, 1, 241.13, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#aa1700"/><stop offset="1"/></linearGradient></defs><title>dead</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><text class="cls-2" transform="translate(63.75 95.77)">X</text><text class="cls-2" transform="translate(132.75 95.77)">X</text><path class="cls-3" d="M54,174c4.28-32.47,31.25-39,64-39s59.72,6.53,64,39" transform="translate(-0.25)"/><path class="cls-4" d="M120.13,134c15.85-4.61,49.58,51.3,41,70-2.86,6.23-30.81,3.33-36,4-17.42,2.24-26.95-47.91-25-69C100.23,137.87,110.91,136.68,120.13,134Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_11);}.cls-2{font-size:67.03px;font-family:Arial-BoldMT, Arial;font-weight:700;}.cls-3{fill:none;stroke-width:13px;}.cls-4{fill:url(#Unbenannter_Verlauf_7);}</style><linearGradient id="Unbenannter_Verlauf_11" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d1d1d1"/><stop offset="0.44" stop-color="#cfcfcf"/><stop offset="0.6" stop-color="#c8c8c8"/><stop offset="0.72" stop-color="#bdbdbd"/><stop offset="0.81" stop-color="#acacac"/><stop offset="0.89" stop-color="#969696"/><stop offset="0.96" stop-color="#7b7b7b"/><stop offset="1" stop-color="#666"/></linearGradient><linearGradient id="Unbenannter_Verlauf_7" x1="91.73" y1="211.48" x2="135.5" y2="135.67" gradientTransform="matrix(-1, 0, 0, 1, 241.13, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#aa1700"/><stop offset="1"/></linearGradient></defs><title>dead</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><text class="cls-2" transform="translate(63.75 95.77)">X</text><text class="cls-2" transform="translate(132.75 95.77)">X</text><path class="cls-3" d="M54,174c4.28-32.47,31.25-39,64-39s59.72,6.53,64,39" transform="translate(-0.25)"/><path class="cls-4" d="M120.13,134c15.85-4.61,49.58,51.3,41,70-2.86,6.23-30.81,3.33-36,4-17.42,2.24-26.95-47.91-25-69C100.23,137.87,110.91,136.68,120.13,134Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/egg.svg b/pix/s/egg.svg
index 84a5647ad4e52..76f4827ef47a0 100644
--- a/pix/s/egg.svg
+++ b/pix/s/egg.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 205.28 241" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:#fff;}.cls-1,.cls-6{stroke:#000;stroke-width:8px;}.cls-1,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6{stroke-miterlimit:10;}.cls-2,.cls-3,.cls-4,.cls-5,.cls-6{fill:none;}.cls-2{stroke:#0b00da;}.cls-2,.cls-3,.cls-4,.cls-5{stroke-width:18px;}.cls-3{stroke:#ef0;}.cls-4{stroke:#18e600;}.cls-5{stroke:#ff3812;}</style></defs><title>egg</title><g id="Ebene_3" data-name="Ebene 3"><path class="cls-1" d="M218.5,138c0,67.65-33.49,98.5-97,98.5s-100-30.85-100-98.5S58,3.5,121.5,3.5,218.5,70.35,218.5,138Z" transform="translate(-17.22 0.5)"/><path class="cls-2" d="M41,63c14.16,5.2,43,19.41,78.63,19,37.5-.43,69.4-16.21,83.37-22" transform="translate(-17.22 0.5)"/><path class="cls-2" d="M39,195c2-2,34,20,79,19,54.07-1.2,85-24,87-22" transform="translate(-17.22 0.5)"/><path class="cls-3" d="M29,94c15.17,5.2,55.51,19.41,93.68,19C162.86,112.57,197,96.79,212,91" transform="translate(-17.22 0.5)"/><path class="cls-4" d="M21,118c11.21,5.2,36,25,97,25,56,0,87.94-22.21,99-28" transform="translate(-17.22 0.5)"/><path class="cls-5" d="M24,150c3,0,31,28.84,91,28,71-1,97-21,102-22" transform="translate(-17.22 0.5)"/><path class="cls-5" d="M63,27c11.21,5.2,32.87,14.94,61,13,29-2,39.94-10.21,51-16" transform="translate(-17.22 0.5)"/><path class="cls-6" d="M218.5,138c0,67.65-33.49,98.5-97,98.5s-100-30.85-100-98.5S58,3.5,121.5,3.5,218.5,70.35,218.5,138Z" transform="translate(-17.22 0.5)"/><path class="cls-6" d="M125,62" transform="translate(-17.22 0.5)"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 205.28 241" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:#fff;}.cls-1,.cls-6{stroke:#000;stroke-width:8px;}.cls-1,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6{stroke-miterlimit:10;}.cls-2,.cls-3,.cls-4,.cls-5,.cls-6{fill:none;}.cls-2{stroke:#0b00da;}.cls-2,.cls-3,.cls-4,.cls-5{stroke-width:18px;}.cls-3{stroke:#ef0;}.cls-4{stroke:#18e600;}.cls-5{stroke:#ff3812;}</style></defs><title>egg</title><g id="Ebene_3" data-name="Ebene 3"><path class="cls-1" d="M218.5,138c0,67.65-33.49,98.5-97,98.5s-100-30.85-100-98.5S58,3.5,121.5,3.5,218.5,70.35,218.5,138Z" transform="translate(-17.22 0.5)"/><path class="cls-2" d="M41,63c14.16,5.2,43,19.41,78.63,19,37.5-.43,69.4-16.21,83.37-22" transform="translate(-17.22 0.5)"/><path class="cls-2" d="M39,195c2-2,34,20,79,19,54.07-1.2,85-24,87-22" transform="translate(-17.22 0.5)"/><path class="cls-3" d="M29,94c15.17,5.2,55.51,19.41,93.68,19C162.86,112.57,197,96.79,212,91" transform="translate(-17.22 0.5)"/><path class="cls-4" d="M21,118c11.21,5.2,36,25,97,25,56,0,87.94-22.21,99-28" transform="translate(-17.22 0.5)"/><path class="cls-5" d="M24,150c3,0,31,28.84,91,28,71-1,97-21,102-22" transform="translate(-17.22 0.5)"/><path class="cls-5" d="M63,27c11.21,5.2,32.87,14.94,61,13,29-2,39.94-10.21,51-16" transform="translate(-17.22 0.5)"/><path class="cls-6" d="M218.5,138c0,67.65-33.49,98.5-97,98.5s-100-30.85-100-98.5S58,3.5,121.5,3.5,218.5,70.35,218.5,138Z" transform="translate(-17.22 0.5)"/><path class="cls-6" d="M125,62" transform="translate(-17.22 0.5)"/></g></svg>
diff --git a/pix/s/evil.svg b/pix/s/evil.svg
index 309b334c72551..3d4f73e75b23b 100644
--- a/pix/s/evil.svg
+++ b/pix/s/evil.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 242.36" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_18);}.cls-2{fill:#e63100;stroke-width:12px;}.cls-3{fill:none;stroke-width:13px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_18" x1="37.54" y1="40.03" x2="202.21" y2="204.69" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff7a7a"/><stop offset="0.5" stop-color="#ff565d"/><stop offset="1" stop-color="#ff3644"/></linearGradient></defs><title>evil</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="122.36" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="156.77" cy="89.86" rx="27.02" ry="17"/><ellipse class="cls-2" cx="83.31" cy="89.86" rx="27.02" ry="17"/><path class="cls-3" d="M69.5,162.5C78,194,102.5,188,128,188c32.52,0,32.5-2.5,41.5-25.5" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M129,80c-1-.81,5-20.56,26-24,17.84-2.93,45.53-4.12,45-3-1.17,2.48-19.54,9.71-45,14C134.57,70.44,130,80.77,129,80Z" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M115.91,80c1-.81-5-20.56-26-24-17.84-2.93-45.53-4.12-45-3s28.23,11.17,45,14C110.33,70.44,115,80.77,115.91,80Z" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M203.38,38.5c-1-.81,6.62-10.45,20.6-26.5,7.4-8.5,12.93-9.62,12.4-8.5s-17.88,24-20,48C215.86,57.44,204.33,39.27,203.38,38.5Z" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M37.33,37.5c1-.81-6.62-10.45-20.6-26.5C9.33,2.5,3.8,1.38,4.33,2.5s17.88,24,20,48C24.85,56.44,36.38,38.27,37.33,37.5Z" transform="translate(-1.25 0.36)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 242.36" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_18);}.cls-2{fill:#e63100;stroke-width:12px;}.cls-3{fill:none;stroke-width:13px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_18" x1="37.54" y1="40.03" x2="202.21" y2="204.69" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff7a7a"/><stop offset="0.5" stop-color="#ff565d"/><stop offset="1" stop-color="#ff3644"/></linearGradient></defs><title>evil</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="122.36" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="156.77" cy="89.86" rx="27.02" ry="17"/><ellipse class="cls-2" cx="83.31" cy="89.86" rx="27.02" ry="17"/><path class="cls-3" d="M69.5,162.5C78,194,102.5,188,128,188c32.52,0,32.5-2.5,41.5-25.5" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M129,80c-1-.81,5-20.56,26-24,17.84-2.93,45.53-4.12,45-3-1.17,2.48-19.54,9.71-45,14C134.57,70.44,130,80.77,129,80Z" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M115.91,80c1-.81-5-20.56-26-24-17.84-2.93-45.53-4.12-45-3s28.23,11.17,45,14C110.33,70.44,115,80.77,115.91,80Z" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M203.38,38.5c-1-.81,6.62-10.45,20.6-26.5,7.4-8.5,12.93-9.62,12.4-8.5s-17.88,24-20,48C215.86,57.44,204.33,39.27,203.38,38.5Z" transform="translate(-1.25 0.36)"/><path class="cls-4" d="M37.33,37.5c1-.81-6.62-10.45-20.6-26.5C9.33,2.5,3.8,1.38,4.33,2.5s17.88,24,20,48C24.85,56.44,36.38,38.27,37.33,37.5Z" transform="translate(-1.25 0.36)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/heart.svg b/pix/s/heart.svg
index cbf0bec3143e3..7d3a8c0271461 100644
--- a/pix/s/heart.svg
+++ b/pix/s/heart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 237.01 233" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:url(#Unbenannter_Verlauf_12);}</style><linearGradient id="Unbenannter_Verlauf_12" x1="121" y1="6.5" x2="121" y2="239.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c1272d"/><stop offset="0.07" stop-color="#cc2025"/><stop offset="0.26" stop-color="#e21215"/><stop offset="0.46" stop-color="#f20809"/><stop offset="0.69" stop-color="#fc0202"/><stop offset="1" stop-color="red"/></linearGradient></defs><title>heart</title><g id="Ebene_3" data-name="Ebene 3"><path class="cls-1" d="M121.5,42.5s-9-35-60-35c-27,0-58.5,29.5-59,77-.73,69,119,155,119,155s117.24-80,118-152c.5-47.5-34-81-60-81C144.5,6.5,121.5,42.5,121.5,42.5Z" transform="translate(-2.5 -6.5)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 237.01 233" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:url(#Unbenannter_Verlauf_12);}</style><linearGradient id="Unbenannter_Verlauf_12" x1="121" y1="6.5" x2="121" y2="239.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c1272d"/><stop offset="0.07" stop-color="#cc2025"/><stop offset="0.26" stop-color="#e21215"/><stop offset="0.46" stop-color="#f20809"/><stop offset="0.69" stop-color="#fc0202"/><stop offset="1" stop-color="red"/></linearGradient></defs><title>heart</title><g id="Ebene_3" data-name="Ebene 3"><path class="cls-1" d="M121.5,42.5s-9-35-60-35c-27,0-58.5,29.5-59,77-.73,69,119,155,119,155s117.24-80,118-152c.5-47.5-34-81-60-81C144.5,6.5,121.5,42.5,121.5,42.5Z" transform="translate(-2.5 -6.5)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/kiss.svg b/pix/s/kiss.svg
index 43eb6e0f828b7..f347a3f16740e 100644
--- a/pix/s/kiss.svg
+++ b/pix/s/kiss.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="239.75" height="240" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;}.cls-1,.cls-2,.cls-3{stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_13);}.cls-3{stroke-width:5px;}.cls-4{fill:url(#Unbenannter_Verlauf_26);}</style><linearGradient id="Unbenannter_Verlauf_13" x1="37.541" y1="37.666" x2="202.209" y2="202.334" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffcece"/><stop offset="0.475" stop-color="#ffcece" stop-opacity="0.993"/><stop offset="0.646" stop-color="#ffcece" stop-opacity="0.966"/><stop offset="0.767" stop-color="#ffcece" stop-opacity="0.92"/><stop offset="0.866" stop-color="#ffcece" stop-opacity="0.853"/><stop offset="0.949" stop-color="#ffcece" stop-opacity="0.768"/><stop offset="1" stop-color="#ffcece" stop-opacity="0.7"/></linearGradient><radialGradient id="Unbenannter_Verlauf_26" cx="119.991" cy="168.03" r="44.876" gradientTransform="translate(0 84.015) scale(1 0.5)" gradientUnits="userSpaceOnUse"><stop offset="0"/><stop offset="0.053" stop-color="#1e0715"/><stop offset="0.155" stop-color="#521238"/><stop offset="0.261" stop-color="#811d57"/><stop offset="0.37" stop-color="#a82571"/><stop offset="0.481" stop-color="#c72d86"/><stop offset="0.596" stop-color="#e03297"/><stop offset="0.717" stop-color="#f136a3"/><stop offset="0.846" stop-color="#fc38aa"/><stop offset="1" stop-color="#ff39ac"/></radialGradient></defs><title>kiss</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.875" cy="120" rx="116.375" ry="116.5"/><circle class="cls-2" cx="159.75" cy="96" r="16"/><path class="cls-3" d="M163,68.7c-1.006.815-10.3,15.042,9,24,12.5,5.8,18.527-5.885,18-7-.481-1.017-10.5,6.8-18-1C165.775,78.224,163.946,67.933,163,68.7Z" transform="translate(-0.25)"/><circle class="cls-2" cx="80.272" cy="95.5" r="16"/><path class="cls-3" d="M77.522,68.2c1.006.815,10.3,15.042-9,24-12.5,5.8-18.527-5.885-18-7,.481-1.017,10.5,6.8,18-1C74.747,77.724,76.576,67.433,77.522,68.2Z" transform="translate(-0.25)"/><path class="cls-4" d="M119.991,194.5c-6.614,0-13.682,4.293-21.234-1.363-7.659-5.738-9.539-11.891-17.1-18.78-2.1-1.914-15.43-13.691-18.6-14.858,6.4-3.515,19.316-9.644,21.8-11.491,6.874-5.118,12.671-8.033,17.564-8.008,3.882.02,8.2,5.416,17.579,5.416,9.534,0,13.7-5.4,17.578-5.416,4.894-.025,10.691,3.89,17.564,9.008,2.48,1.847,15.4,6.976,21.8,10.491-3.171,1.167-16.5,12.944-18.6,14.858-7.563,6.89-9.443,13.042-17.1,18.78-7.551,5.657-14.776,1.363-21.234,1.363Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;}.cls-1,.cls-2,.cls-3{stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_13);}.cls-3{stroke-width:5px;}.cls-4{fill:url(#Unbenannter_Verlauf_26);}</style><linearGradient id="Unbenannter_Verlauf_13" x1="37.541" y1="37.666" x2="202.209" y2="202.334" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffcece"/><stop offset="0.475" stop-color="#ffcece" stop-opacity="0.993"/><stop offset="0.646" stop-color="#ffcece" stop-opacity="0.966"/><stop offset="0.767" stop-color="#ffcece" stop-opacity="0.92"/><stop offset="0.866" stop-color="#ffcece" stop-opacity="0.853"/><stop offset="0.949" stop-color="#ffcece" stop-opacity="0.768"/><stop offset="1" stop-color="#ffcece" stop-opacity="0.7"/></linearGradient><radialGradient id="Unbenannter_Verlauf_26" cx="119.991" cy="168.03" r="44.876" gradientTransform="translate(0 84.015) scale(1 0.5)" gradientUnits="userSpaceOnUse"><stop offset="0"/><stop offset="0.053" stop-color="#1e0715"/><stop offset="0.155" stop-color="#521238"/><stop offset="0.261" stop-color="#811d57"/><stop offset="0.37" stop-color="#a82571"/><stop offset="0.481" stop-color="#c72d86"/><stop offset="0.596" stop-color="#e03297"/><stop offset="0.717" stop-color="#f136a3"/><stop offset="0.846" stop-color="#fc38aa"/><stop offset="1" stop-color="#ff39ac"/></radialGradient></defs><title>kiss</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.875" cy="120" rx="116.375" ry="116.5"/><circle class="cls-2" cx="159.75" cy="96" r="16"/><path class="cls-3" d="M163,68.7c-1.006.815-10.3,15.042,9,24,12.5,5.8,18.527-5.885,18-7-.481-1.017-10.5,6.8-18-1C165.775,78.224,163.946,67.933,163,68.7Z" transform="translate(-0.25)"/><circle class="cls-2" cx="80.272" cy="95.5" r="16"/><path class="cls-3" d="M77.522,68.2c1.006.815,10.3,15.042-9,24-12.5,5.8-18.527-5.885-18-7,.481-1.017,10.5,6.8,18-1C74.747,77.724,76.576,67.433,77.522,68.2Z" transform="translate(-0.25)"/><path class="cls-4" d="M119.991,194.5c-6.614,0-13.682,4.293-21.234-1.363-7.659-5.738-9.539-11.891-17.1-18.78-2.1-1.914-15.43-13.691-18.6-14.858,6.4-3.515,19.316-9.644,21.8-11.491,6.874-5.118,12.671-8.033,17.564-8.008,3.882.02,8.2,5.416,17.579,5.416,9.534,0,13.7-5.4,17.578-5.416,4.894-.025,10.691,3.89,17.564,9.008,2.48,1.847,15.4,6.976,21.8,10.491-3.171,1.167-16.5,12.944-18.6,14.858-7.563,6.89-9.443,13.042-17.1,18.78-7.551,5.657-14.776,1.363-21.234,1.363Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/martin.svg b/pix/s/martin.svg
index 8f27e10694646..fda2fe25bddf5 100644
--- a/pix/s/martin.svg
+++ b/pix/s/martin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:#ffff7b;}.cls-2{fill:#f7f77b;}.cls-3{fill:#b5b539;}.cls-4{fill:#d6d652;}.cls-5{fill:#e7e763;}.cls-6{fill:#efef73;}</style></defs><title>martin</title><g id="Ebene_3" data-name="Ebene 3"><image width="15" height="15" transform="scale(16)" xlink:href="C:\Users\Andreas\Downloads\martin.gif"/></g><g id="Black"><rect x="16" y="32" width="16" height="16"/><rect x="32" y="16" width="16" height="16"/><rect x="48" width="16" height="16"/><rect x="64" width="16" height="16"/><rect x="65" width="16" height="16"/><rect x="66" width="16" height="16"/><rect x="67" width="16" height="16"/><rect x="68" width="16" height="16"/><rect x="69" width="16" height="16"/><rect x="80" width="16" height="16"/><rect x="96" width="16" height="16"/><rect x="112" width="16" height="16"/><rect x="128" width="16" height="16"/><rect x="144" width="16" height="16"/><rect x="160" width="16" height="16"/><rect x="176" width="16" height="16"/><rect x="176" y="16" width="16" height="16"/><rect x="192" y="16" width="16" height="16"/><rect x="160" y="16" width="16" height="16"/><rect x="144" y="16" width="16" height="16"/><rect x="128" y="16" width="16" height="16"/><rect x="112" y="16" width="16" height="16"/><rect x="96" y="16" width="16" height="16"/><rect x="80" y="16" width="16" height="16"/><rect x="64" y="16" width="16" height="16"/><rect x="48" y="16" width="16" height="16"/><rect x="48" y="32" width="16" height="16"/><rect x="32" y="32" width="16" height="16"/><rect x="64" y="32" width="16" height="16"/><rect x="80" y="32" width="16" height="16"/><rect x="96" y="32" width="16" height="16"/><rect x="112" y="32" width="16" height="16"/><rect x="128" y="32" width="16" height="16"/><rect x="144" y="32" width="16" height="16"/><rect x="160" y="32" width="16" height="16"/><rect x="176" y="32" width="16" height="16"/><rect x="192" y="32" width="16" height="16"/><rect x="208" y="32" width="16" height="16"/><rect x="208" y="48" width="16" height="16"/><rect x="192" y="48" width="16" height="16"/><rect x="192" y="64" width="16" height="16"/><rect x="208" y="64" width="16" height="16"/><rect x="208" y="80" width="16" height="16"/><rect x="192" y="80" width="16" height="16"/><rect x="208" y="96" width="16" height="16"/><rect x="208" y="112" width="16" height="16"/><rect x="208" y="128" width="16" height="16"/><rect x="208" y="144" width="16" height="16"/><rect x="192" y="160" width="16" height="16"/><rect x="192" y="176" width="16" height="16"/><rect x="192" y="192" width="16" height="16"/><rect x="176" y="208" width="16" height="16"/><rect x="160" y="208" width="16" height="16"/><rect x="160" y="192" width="16" height="16"/><rect x="160" y="176" width="16" height="16"/><rect x="160" y="160" width="16" height="16"/><rect x="144" y="160" width="16" height="16"/><rect x="144" y="144" width="16" height="16"/><rect x="128" y="144" width="16" height="16"/><rect x="112" y="144" width="16" height="16"/><rect x="128" y="176" width="16" height="16"/><rect x="112" y="176" width="16" height="16"/><rect x="96" y="176" width="16" height="16"/><rect x="80" y="160" width="16" height="16"/><rect x="80" y="144" width="16" height="16"/><rect x="96" y="144" width="16" height="16"/><rect x="64" y="160" width="16" height="16"/><rect x="64" y="176" width="16" height="16"/><rect x="64" y="192" width="16" height="16"/><rect x="64" y="208" width="16" height="16"/><rect x="64" y="224" width="16" height="16"/><rect x="80" y="224" width="16" height="16"/><rect x="96" y="224" width="16" height="16"/><rect x="112" y="224" width="16" height="16"/><rect x="128" y="224" width="16" height="16"/><rect x="144" y="224" width="16" height="16"/><rect x="144" y="208" width="16" height="16"/><rect x="128" y="208" width="16" height="16"/><rect x="112" y="208" width="16" height="16"/><rect x="96" y="208" width="16" height="16"/><rect x="80" y="208" width="16" height="16"/><rect x="48" y="208" width="16" height="16"/><rect x="32" y="192" width="16" height="16"/><rect x="32" y="176" width="16" height="16"/><rect x="32" y="160" width="16" height="16"/><rect x="16" y="144" width="16" height="16"/><rect x="16" y="128" width="16" height="16"/><rect x="16" y="112" width="16" height="16"/><rect x="16" y="96" width="16" height="16"/><rect x="16" y="80" width="16" height="16"/><rect x="32" y="80" width="16" height="16"/><rect x="80" y="80" width="16" height="16"/><rect x="80" y="96" width="16" height="16"/><rect x="64" y="96" width="16" height="16"/><rect x="64" y="80" width="16" height="16"/><rect x="144" y="80" width="16" height="16"/><rect x="160" y="80" width="16" height="16"/><rect x="160" y="96" width="16" height="16"/><rect x="144" y="96" width="16" height="16"/><rect x="16" y="64" width="16" height="16"/><rect x="32" y="64" width="16" height="16"/><rect x="32" y="48" width="16" height="16"/><rect x="16" y="48" width="16" height="16"/></g><g id="Yellow"><rect class="cls-1" x="48" y="48" width="16" height="16"/><rect class="cls-1" x="64" y="48" width="16" height="16"/><rect class="cls-1" x="80" y="48" width="16" height="16"/><rect class="cls-1" x="96" y="48" width="16" height="16"/><rect class="cls-1" x="112" y="48" width="16" height="16"/><rect class="cls-1" x="112" y="64" width="16" height="16"/><rect class="cls-1" x="96" y="64" width="16" height="16"/><rect class="cls-1" x="80" y="64" width="16" height="16"/><rect class="cls-1" x="64" y="64" width="16" height="16"/><rect class="cls-1" x="48" y="64" width="16" height="16"/><rect class="cls-1" x="48" y="80" width="16" height="16"/><rect class="cls-1" x="48" y="96" width="16" height="16"/><rect class="cls-1" x="32" y="96" width="16" height="16"/><rect class="cls-1" x="48" y="112" width="16" height="16"/><rect class="cls-2" x="128" y="48" width="16" height="16"/><rect class="cls-2" x="144" y="48" width="16" height="16"/><rect class="cls-2" x="144" y="64" width="16" height="16"/><rect class="cls-2" x="128" y="64" width="16" height="16"/><rect class="cls-2" x="128" y="80" width="16" height="16"/><rect class="cls-2" x="128" y="96" width="16" height="16"/><rect class="cls-2" x="112" y="96" width="16" height="16"/><rect class="cls-2" x="112" y="112" width="16" height="16"/><rect class="cls-2" x="96" y="112" width="16" height="16"/><rect class="cls-2" x="80" y="128" width="16" height="16"/><rect class="cls-2" x="64" y="128" width="16" height="16"/><rect class="cls-2" x="64" y="144" width="16" height="16"/><rect class="cls-2" x="48" y="144" width="16" height="16"/><rect class="cls-2" x="48" y="128" width="16" height="16"/><rect class="cls-2" x="32" y="112" width="16" height="16"/><rect class="cls-3" x="48" y="192" width="16" height="16"/><rect class="cls-3" x="80" y="192" width="16" height="16"/><rect class="cls-3" x="96" y="192" width="16" height="16"/><rect class="cls-3" x="112" y="192" width="16" height="16"/><rect class="cls-3" x="128" y="192" width="16" height="16"/><rect class="cls-3" x="144" y="192" width="16" height="16"/><rect class="cls-3" x="144" y="176" width="16" height="16"/><rect class="cls-3" x="128" y="160" width="16" height="16"/><rect class="cls-4" x="112" y="160" width="16" height="16"/><rect class="cls-4" x="96" y="160" width="16" height="16"/><rect class="cls-4" x="80" y="176" width="16" height="16"/><rect class="cls-4" x="176" y="144" width="16" height="16"/><rect class="cls-4" x="160" y="144" width="16" height="16"/><rect class="cls-4" x="160" y="128" width="16" height="16"/><rect class="cls-4" x="176" y="128" width="16" height="16"/><rect class="cls-4" x="176" y="112" width="16" height="16"/><rect class="cls-4" x="160" y="112" width="16" height="16"/><rect class="cls-4" x="144" y="128" width="16" height="16"/><rect class="cls-4" x="128" y="128" width="16" height="16"/><rect class="cls-5" x="128" y="112" width="16" height="16"/><rect class="cls-5" x="144" y="112" width="16" height="16"/><rect class="cls-5" x="176" y="96" width="16" height="16"/><rect class="cls-5" x="176" y="80" width="16" height="16"/><rect class="cls-5" x="176" y="70" width="16" height="16"/><rect class="cls-5" x="176" y="64" width="16" height="16"/><rect class="cls-5" x="176" y="48" width="16" height="16"/><rect class="cls-5" x="32" y="128" width="16" height="16"/><rect class="cls-5" x="32" y="144" width="16" height="16"/><rect class="cls-5" x="48" y="160" width="16" height="16"/><rect class="cls-3" x="48" y="176" width="16" height="16"/><rect class="cls-3" x="48" y="192" width="16" height="16"/><rect class="cls-6" x="112" y="128" width="16" height="16"/><rect class="cls-6" x="96" y="128" width="16" height="16"/><rect class="cls-6" x="160" y="48" width="16" height="16"/><rect class="cls-6" x="160" y="64" width="16" height="16"/><rect class="cls-3" x="176" y="192" width="16" height="16"/><rect class="cls-3" x="176" y="176" width="16" height="16"/><rect class="cls-3" x="176" y="160" width="16" height="16"/><rect class="cls-3" x="192" y="144" width="16" height="16"/><rect class="cls-3" x="192" y="128" width="16" height="16"/><rect class="cls-3" x="192" y="112" width="16" height="16"/><rect class="cls-3" x="192" y="96" width="16" height="16"/><rect class="cls-1" x="64" y="112" width="16" height="16"/><rect class="cls-1" x="80" y="112" width="16" height="16"/><rect class="cls-1" x="96" y="96" width="16" height="16"/><rect class="cls-1" x="96" y="80" width="16" height="16"/><rect class="cls-1" x="112" y="80" width="16" height="16"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1{fill:#ffff7b;}.cls-2{fill:#f7f77b;}.cls-3{fill:#b5b539;}.cls-4{fill:#d6d652;}.cls-5{fill:#e7e763;}.cls-6{fill:#efef73;}</style></defs><title>martin</title><g id="Ebene_3" data-name="Ebene 3"><image width="15" height="15" transform="scale(16)" xlink:href="C:\Users\Andreas\Downloads\martin.gif"/></g><g id="Black"><rect x="16" y="32" width="16" height="16"/><rect x="32" y="16" width="16" height="16"/><rect x="48" width="16" height="16"/><rect x="64" width="16" height="16"/><rect x="65" width="16" height="16"/><rect x="66" width="16" height="16"/><rect x="67" width="16" height="16"/><rect x="68" width="16" height="16"/><rect x="69" width="16" height="16"/><rect x="80" width="16" height="16"/><rect x="96" width="16" height="16"/><rect x="112" width="16" height="16"/><rect x="128" width="16" height="16"/><rect x="144" width="16" height="16"/><rect x="160" width="16" height="16"/><rect x="176" width="16" height="16"/><rect x="176" y="16" width="16" height="16"/><rect x="192" y="16" width="16" height="16"/><rect x="160" y="16" width="16" height="16"/><rect x="144" y="16" width="16" height="16"/><rect x="128" y="16" width="16" height="16"/><rect x="112" y="16" width="16" height="16"/><rect x="96" y="16" width="16" height="16"/><rect x="80" y="16" width="16" height="16"/><rect x="64" y="16" width="16" height="16"/><rect x="48" y="16" width="16" height="16"/><rect x="48" y="32" width="16" height="16"/><rect x="32" y="32" width="16" height="16"/><rect x="64" y="32" width="16" height="16"/><rect x="80" y="32" width="16" height="16"/><rect x="96" y="32" width="16" height="16"/><rect x="112" y="32" width="16" height="16"/><rect x="128" y="32" width="16" height="16"/><rect x="144" y="32" width="16" height="16"/><rect x="160" y="32" width="16" height="16"/><rect x="176" y="32" width="16" height="16"/><rect x="192" y="32" width="16" height="16"/><rect x="208" y="32" width="16" height="16"/><rect x="208" y="48" width="16" height="16"/><rect x="192" y="48" width="16" height="16"/><rect x="192" y="64" width="16" height="16"/><rect x="208" y="64" width="16" height="16"/><rect x="208" y="80" width="16" height="16"/><rect x="192" y="80" width="16" height="16"/><rect x="208" y="96" width="16" height="16"/><rect x="208" y="112" width="16" height="16"/><rect x="208" y="128" width="16" height="16"/><rect x="208" y="144" width="16" height="16"/><rect x="192" y="160" width="16" height="16"/><rect x="192" y="176" width="16" height="16"/><rect x="192" y="192" width="16" height="16"/><rect x="176" y="208" width="16" height="16"/><rect x="160" y="208" width="16" height="16"/><rect x="160" y="192" width="16" height="16"/><rect x="160" y="176" width="16" height="16"/><rect x="160" y="160" width="16" height="16"/><rect x="144" y="160" width="16" height="16"/><rect x="144" y="144" width="16" height="16"/><rect x="128" y="144" width="16" height="16"/><rect x="112" y="144" width="16" height="16"/><rect x="128" y="176" width="16" height="16"/><rect x="112" y="176" width="16" height="16"/><rect x="96" y="176" width="16" height="16"/><rect x="80" y="160" width="16" height="16"/><rect x="80" y="144" width="16" height="16"/><rect x="96" y="144" width="16" height="16"/><rect x="64" y="160" width="16" height="16"/><rect x="64" y="176" width="16" height="16"/><rect x="64" y="192" width="16" height="16"/><rect x="64" y="208" width="16" height="16"/><rect x="64" y="224" width="16" height="16"/><rect x="80" y="224" width="16" height="16"/><rect x="96" y="224" width="16" height="16"/><rect x="112" y="224" width="16" height="16"/><rect x="128" y="224" width="16" height="16"/><rect x="144" y="224" width="16" height="16"/><rect x="144" y="208" width="16" height="16"/><rect x="128" y="208" width="16" height="16"/><rect x="112" y="208" width="16" height="16"/><rect x="96" y="208" width="16" height="16"/><rect x="80" y="208" width="16" height="16"/><rect x="48" y="208" width="16" height="16"/><rect x="32" y="192" width="16" height="16"/><rect x="32" y="176" width="16" height="16"/><rect x="32" y="160" width="16" height="16"/><rect x="16" y="144" width="16" height="16"/><rect x="16" y="128" width="16" height="16"/><rect x="16" y="112" width="16" height="16"/><rect x="16" y="96" width="16" height="16"/><rect x="16" y="80" width="16" height="16"/><rect x="32" y="80" width="16" height="16"/><rect x="80" y="80" width="16" height="16"/><rect x="80" y="96" width="16" height="16"/><rect x="64" y="96" width="16" height="16"/><rect x="64" y="80" width="16" height="16"/><rect x="144" y="80" width="16" height="16"/><rect x="160" y="80" width="16" height="16"/><rect x="160" y="96" width="16" height="16"/><rect x="144" y="96" width="16" height="16"/><rect x="16" y="64" width="16" height="16"/><rect x="32" y="64" width="16" height="16"/><rect x="32" y="48" width="16" height="16"/><rect x="16" y="48" width="16" height="16"/></g><g id="Yellow"><rect class="cls-1" x="48" y="48" width="16" height="16"/><rect class="cls-1" x="64" y="48" width="16" height="16"/><rect class="cls-1" x="80" y="48" width="16" height="16"/><rect class="cls-1" x="96" y="48" width="16" height="16"/><rect class="cls-1" x="112" y="48" width="16" height="16"/><rect class="cls-1" x="112" y="64" width="16" height="16"/><rect class="cls-1" x="96" y="64" width="16" height="16"/><rect class="cls-1" x="80" y="64" width="16" height="16"/><rect class="cls-1" x="64" y="64" width="16" height="16"/><rect class="cls-1" x="48" y="64" width="16" height="16"/><rect class="cls-1" x="48" y="80" width="16" height="16"/><rect class="cls-1" x="48" y="96" width="16" height="16"/><rect class="cls-1" x="32" y="96" width="16" height="16"/><rect class="cls-1" x="48" y="112" width="16" height="16"/><rect class="cls-2" x="128" y="48" width="16" height="16"/><rect class="cls-2" x="144" y="48" width="16" height="16"/><rect class="cls-2" x="144" y="64" width="16" height="16"/><rect class="cls-2" x="128" y="64" width="16" height="16"/><rect class="cls-2" x="128" y="80" width="16" height="16"/><rect class="cls-2" x="128" y="96" width="16" height="16"/><rect class="cls-2" x="112" y="96" width="16" height="16"/><rect class="cls-2" x="112" y="112" width="16" height="16"/><rect class="cls-2" x="96" y="112" width="16" height="16"/><rect class="cls-2" x="80" y="128" width="16" height="16"/><rect class="cls-2" x="64" y="128" width="16" height="16"/><rect class="cls-2" x="64" y="144" width="16" height="16"/><rect class="cls-2" x="48" y="144" width="16" height="16"/><rect class="cls-2" x="48" y="128" width="16" height="16"/><rect class="cls-2" x="32" y="112" width="16" height="16"/><rect class="cls-3" x="48" y="192" width="16" height="16"/><rect class="cls-3" x="80" y="192" width="16" height="16"/><rect class="cls-3" x="96" y="192" width="16" height="16"/><rect class="cls-3" x="112" y="192" width="16" height="16"/><rect class="cls-3" x="128" y="192" width="16" height="16"/><rect class="cls-3" x="144" y="192" width="16" height="16"/><rect class="cls-3" x="144" y="176" width="16" height="16"/><rect class="cls-3" x="128" y="160" width="16" height="16"/><rect class="cls-4" x="112" y="160" width="16" height="16"/><rect class="cls-4" x="96" y="160" width="16" height="16"/><rect class="cls-4" x="80" y="176" width="16" height="16"/><rect class="cls-4" x="176" y="144" width="16" height="16"/><rect class="cls-4" x="160" y="144" width="16" height="16"/><rect class="cls-4" x="160" y="128" width="16" height="16"/><rect class="cls-4" x="176" y="128" width="16" height="16"/><rect class="cls-4" x="176" y="112" width="16" height="16"/><rect class="cls-4" x="160" y="112" width="16" height="16"/><rect class="cls-4" x="144" y="128" width="16" height="16"/><rect class="cls-4" x="128" y="128" width="16" height="16"/><rect class="cls-5" x="128" y="112" width="16" height="16"/><rect class="cls-5" x="144" y="112" width="16" height="16"/><rect class="cls-5" x="176" y="96" width="16" height="16"/><rect class="cls-5" x="176" y="80" width="16" height="16"/><rect class="cls-5" x="176" y="70" width="16" height="16"/><rect class="cls-5" x="176" y="64" width="16" height="16"/><rect class="cls-5" x="176" y="48" width="16" height="16"/><rect class="cls-5" x="32" y="128" width="16" height="16"/><rect class="cls-5" x="32" y="144" width="16" height="16"/><rect class="cls-5" x="48" y="160" width="16" height="16"/><rect class="cls-3" x="48" y="176" width="16" height="16"/><rect class="cls-3" x="48" y="192" width="16" height="16"/><rect class="cls-6" x="112" y="128" width="16" height="16"/><rect class="cls-6" x="96" y="128" width="16" height="16"/><rect class="cls-6" x="160" y="48" width="16" height="16"/><rect class="cls-6" x="160" y="64" width="16" height="16"/><rect class="cls-3" x="176" y="192" width="16" height="16"/><rect class="cls-3" x="176" y="176" width="16" height="16"/><rect class="cls-3" x="176" y="160" width="16" height="16"/><rect class="cls-3" x="192" y="144" width="16" height="16"/><rect class="cls-3" x="192" y="128" width="16" height="16"/><rect class="cls-3" x="192" y="112" width="16" height="16"/><rect class="cls-3" x="192" y="96" width="16" height="16"/><rect class="cls-1" x="64" y="112" width="16" height="16"/><rect class="cls-1" x="80" y="112" width="16" height="16"/><rect class="cls-1" x="96" y="96" width="16" height="16"/><rect class="cls-1" x="96" y="80" width="16" height="16"/><rect class="cls-1" x="112" y="80" width="16" height="16"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/mixed.svg b/pix/s/mixed.svg
index d46c55b00e9de..fe71c8bf4ea70 100644
--- a/pix/s/mixed.svg
+++ b/pix/s/mixed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{stroke-width:5px;}.cls-4{stroke-width:2px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>mixed</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.75" cy="81" r="16"/><path class="cls-3" d="M59,92c-1-.81,9-34.56,30-38,17.84-2.93,27.53,2.88,27,4s-10.23,4.17-27,7C68.57,68.44,60,92.77,59,92Z" transform="translate(-0.25)"/><circle class="cls-2" cx="77.25" cy="89.5" r="16"/><path class="cls-4" d="M67.5,131.5c-7.72-6.31-7.21,21.77-4,23,6.5,2.5,61.5,24.5,85,41,6.61,4.64,18.07-19.39,10-22C126,163,73,136,67.5,131.5Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{stroke-width:5px;}.cls-4{stroke-width:2px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>mixed</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.75" cy="81" r="16"/><path class="cls-3" d="M59,92c-1-.81,9-34.56,30-38,17.84-2.93,27.53,2.88,27,4s-10.23,4.17-27,7C68.57,68.44,60,92.77,59,92Z" transform="translate(-0.25)"/><circle class="cls-2" cx="77.25" cy="89.5" r="16"/><path class="cls-4" d="M67.5,131.5c-7.72-6.31-7.21,21.77-4,23,6.5,2.5,61.5,24.5,85,41,6.61,4.64,18.07-19.39,10-22C126,163,73,136,67.5,131.5Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/no.svg b/pix/s/no.svg
index 9b7f0d4d9e683..a462b4ee0a43b 100644
--- a/pix/s/no.svg
+++ b/pix/s/no.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" preserveAspectRatio="xMinYMid meet"><style>.st0{display:none}.st1{display:inline;fill:url(#SVGID_1_);stroke:#000;stroke-width:.5;stroke-miterlimit:10}.st2{fill:url(#SVGID_2_)}.st3,.st4,.st5{stroke-miterlimit:10}.st3{fill:#e29b46;stroke-width:.5;stroke:#e29b46}.st4,.st5{stroke:#000}.st4{display:none;fill:none;stroke-width:13}.st5{stroke-width:.5}</style><image width="15" height="15" xlink:href="57724704FC4A9760.jpg" transform="scale(16)" overflow="visible" id="Ebene_1" class="st0"/><g id="Ebene_3"><g id="Ebene_4" class="st0"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1=".5" y1="120.5" x2="240.5" y2="120.5"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st1" d="M.5.5h240v240H.5z"/></g><linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.569" y1="120.274" x2="226.145" y2="120.274" gradientTransform="matrix(1 0 0 -1 0 237.258)"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st2" d="M85.7 224.9c-13.5 2.5-20.5-3.2-25-18.7-1.6-5.7-2.1-11.5 5.7-24.7 10-17 11-19 20-46 1-3-7.2-.8-22.7-2.3-17-1.6-42-5.7-50-22.7-4.2-9-2.7-17.8 10.3-27.8 0 0-10.5-10.2-3-21.7 8.2-12.6 13-6.8 13-6.8-.5-1.5-2.3-13.6 1-17.8 7-9 15.1-4.9 19.7-11.6 3.2-4.7 4.2-7.4 9.3-11.5 11-9 34-4.7 38.8-3.8 5.2 1 9.3-1.7 29.2.1 11 1 42.5 23.1 52.7 29.2 5.9 3.5 34.2-3 33.5 5.8-2 24 20.2 29.5-1.8 72.5-2.1 4.1-8.1-.1-21.7.2-8.1.2-8.6 1.1-10 1.4-7.3 1.6-12.7 5.2-15 8-12 14-18.6 20.6-34 37.3-13.4 14.6-21.9 18.5-29 26-18 19-11.4 29.3-15.7 35.7-1.3 1.9-3.4-1.1-5.3-.8z"/><path class="st3" d="M229 79.3c0 14.2-3.8 28.2-11.5 41.7h-24.9c-5.8 0-10 .8-12.6 2.4-2.6 1.6-7.1 6-13.5 13.2l-5.9 6.5c-6.7 7.4-11.3 12.4-14 15L107.1 193l-10.7 33.3-6.2 4.7c-22.3-4.4-33.4-15.4-33.4-32.9 0-6.3 3.7-15.4 11-27l3.4-4.9c6.1-9.9 10-20.2 11.7-30.8h-5.3c-20.9 0-37.6-3-50.2-8.8-12.6-5.9-19-13.7-19-23.4 0-8.4 3.8-16 11.5-22.8-3.1-4.1-4.7-8-4.7-11.6 0-4.5 1.5-8.2 4.4-11.1 2.9-3 7.2-5.1 12.8-6.4-.3-2.1-.4-3.8-.4-4.9 0-11.1 1.7-17.1 17-18.2-.3-1.5 5.6-2.5 5.6-3.2C54.7 12.5 65.2 6.3 86 6.3h9.1l7.6 3.2c9.2-2.1 17.4-3.2 24.7-3.2 2.6 0 6.6 3.2 11.9 3.6 17 6.5 32.9 10.7 47.4 24.6l31.8 3c7 13.9 10.5 27.9 10.5 41.8zm-46.8-35.7c-11.8-13-27.1-18-46-27.1l-8.3-3.2c-3 0-6.6.4-10.8 1.1l23.2 12.7c-4.4 8-7.3 11.2-14.4 15.6l10.2 8.1c-5.5 8.2-8.6 11-15.1 14.5l5.4 3c-4.9 9.1-8.7 15.4-17.7 19.1l4.3 5.8c-8.4 15.3-18.6 20-36.8 20-3.4 0-7.2-.4-11.3-1.3-4.1-.8-8.6-2.1-13.7-3.9l-17.3-.2 10-8.9 10 .4c5.4 1.9 10.1 3.3 14.1 4.3 3.9.9 7.2 1.4 9.8 1.4 9.8 0 17.6-3.7 23.5-11L62.6 79.7l-13 .1c-8.5 0-15.7 2.4-21.6 7.1-5.9 4.7-8.9 10.5-8.9 17.3 0 7.5 5.7 13.2 17.1 16.9 11.3 3.7 28.3 5.5 50.9 5.5l1.7 3 5.8 2c0 13.9-5.5 28.5-16.7 43.9l-2.7 3.9c-4.9 6.7-7.3 13-7.3 18.7 0 11.1 7.1 18.7 21.4 22.7l8.5-32.8 42.8-37.9c7.2-7.5 12.7-13.3 16.3-17.4 9.1-10.6 15.9-16.8 20.5-18.6 4.5-1.7 15.7-2.7 33.6-2.7 4.9-11.2 7.3-22.6 7.3-34.1 0-9.8-2.2-20.1-6.6-30.8l-29.5-2.9zM75.1 57.8H52.5c-8.6 0-15.1.9-19.5 2.7-4.3 1.9-6.5 4.6-6.5 8.2 0 1.9 1 3.9 2.7 6 5.5-2.5 13.6-3.8 24.3-3.8h11.3l31.7 11.8c7-1.5 12.9-5.1 17.9-10.6L75.1 57.8zm7.7-21.3h-16C50.2 36.5 41.9 40 41.9 47l.6 2.3L77 49l32.6 12c4.7-1.9 8.7-4.5 12.1-7.7.4-.5 1-1.1 1.7-1.8l-40.6-15zM93 14.6h-7c-13.8 0-26.7 3.9-26.7 11.8v1.1h25.6l30.5 11.3c4.1-2.6 7.5-5.4 10.2-8.6.6-.6 1.3-1.4 2.3-2.5L93 14.6z" id="Layer_1"/><g id="Layer_1_1_" class="st0"><path class="st5" d="M220.6 199.9l-31.8 3c-14.6 13.9-30.4 18.1-47.4 24.6-5.4.4-9.4 3.6-11.9 3.6-7.3 0-15.5-1.1-24.7-3.2l-7.6 3.2H88c-20.9 0-31.3-6.2-31.3-18.6 0-.7-5.9-1.7-5.6-3.2-15.3-1-17-7.1-17-18.2 0-1.2.1-2.8.4-4.9-5.7-1.3-10-3.4-12.8-6.4-2.9-2.9-4.4-6.6-4.4-11.1 0-3.6 1.5-7.5 4.7-11.6-7.6-6.8-11.5-14.4-11.5-22.8 0-9.7 6.3-17.4 19-23.4 12.6-5.8 29.4-8.8 50.2-8.8H85c-1.7-10.6-5.6-20.9-11.7-30.8l-3.4-4.9c-7.3-11.7-11-20.7-11-27 0-17.6 11.1-28.6 33.4-32.9l6.2 4.7 10.7 33.3 39.4 34.8c2.7 2.6 7.3 7.6 14 15l5.9 6.5c6.4 7.2 10.9 11.6 13.5 13.2 2.6 1.6 6.8 2.4 12.6 2.4h24.9c7.6 13.5 11.5 27.5 11.5 41.7 0 13.7-3.5 27.8-10.4 41.8zm-7-9.2c4.5-10.7 6.6-21 6.6-30.8 0-11.5-2.4-22.9-7.3-34.1-17.9 0-29-.9-33.6-2.7-4.6-1.7-11.4-8-20.5-18.6-3.6-4.1-9.1-10-16.3-17.4L99.7 49.2l-8.5-32.8C77 20.5 69.9 28.1 69.9 39.2c0 5.7 2.4 12 7.3 18.7l2.7 3.9c11.1 15.4 16.7 30 16.7 43.9l-5.8 2-1.7 3c-22.5 0-39.5 1.9-50.9 5.5-11.4 3.8-17.1 9.4-17.1 16.9 0 6.8 3 12.6 8.9 17.3 5.9 4.7 13.1 7.1 21.6 7.1l13 .1 38.6-14.4c-5.8-7.3-13.7-11-23.5-11-2.6 0-5.8.5-9.8 1.4-4 1-8.6 2.4-14.1 4.3l-10 .4-10-8.9 17.3-.2c5-1.7 9.5-3.1 13.7-3.9 4.1-.8 7.9-1.3 11.3-1.3 18.2 0 28.5 4.7 36.8 20l-4.3 5.8c8.9 3.6 12.8 10 17.7 19.1l-5.4 3c6.6 3.4 9.6 6.3 15.1 14.5l-10.2 8.1c7.2 4.4 10 7.6 14.4 15.6L119 222.8c4.2.7 7.9 1.1 10.8 1.1l8.3-3.2c18.9-9.1 34.2-14.1 46-27.1l29.5-2.9zM116.5 165c-4.9-5.5-10.9-9.1-17.9-10.6l-31.7 11.8H55.6c-10.7 0-18.8-1.3-24.3-3.8-1.8 2.1-2.7 4.2-2.7 6 0 3.6 2.2 6.3 6.5 8.2 4.3 1.8 10.8 2.7 19.5 2.7h22.6l39.3-14.3zm8.9 20.7c-.6-.7-1.2-1.3-1.7-1.8-3.4-3.3-7.5-5.9-12.1-7.7l-32.6 12-34.4-.2-.6 2.3c0 6.9 8.3 10.5 24.9 10.5h16l40.5-15.1zm4.5 23.9c-1-1-1.7-1.9-2.3-2.5-2.7-3.2-6.1-6-10.2-8.6l-30.5 11.3H61.3v1.1c0 7.9 12.9 11.8 26.7 11.8h7l34.9-13.1z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><style>.st0{display:none}.st1{display:inline;fill:url(#SVGID_1_);stroke:#000;stroke-width:.5;stroke-miterlimit:10}.st2{fill:url(#SVGID_2_)}.st3,.st4,.st5{stroke-miterlimit:10}.st3{fill:#e29b46;stroke-width:.5;stroke:#e29b46}.st4,.st5{stroke:#000}.st4{display:none;fill:none;stroke-width:13}.st5{stroke-width:.5}</style><image width="15" height="15" xlink:href="57724704FC4A9760.jpg" transform="scale(16)" overflow="visible" id="Ebene_1" class="st0"/><g id="Ebene_3"><g id="Ebene_4" class="st0"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1=".5" y1="120.5" x2="240.5" y2="120.5"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st1" d="M.5.5h240v240H.5z"/></g><linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.569" y1="120.274" x2="226.145" y2="120.274" gradientTransform="matrix(1 0 0 -1 0 237.258)"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st2" d="M85.7 224.9c-13.5 2.5-20.5-3.2-25-18.7-1.6-5.7-2.1-11.5 5.7-24.7 10-17 11-19 20-46 1-3-7.2-.8-22.7-2.3-17-1.6-42-5.7-50-22.7-4.2-9-2.7-17.8 10.3-27.8 0 0-10.5-10.2-3-21.7 8.2-12.6 13-6.8 13-6.8-.5-1.5-2.3-13.6 1-17.8 7-9 15.1-4.9 19.7-11.6 3.2-4.7 4.2-7.4 9.3-11.5 11-9 34-4.7 38.8-3.8 5.2 1 9.3-1.7 29.2.1 11 1 42.5 23.1 52.7 29.2 5.9 3.5 34.2-3 33.5 5.8-2 24 20.2 29.5-1.8 72.5-2.1 4.1-8.1-.1-21.7.2-8.1.2-8.6 1.1-10 1.4-7.3 1.6-12.7 5.2-15 8-12 14-18.6 20.6-34 37.3-13.4 14.6-21.9 18.5-29 26-18 19-11.4 29.3-15.7 35.7-1.3 1.9-3.4-1.1-5.3-.8z"/><path class="st3" d="M229 79.3c0 14.2-3.8 28.2-11.5 41.7h-24.9c-5.8 0-10 .8-12.6 2.4-2.6 1.6-7.1 6-13.5 13.2l-5.9 6.5c-6.7 7.4-11.3 12.4-14 15L107.1 193l-10.7 33.3-6.2 4.7c-22.3-4.4-33.4-15.4-33.4-32.9 0-6.3 3.7-15.4 11-27l3.4-4.9c6.1-9.9 10-20.2 11.7-30.8h-5.3c-20.9 0-37.6-3-50.2-8.8-12.6-5.9-19-13.7-19-23.4 0-8.4 3.8-16 11.5-22.8-3.1-4.1-4.7-8-4.7-11.6 0-4.5 1.5-8.2 4.4-11.1 2.9-3 7.2-5.1 12.8-6.4-.3-2.1-.4-3.8-.4-4.9 0-11.1 1.7-17.1 17-18.2-.3-1.5 5.6-2.5 5.6-3.2C54.7 12.5 65.2 6.3 86 6.3h9.1l7.6 3.2c9.2-2.1 17.4-3.2 24.7-3.2 2.6 0 6.6 3.2 11.9 3.6 17 6.5 32.9 10.7 47.4 24.6l31.8 3c7 13.9 10.5 27.9 10.5 41.8zm-46.8-35.7c-11.8-13-27.1-18-46-27.1l-8.3-3.2c-3 0-6.6.4-10.8 1.1l23.2 12.7c-4.4 8-7.3 11.2-14.4 15.6l10.2 8.1c-5.5 8.2-8.6 11-15.1 14.5l5.4 3c-4.9 9.1-8.7 15.4-17.7 19.1l4.3 5.8c-8.4 15.3-18.6 20-36.8 20-3.4 0-7.2-.4-11.3-1.3-4.1-.8-8.6-2.1-13.7-3.9l-17.3-.2 10-8.9 10 .4c5.4 1.9 10.1 3.3 14.1 4.3 3.9.9 7.2 1.4 9.8 1.4 9.8 0 17.6-3.7 23.5-11L62.6 79.7l-13 .1c-8.5 0-15.7 2.4-21.6 7.1-5.9 4.7-8.9 10.5-8.9 17.3 0 7.5 5.7 13.2 17.1 16.9 11.3 3.7 28.3 5.5 50.9 5.5l1.7 3 5.8 2c0 13.9-5.5 28.5-16.7 43.9l-2.7 3.9c-4.9 6.7-7.3 13-7.3 18.7 0 11.1 7.1 18.7 21.4 22.7l8.5-32.8 42.8-37.9c7.2-7.5 12.7-13.3 16.3-17.4 9.1-10.6 15.9-16.8 20.5-18.6 4.5-1.7 15.7-2.7 33.6-2.7 4.9-11.2 7.3-22.6 7.3-34.1 0-9.8-2.2-20.1-6.6-30.8l-29.5-2.9zM75.1 57.8H52.5c-8.6 0-15.1.9-19.5 2.7-4.3 1.9-6.5 4.6-6.5 8.2 0 1.9 1 3.9 2.7 6 5.5-2.5 13.6-3.8 24.3-3.8h11.3l31.7 11.8c7-1.5 12.9-5.1 17.9-10.6L75.1 57.8zm7.7-21.3h-16C50.2 36.5 41.9 40 41.9 47l.6 2.3L77 49l32.6 12c4.7-1.9 8.7-4.5 12.1-7.7.4-.5 1-1.1 1.7-1.8l-40.6-15zM93 14.6h-7c-13.8 0-26.7 3.9-26.7 11.8v1.1h25.6l30.5 11.3c4.1-2.6 7.5-5.4 10.2-8.6.6-.6 1.3-1.4 2.3-2.5L93 14.6z" id="Layer_1"/><g id="Layer_1_1_" class="st0"><path class="st5" d="M220.6 199.9l-31.8 3c-14.6 13.9-30.4 18.1-47.4 24.6-5.4.4-9.4 3.6-11.9 3.6-7.3 0-15.5-1.1-24.7-3.2l-7.6 3.2H88c-20.9 0-31.3-6.2-31.3-18.6 0-.7-5.9-1.7-5.6-3.2-15.3-1-17-7.1-17-18.2 0-1.2.1-2.8.4-4.9-5.7-1.3-10-3.4-12.8-6.4-2.9-2.9-4.4-6.6-4.4-11.1 0-3.6 1.5-7.5 4.7-11.6-7.6-6.8-11.5-14.4-11.5-22.8 0-9.7 6.3-17.4 19-23.4 12.6-5.8 29.4-8.8 50.2-8.8H85c-1.7-10.6-5.6-20.9-11.7-30.8l-3.4-4.9c-7.3-11.7-11-20.7-11-27 0-17.6 11.1-28.6 33.4-32.9l6.2 4.7 10.7 33.3 39.4 34.8c2.7 2.6 7.3 7.6 14 15l5.9 6.5c6.4 7.2 10.9 11.6 13.5 13.2 2.6 1.6 6.8 2.4 12.6 2.4h24.9c7.6 13.5 11.5 27.5 11.5 41.7 0 13.7-3.5 27.8-10.4 41.8zm-7-9.2c4.5-10.7 6.6-21 6.6-30.8 0-11.5-2.4-22.9-7.3-34.1-17.9 0-29-.9-33.6-2.7-4.6-1.7-11.4-8-20.5-18.6-3.6-4.1-9.1-10-16.3-17.4L99.7 49.2l-8.5-32.8C77 20.5 69.9 28.1 69.9 39.2c0 5.7 2.4 12 7.3 18.7l2.7 3.9c11.1 15.4 16.7 30 16.7 43.9l-5.8 2-1.7 3c-22.5 0-39.5 1.9-50.9 5.5-11.4 3.8-17.1 9.4-17.1 16.9 0 6.8 3 12.6 8.9 17.3 5.9 4.7 13.1 7.1 21.6 7.1l13 .1 38.6-14.4c-5.8-7.3-13.7-11-23.5-11-2.6 0-5.8.5-9.8 1.4-4 1-8.6 2.4-14.1 4.3l-10 .4-10-8.9 17.3-.2c5-1.7 9.5-3.1 13.7-3.9 4.1-.8 7.9-1.3 11.3-1.3 18.2 0 28.5 4.7 36.8 20l-4.3 5.8c8.9 3.6 12.8 10 17.7 19.1l-5.4 3c6.6 3.4 9.6 6.3 15.1 14.5l-10.2 8.1c7.2 4.4 10 7.6 14.4 15.6L119 222.8c4.2.7 7.9 1.1 10.8 1.1l8.3-3.2c18.9-9.1 34.2-14.1 46-27.1l29.5-2.9zM116.5 165c-4.9-5.5-10.9-9.1-17.9-10.6l-31.7 11.8H55.6c-10.7 0-18.8-1.3-24.3-3.8-1.8 2.1-2.7 4.2-2.7 6 0 3.6 2.2 6.3 6.5 8.2 4.3 1.8 10.8 2.7 19.5 2.7h22.6l39.3-14.3zm8.9 20.7c-.6-.7-1.2-1.3-1.7-1.8-3.4-3.3-7.5-5.9-12.1-7.7l-32.6 12-34.4-.2-.6 2.3c0 6.9 8.3 10.5 24.9 10.5h16l40.5-15.1zm4.5 23.9c-1-1-1.7-1.9-2.3-2.5-2.7-3.2-6.1-6-10.2-8.6l-30.5 11.3H61.3v1.1c0 7.9 12.9 11.8 26.7 11.8h7l34.9-13.1z"/></g></g></svg>
\ No newline at end of file
diff --git a/pix/s/sad.svg b/pix/s/sad.svg
index 49d578e14d4f7..aeda7d020ae61 100644
--- a/pix/s/sad.svg
+++ b/pix/s/sad.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_8);}.cls-2{fill:none;stroke-width:13px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_8" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="0.17" stop-color="#ddddfb" stop-opacity="0.94"/><stop offset="0.58" stop-color="#9292f4" stop-opacity="0.81"/><stop offset="0.86" stop-color="#6262ef" stop-opacity="0.73"/><stop offset="1" stop-color="#5050ed" stop-opacity="0.7"/></linearGradient></defs><title>sad</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M71,176c4.28-32.47,16.25-42,49-42s44.72,9.53,49,42" transform="translate(-0.25)"/><circle class="cls-3" cx="79.75" cy="81" r="16"/><circle class="cls-3" cx="159.75" cy="81" r="16"/><path class="cls-4" d="M68,81c-1-.81-2-17.56,19-21,17.84-2.93,25.53,17.88,25,19s-4.23-3.83-21-1C70.57,81.44,69,81.77,68,81Z" transform="translate(-0.25)"/><path class="cls-4" d="M172.88,81c1-.81,1-17.56-20-21-17.84-2.93-24.53,17.88-24,19s4.23-3.83,21-1C170.3,81.44,171.93,81.77,172.88,81Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_8);}.cls-2{fill:none;stroke-width:13px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_8" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="0.17" stop-color="#ddddfb" stop-opacity="0.94"/><stop offset="0.58" stop-color="#9292f4" stop-opacity="0.81"/><stop offset="0.86" stop-color="#6262ef" stop-opacity="0.73"/><stop offset="1" stop-color="#5050ed" stop-opacity="0.7"/></linearGradient></defs><title>sad</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M71,176c4.28-32.47,16.25-42,49-42s44.72,9.53,49,42" transform="translate(-0.25)"/><circle class="cls-3" cx="79.75" cy="81" r="16"/><circle class="cls-3" cx="159.75" cy="81" r="16"/><path class="cls-4" d="M68,81c-1-.81-2-17.56,19-21,17.84-2.93,25.53,17.88,25,19s-4.23-3.83-21-1C70.57,81.44,69,81.77,68,81Z" transform="translate(-0.25)"/><path class="cls-4" d="M172.88,81c1-.81,1-17.56-20-21-17.84-2.93-24.53,17.88-24,19s4.23-3.83,21-1C170.3,81.44,171.93,81.77,172.88,81Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/shy.svg b/pix/s/shy.svg
index 29041f3a98413..910bf198347ba 100644
--- a/pix/s/shy.svg
+++ b/pix/s/shy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:#fff;stroke-width:10px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>shy</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="179.75" cy="110.59" rx="37" ry="46.59"/><circle class="cls-3" cx="187.25" cy="138.5" r="18"/><ellipse class="cls-2" cx="94.75" cy="109.59" rx="37" ry="46.59"/><circle class="cls-3" cx="102.25" cy="137.5" r="18"/><path class="cls-4" d="M97.5,191.5c-1,.5,20,16,41,18,25.06,2.35,50-29,48.5-31.47-.41-.68-36.23,15.42-53,13.67C113.57,189.58,98.45,191,97.5,191.5Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:#fff;stroke-width:10px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>shy</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="179.75" cy="110.59" rx="37" ry="46.59"/><circle class="cls-3" cx="187.25" cy="138.5" r="18"/><ellipse class="cls-2" cx="94.75" cy="109.59" rx="37" ry="46.59"/><circle class="cls-3" cx="102.25" cy="137.5" r="18"/><path class="cls-4" d="M97.5,191.5c-1,.5,20,16,41,18,25.06,2.35,50-29,48.5-31.47-.41-.68-36.23,15.42-53,13.67C113.57,189.58,98.45,191,97.5,191.5Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/sleepy.svg b/pix/s/sleepy.svg
index 98d4bcccb71be..f6c4afb4436ac 100644
--- a/pix/s/sleepy.svg
+++ b/pix/s/sleepy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" preserveAspectRatio="xMinYMid meet"><style>.st0{display:none}.st1,.st2,.st3{stroke:#000;stroke-miterlimit:10}.st1{fill:url(#SVGID_1_);stroke-width:7}.st2,.st3{stroke-width:9}.st3{fill:none;stroke-width:13}.st4{fill:url(#SVGID_2_)}.st5{fill:#ff3;stroke:#000;stroke-miterlimit:10}</style><image width="15" height="15" xlink:href="288631B812BE011C.jpg" transform="scale(16)" overflow="visible" id="Ebene_1" class="st0"/><g id="Ebene_3"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="37.791" y1="38.666" x2="202.459" y2="203.334"><stop offset="0" stop-color="#d1d1d1"/><stop offset=".444" stop-color="#cfcfcf"/><stop offset=".604" stop-color="#c8c8c8"/><stop offset=".717" stop-color="#bdbdbd"/><stop offset=".809" stop-color="#acacac"/><stop offset=".888" stop-color="#969696"/><stop offset=".957" stop-color="#7b7b7b"/><stop offset="1" stop-color="#666"/></linearGradient><ellipse class="st1" cx="120.1" cy="121" rx="116.4" ry="116.5"/><path class="st2" d="M53 107c-1-.8 5-17.6 26-21 17.8-2.9 24.5 16.9 24 18-.5 1-7.2-15.8-24-13-20.4 3.4-25.1 16.8-26 16zM184.9 106c1-.8-5-17.6-26-21-17.8-2.9-24.5 16.9-24 18 .5 1 7.2-15.8 24-13 20.4 3.4 25.1 16.8 26 16z"/><path class="st3" d="M80.5 166.5h79"/><radialGradient id="SVGID_2_" cx="188.97" cy="150.362" r="19.526" gradientTransform="matrix(1.1463 0 0 1.2703 -32.124 -47.5)" gradientUnits="userSpaceOnUse"><stop offset=".224" stop-color="#ff0"/><stop offset="1" stop-color="#ff0" stop-opacity="0"/></radialGradient><circle class="st4" cx="184.5" cy="143.5" r="23.5"/><path class="st5" d="M183 70.4V58.7l33.8-41.8h-30V6H234v10.1l-35.3 43.5h36.7v10.9H183z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><style>.st0{display:none}.st1,.st2,.st3{stroke:#000;stroke-miterlimit:10}.st1{fill:url(#SVGID_1_);stroke-width:7}.st2,.st3{stroke-width:9}.st3{fill:none;stroke-width:13}.st4{fill:url(#SVGID_2_)}.st5{fill:#ff3;stroke:#000;stroke-miterlimit:10}</style><image width="15" height="15" xlink:href="288631B812BE011C.jpg" transform="scale(16)" overflow="visible" id="Ebene_1" class="st0"/><g id="Ebene_3"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="37.791" y1="38.666" x2="202.459" y2="203.334"><stop offset="0" stop-color="#d1d1d1"/><stop offset=".444" stop-color="#cfcfcf"/><stop offset=".604" stop-color="#c8c8c8"/><stop offset=".717" stop-color="#bdbdbd"/><stop offset=".809" stop-color="#acacac"/><stop offset=".888" stop-color="#969696"/><stop offset=".957" stop-color="#7b7b7b"/><stop offset="1" stop-color="#666"/></linearGradient><ellipse class="st1" cx="120.1" cy="121" rx="116.4" ry="116.5"/><path class="st2" d="M53 107c-1-.8 5-17.6 26-21 17.8-2.9 24.5 16.9 24 18-.5 1-7.2-15.8-24-13-20.4 3.4-25.1 16.8-26 16zM184.9 106c1-.8-5-17.6-26-21-17.8-2.9-24.5 16.9-24 18 .5 1 7.2-15.8 24-13 20.4 3.4 25.1 16.8 26 16z"/><path class="st3" d="M80.5 166.5h79"/><radialGradient id="SVGID_2_" cx="188.97" cy="150.362" r="19.526" gradientTransform="matrix(1.1463 0 0 1.2703 -32.124 -47.5)" gradientUnits="userSpaceOnUse"><stop offset=".224" stop-color="#ff0"/><stop offset="1" stop-color="#ff0" stop-opacity="0"/></radialGradient><circle class="st4" cx="184.5" cy="143.5" r="23.5"/><path class="st5" d="M183 70.4V58.7l33.8-41.8h-30V6H234v10.1l-35.3 43.5h36.7v10.9H183z"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/smiley.svg b/pix/s/smiley.svg
index 1c2d762699d9d..88ffe143106f9 100644
--- a/pix/s/smiley.svg
+++ b/pix/s/smiley.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:none;stroke-width:13px;}.cls-3{fill:#333;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>smiley</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M56,129c4.28,32.47,31.25,57,64,57s59.72-24.53,64-57" transform="translate(-0.25)"/><circle class="cls-3" cx="79.75" cy="96" r="16"/><circle class="cls-3" cx="159.75" cy="96" r="16"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:none;stroke-width:13px;}.cls-3{fill:#333;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>smiley</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M56,129c4.28,32.47,31.25,57,64,57s59.72-24.53,64-57" transform="translate(-0.25)"/><circle class="cls-3" cx="79.75" cy="96" r="16"/><circle class="cls-3" cx="159.75" cy="96" r="16"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/surprise.svg b/pix/s/surprise.svg
index d24ccbfca721e..895febaf0c954 100644
--- a/pix/s/surprise.svg
+++ b/pix/s/surprise.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1,.cls-2{stroke-width:7px;}.cls-1{fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:#fff;}.cls-4{stroke-width:12px;fill:url(#Unbenannter_Verlauf_7);}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient><linearGradient id="Unbenannter_Verlauf_7" x1="83.75" y1="166.5" x2="160.75" y2="166.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#adadad"/><stop offset="0.03" stop-color="#a4a4a4"/><stop offset="0.21" stop-color="#727272"/><stop offset="0.38" stop-color="#494949"/><stop offset="0.55" stop-color="#292929"/><stop offset="0.71" stop-color="#121212"/><stop offset="0.87" stop-color="#050505"/><stop offset="1"/></linearGradient></defs><title>surprise</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="83.67" cy="73" rx="33.92" ry="33"/><circle class="cls-3" cx="84.13" cy="73.46" r="8.25"/><ellipse class="cls-2" cx="153.67" cy="71" rx="33.92" ry="33"/><ellipse class="cls-4" cx="122.25" cy="166.5" rx="38.5" ry="32.5"/><circle class="cls-3" cx="154.13" cy="71.46" r="8.25"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1,.cls-2{stroke-width:7px;}.cls-1{fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:#fff;}.cls-4{stroke-width:12px;fill:url(#Unbenannter_Verlauf_7);}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient><linearGradient id="Unbenannter_Verlauf_7" x1="83.75" y1="166.5" x2="160.75" y2="166.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#adadad"/><stop offset="0.03" stop-color="#a4a4a4"/><stop offset="0.21" stop-color="#727272"/><stop offset="0.38" stop-color="#494949"/><stop offset="0.55" stop-color="#292929"/><stop offset="0.71" stop-color="#121212"/><stop offset="0.87" stop-color="#050505"/><stop offset="1"/></linearGradient></defs><title>surprise</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="83.67" cy="73" rx="33.92" ry="33"/><circle class="cls-3" cx="84.13" cy="73.46" r="8.25"/><ellipse class="cls-2" cx="153.67" cy="71" rx="33.92" ry="33"/><ellipse class="cls-4" cx="122.25" cy="166.5" rx="38.5" ry="32.5"/><circle class="cls-3" cx="154.13" cy="71.46" r="8.25"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/thoughtful.svg b/pix/s/thoughtful.svg
index 6ab158cb79f1a..8811b0f43b7e5 100644
--- a/pix/s/thoughtful.svg
+++ b/pix/s/thoughtful.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:#fff;stroke-width:10px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>thoughtful</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="79.75" cy="103.5" rx="27" ry="34"/><circle class="cls-3" cx="72.25" cy="91.5" r="16"/><ellipse class="cls-2" cx="159.75" cy="102" rx="27" ry="34"/><circle class="cls-3" cx="152.75" cy="89" r="16"/><path class="cls-4" d="M128,60c-1-.81,9-34.56,30-38,17.84-2.93,27.53,2.88,27,4s-10.23,4.17-27,7C137.57,36.44,129,60.77,128,60Z" transform="translate(-0.25 1)"/><path class="cls-4" d="M110,62c1-.81-9-34.56-30-38-17.83-2.93-27.53,2.88-27,4s10.24,4.17,27,7C100.38,38.44,109,62.77,110,62Z" transform="translate(-0.25 1)"/><path class="cls-4" d="M93.5,188.5c-1,.5,26-1,47,1,25.06,2.35,30.3-26.76,29.5-27.47-.59-.53-11.23,15.42-28,13.67C121.57,173.58,94.45,188,93.5,188.5Z" transform="translate(-0.25 1)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{fill:#fff;stroke-width:10px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>thoughtful</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><ellipse class="cls-2" cx="79.75" cy="103.5" rx="27" ry="34"/><circle class="cls-3" cx="72.25" cy="91.5" r="16"/><ellipse class="cls-2" cx="159.75" cy="102" rx="27" ry="34"/><circle class="cls-3" cx="152.75" cy="89" r="16"/><path class="cls-4" d="M128,60c-1-.81,9-34.56,30-38,17.84-2.93,27.53,2.88,27,4s-10.23,4.17-27,7C137.57,36.44,129,60.77,128,60Z" transform="translate(-0.25 1)"/><path class="cls-4" d="M110,62c1-.81-9-34.56-30-38-17.83-2.93-27.53,2.88-27,4s10.24,4.17,27,7C100.38,38.44,109,62.77,110,62Z" transform="translate(-0.25 1)"/><path class="cls-4" d="M93.5,188.5c-1,.5,26-1,47,1,25.06,2.35,30.3-26.76,29.5-27.47-.59-.53-11.23,15.42-28,13.67C121.57,173.58,94.45,188,93.5,188.5Z" transform="translate(-0.25 1)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/tongueout.svg b/pix/s/tongueout.svg
index 8c4b7051c592a..1b7887679db7f 100644
--- a/pix/s/tongueout.svg
+++ b/pix/s/tongueout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{stroke-width:6px;}.cls-4{fill:url(#Unbenannter_Verlauf_16);}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient><linearGradient id="Unbenannter_Verlauf_16" x1="35.05" y1="203.85" x2="106.08" y2="203.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="red"/><stop offset="1"/></linearGradient></defs><title>tongueout</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M69.5,130.5s-2,82.89,51,68c32-9,50-67,50-67-3,0,5,26-53,26C63.5,157.5,70.5,130.5,69.5,130.5Z" transform="translate(-0.25)"/><circle class="cls-3" cx="159.75" cy="81" r="16"/><circle class="cls-3" cx="80.75" cy="81" r="16"/><path class="cls-4" d="M95,170c-15.85-4.61-67.58,33.3-59,52,2.86,6.23,15.81,15.33,21,16,17.42,2.24,51-35.91,49-57C105.9,179.87,104.22,172.68,95,170Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-2{stroke-width:6px;}.cls-4{fill:url(#Unbenannter_Verlauf_16);}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient><linearGradient id="Unbenannter_Verlauf_16" x1="35.05" y1="203.85" x2="106.08" y2="203.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="red"/><stop offset="1"/></linearGradient></defs><title>tongueout</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><path class="cls-2" d="M69.5,130.5s-2,82.89,51,68c32-9,50-67,50-67-3,0,5,26-53,26C63.5,157.5,70.5,130.5,69.5,130.5Z" transform="translate(-0.25)"/><circle class="cls-3" cx="159.75" cy="81" r="16"/><circle class="cls-3" cx="80.75" cy="81" r="16"/><path class="cls-4" d="M95,170c-15.85-4.61-67.58,33.3-59,52,2.86,6.23,15.81,15.33,21,16,17.42,2.24,51-35.91,49-57C105.9,179.87,104.22,172.68,95,170Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/wideeyes.svg b/pix/s/wideeyes.svg
index 637e8babdd7cb..99b921df1250f 100644
--- a/pix/s/wideeyes.svg
+++ b/pix/s/wideeyes.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{stroke-width:5px;}.cls-4{fill:none;stroke-width:13px;}.cls-5{fill:#fff;stroke-width:8px;}.cls-6{stroke-width:0.75px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>wideeyes</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.75" cy="81" r="16"/><path class="cls-3" d="M62,100c-1-.81,5-20.56,26-24,17.84-2.93,21.53,13.88,21,15s-4.23-6.83-21-4C67.57,90.44,63,100.77,62,100Z" transform="translate(-0.25)"/><path class="cls-4" d="M72,162c-.5-.5,21.46,28.52,44,29,23.5.5,54.5-27.5,54-30" transform="translate(-0.25)"/><circle class="cls-5" cx="77.79" cy="87.14" r="39.77"/><circle class="cls-6" cx="76.45" cy="87.5" r="8.1"/><circle class="cls-5" cx="162.99" cy="87.14" r="39.77"/><circle class="cls-6" cx="164.05" cy="87.5" r="8.1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{stroke-width:5px;}.cls-4{fill:none;stroke-width:13px;}.cls-5{fill:#fff;stroke-width:8px;}.cls-6{stroke-width:0.75px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>wideeyes</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.75" cy="81" r="16"/><path class="cls-3" d="M62,100c-1-.81,5-20.56,26-24,17.84-2.93,21.53,13.88,21,15s-4.23-6.83-21-4C67.57,90.44,63,100.77,62,100Z" transform="translate(-0.25)"/><path class="cls-4" d="M72,162c-.5-.5,21.46,28.52,44,29,23.5.5,54.5-27.5,54-30" transform="translate(-0.25)"/><circle class="cls-5" cx="77.79" cy="87.14" r="39.77"/><circle class="cls-6" cx="76.45" cy="87.5" r="8.1"/><circle class="cls-5" cx="162.99" cy="87.14" r="39.77"/><circle class="cls-6" cx="164.05" cy="87.5" r="8.1"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/wink.svg b/pix/s/wink.svg
index 3776e6c59aff7..544ef20605c58 100644
--- a/pix/s/wink.svg
+++ b/pix/s/wink.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{fill:none;stroke-width:13px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>wink</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.75" cy="81" r="16"/><path class="cls-3" d="M71,161c8.5,31.5,31.5,27.5,57,27,32.74-.64,52.5-23.5,57-57" transform="translate(-0.25)"/><path class="cls-4" d="M62,100c-1-.81,5-20.56,26-24,17.84-2.93,21.53,13.88,21,15s-4.23-6.83-21-4C67.57,90.44,63,100.77,62,100Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 239.75 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><defs><style>.cls-1,.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-1{stroke-width:7px;fill:url(#Unbenannter_Verlauf_4);}.cls-3{fill:none;stroke-width:13px;}.cls-4{stroke-width:5px;}</style><linearGradient id="Unbenannter_Verlauf_4" x1="37.54" y1="37.67" x2="202.21" y2="202.33" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffe600"/><stop offset="0.4" stop-color="#fde501"/><stop offset="0.54" stop-color="#f8e005" stop-opacity="0.99"/><stop offset="0.64" stop-color="#eed80b" stop-opacity="0.97"/><stop offset="0.73" stop-color="#e0cc15" stop-opacity="0.94"/><stop offset="0.8" stop-color="#cdbd21" stop-opacity="0.9"/><stop offset="0.86" stop-color="#b7aa30" stop-opacity="0.86"/><stop offset="0.92" stop-color="#9c9342" stop-opacity="0.81"/><stop offset="0.97" stop-color="#7e7a56" stop-opacity="0.75"/><stop offset="1" stop-color="#666" stop-opacity="0.7"/></linearGradient></defs><title>wink</title><g id="Ebene_3" data-name="Ebene 3"><ellipse class="cls-1" cx="119.88" cy="120" rx="116.38" ry="116.5"/><circle class="cls-2" cx="159.75" cy="81" r="16"/><path class="cls-3" d="M71,161c8.5,31.5,31.5,27.5,57,27,32.74-.64,52.5-23.5,57-57" transform="translate(-0.25)"/><path class="cls-4" d="M62,100c-1-.81,5-20.56,26-24,17.84-2.93,21.53,13.88,21,15s-4.23-6.83-21-4C67.57,90.44,63,100.77,62,100Z" transform="translate(-0.25)"/></g></svg>
\ No newline at end of file
diff --git a/pix/s/yes.svg b/pix/s/yes.svg
index bd4c7fdd504d3..88cb4dd58a131 100644
--- a/pix/s/yes.svg
+++ b/pix/s/yes.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" preserveAspectRatio="xMinYMid meet"><style>.st0{display:none}.st1{display:inline;fill:url(#SVGID_1_);stroke:#000;stroke-width:.5;stroke-miterlimit:10}.st2{fill:url(#SVGID_2_)}.st3,.st4,.st5{stroke-miterlimit:10}.st3{fill:#e29b46;stroke-width:.5;stroke:#e29b46}.st4,.st5{stroke:#000}.st4{display:none;fill:none;stroke-width:13}.st5{stroke-width:.5}</style><image width="15" height="15" xlink:href="7EDB94106911D4A4.jpg" transform="scale(16)" overflow="visible" id="Ebene_1" class="st0"/><g id="Ebene_3"><g id="Ebene_4" class="st0"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1=".5" y1="120.5" x2="240.5" y2="120.5"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st1" d="M.5.5h240v240H.5z"/></g><linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.569" y1="120.274" x2="226.145" y2="120.274"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st2" d="M85.7 12.3c-13.5-2.5-20.5 3.2-25 18.7-1.6 5.7-2.1 11.5 5.7 24.7 10 17 11 19 20 46 1 3-7.2.8-22.7 2.3-17 1.6-42 5.7-50 22.7-4.2 9-2.7 17.8 10.3 27.8 0 0-10.5 10.2-3 21.7 8.2 12.6 13 6.8 13 6.8-.5 1.5-2.3 13.6 1 17.8 7 9 15.1 4.9 19.7 11.6 3.2 4.7 4.2 7.4 9.3 11.5 11 9 34 4.7 38.8 3.8 5.2-1 9.3 1.7 29.2-.1 11-1 42.5-23.1 52.7-29.2 5.9-3.5 34.2 3 33.5-5.8-2-24 20.2-29.5-1.8-72.5-2.1-4.1-8.1.1-21.7-.2-8.1-.2-8.6-1.1-10-1.4-7.3-1.6-12.7-5.2-15-8-12-14-18.6-20.6-34-37.3-13.4-14.6-21.9-18.5-29-26C88.7 28.3 95.2 18 91 11.7c-1.3-2-3.4 1-5.3.6z"/><path class="st3" d="M218.6 199.9l-31.8 3c-14.6 13.9-30.4 18.1-47.4 24.6-5.4.4-9.4 3.6-11.9 3.6-7.3 0-15.5-1.1-24.7-3.2l-7.6 3.2H86c-20.9 0-31.3-6.2-31.3-18.6 0-.7-5.9-1.7-5.6-3.2-15.3-1-17-7.1-17-18.2 0-1.2.1-2.8.4-4.9-5.7-1.3-10-3.4-12.8-6.4-2.9-2.9-4.4-6.6-4.4-11.1 0-3.6 1.5-7.5 4.7-11.6-7.6-6.8-11.5-14.4-11.5-22.8 0-9.7 6.3-17.4 19-23.4 12.6-5.8 29.4-8.8 50.2-8.8H83c-1.7-10.6-5.6-20.9-11.7-30.8l-3.4-4.9c-7.3-11.7-11-20.7-11-27 0-17.6 11.1-28.6 33.4-32.9l6.2 4.7 10.7 33.3 39.4 34.8c2.7 2.6 7.3 7.6 14 15l5.9 6.5c6.4 7.2 10.9 11.6 13.5 13.2 2.6 1.6 6.8 2.4 12.6 2.4h24.9c7.6 13.5 11.5 27.5 11.5 41.7 0 13.7-3.5 27.8-10.4 41.8zm-7-9.2c4.5-10.7 6.6-21 6.6-30.8 0-11.5-2.4-22.9-7.3-34.1-17.9 0-29-.9-33.6-2.7-4.6-1.7-11.4-8-20.5-18.6-3.6-4.1-9.1-10-16.3-17.4L97.7 49.2l-8.5-32.8C75 20.5 67.9 28.1 67.9 39.2c0 5.7 2.4 12 7.3 18.7l2.7 3.9c11.1 15.4 16.7 30 16.7 43.9l-5.8 2-1.7 3c-22.5 0-39.5 1.9-50.9 5.5-11.4 3.8-17.1 9.4-17.1 16.9 0 6.8 3 12.6 8.9 17.3 5.9 4.7 13.1 7.1 21.6 7.1l13 .1 38.6-14.4c-5.8-7.3-13.7-11-23.5-11-2.6 0-5.8.5-9.8 1.4-4 1-8.6 2.4-14.1 4.3l-10 .4-10-8.9 17.3-.2c5-1.7 9.5-3.1 13.7-3.9 4.1-.8 7.9-1.3 11.3-1.3 18.2 0 28.5 4.7 36.8 20l-4.3 5.8c8.9 3.6 12.8 10 17.7 19.1l-5.4 3c6.6 3.4 9.6 6.3 15.1 14.5l-10.2 8.1c7.2 4.4 10 7.6 14.4 15.6L117 222.8c4.2.7 7.9 1.1 10.8 1.1l8.3-3.2c18.9-9.1 34.2-14.1 46-27.1l29.5-2.9zM114.5 165c-4.9-5.5-10.9-9.1-17.9-10.6l-31.7 11.8H53.6c-10.7 0-18.8-1.3-24.3-3.8-1.8 2.1-2.7 4.2-2.7 6 0 3.6 2.2 6.3 6.5 8.2 4.3 1.8 10.8 2.7 19.5 2.7h22.6l39.3-14.3zm8.9 20.7c-.6-.7-1.2-1.3-1.7-1.8-3.4-3.3-7.5-5.9-12.1-7.7l-32.6 12-34.4-.2-.6 2.3c0 6.9 8.3 10.5 24.9 10.5h16l40.5-15.1zm4.5 23.9c-1-1-1.7-1.9-2.3-2.5-2.7-3.2-6.1-6-10.2-8.6l-30.5 11.3H59.3v1.1c0 7.9 12.9 11.8 26.7 11.8h7l34.9-13.1z" id="Layer_1"/><g id="Layer_1_1_" class="st0"><path class="st5" d="M220.6 199.9l-31.8 3c-14.6 13.9-30.4 18.1-47.4 24.6-5.4.4-9.4 3.6-11.9 3.6-7.3 0-15.5-1.1-24.7-3.2l-7.6 3.2H88c-20.9 0-31.3-6.2-31.3-18.6 0-.7-5.9-1.7-5.6-3.2-15.3-1-17-7.1-17-18.2 0-1.2.1-2.8.4-4.9-5.7-1.3-10-3.4-12.8-6.4-2.9-2.9-4.4-6.6-4.4-11.1 0-3.6 1.5-7.5 4.7-11.6-7.6-6.8-11.5-14.4-11.5-22.8 0-9.7 6.3-17.4 19-23.4 12.6-5.8 29.4-8.8 50.2-8.8H85c-1.7-10.6-5.6-20.9-11.7-30.8l-3.4-4.9c-7.3-11.7-11-20.7-11-27 0-17.6 11.1-28.6 33.4-32.9l6.2 4.7 10.7 33.3 39.4 34.8c2.7 2.6 7.3 7.6 14 15l5.9 6.5c6.4 7.2 10.9 11.6 13.5 13.2 2.6 1.6 6.8 2.4 12.6 2.4h24.9c7.6 13.5 11.5 27.5 11.5 41.7 0 13.7-3.5 27.8-10.4 41.8zm-7-9.2c4.5-10.7 6.6-21 6.6-30.8 0-11.5-2.4-22.9-7.3-34.1-17.9 0-29-.9-33.6-2.7-4.6-1.7-11.4-8-20.5-18.6-3.6-4.1-9.1-10-16.3-17.4L99.7 49.2l-8.5-32.8C77 20.5 69.9 28.1 69.9 39.2c0 5.7 2.4 12 7.3 18.7l2.7 3.9c11.1 15.4 16.7 30 16.7 43.9l-5.8 2-1.7 3c-22.5 0-39.5 1.9-50.9 5.5-11.4 3.8-17.1 9.4-17.1 16.9 0 6.8 3 12.6 8.9 17.3 5.9 4.7 13.1 7.1 21.6 7.1l13 .1 38.6-14.4c-5.8-7.3-13.7-11-23.5-11-2.6 0-5.8.5-9.8 1.4-4 1-8.6 2.4-14.1 4.3l-10 .4-10-8.9 17.3-.2c5-1.7 9.5-3.1 13.7-3.9 4.1-.8 7.9-1.3 11.3-1.3 18.2 0 28.5 4.7 36.8 20l-4.3 5.8c8.9 3.6 12.8 10 17.7 19.1l-5.4 3c6.6 3.4 9.6 6.3 15.1 14.5l-10.2 8.1c7.2 4.4 10 7.6 14.4 15.6L119 222.8c4.2.7 7.9 1.1 10.8 1.1l8.3-3.2c18.9-9.1 34.2-14.1 46-27.1l29.5-2.9zM116.5 165c-4.9-5.5-10.9-9.1-17.9-10.6l-31.7 11.8H55.6c-10.7 0-18.8-1.3-24.3-3.8-1.8 2.1-2.7 4.2-2.7 6 0 3.6 2.2 6.3 6.5 8.2 4.3 1.8 10.8 2.7 19.5 2.7h22.6l39.3-14.3zm8.9 20.7c-.6-.7-1.2-1.3-1.7-1.8-3.4-3.3-7.5-5.9-12.1-7.7l-32.6 12-34.4-.2-.6 2.3c0 6.9 8.3 10.5 24.9 10.5h16l40.5-15.1zm4.5 23.9c-1-1-1.7-1.9-2.3-2.5-2.7-3.2-6.1-6-10.2-8.6l-30.5 11.3H61.3v1.1c0 7.9 12.9 11.8 26.7 11.8h7l34.9-13.1z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 240 240" width="16" height="16" preserveAspectRatio="xMinYMid meet"><style>.st0{display:none}.st1{display:inline;fill:url(#SVGID_1_);stroke:#000;stroke-width:.5;stroke-miterlimit:10}.st2{fill:url(#SVGID_2_)}.st3,.st4,.st5{stroke-miterlimit:10}.st3{fill:#e29b46;stroke-width:.5;stroke:#e29b46}.st4,.st5{stroke:#000}.st4{display:none;fill:none;stroke-width:13}.st5{stroke-width:.5}</style><image width="15" height="15" xlink:href="7EDB94106911D4A4.jpg" transform="scale(16)" overflow="visible" id="Ebene_1" class="st0"/><g id="Ebene_3"><g id="Ebene_4" class="st0"><linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1=".5" y1="120.5" x2="240.5" y2="120.5"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st1" d="M.5.5h240v240H.5z"/></g><linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="11.569" y1="120.274" x2="226.145" y2="120.274"><stop offset="0" stop-color="#e6c1a8" stop-opacity=".9"/><stop offset="1" stop-color="#f7ac4b" stop-opacity=".9"/></linearGradient><path class="st2" d="M85.7 12.3c-13.5-2.5-20.5 3.2-25 18.7-1.6 5.7-2.1 11.5 5.7 24.7 10 17 11 19 20 46 1 3-7.2.8-22.7 2.3-17 1.6-42 5.7-50 22.7-4.2 9-2.7 17.8 10.3 27.8 0 0-10.5 10.2-3 21.7 8.2 12.6 13 6.8 13 6.8-.5 1.5-2.3 13.6 1 17.8 7 9 15.1 4.9 19.7 11.6 3.2 4.7 4.2 7.4 9.3 11.5 11 9 34 4.7 38.8 3.8 5.2-1 9.3 1.7 29.2-.1 11-1 42.5-23.1 52.7-29.2 5.9-3.5 34.2 3 33.5-5.8-2-24 20.2-29.5-1.8-72.5-2.1-4.1-8.1.1-21.7-.2-8.1-.2-8.6-1.1-10-1.4-7.3-1.6-12.7-5.2-15-8-12-14-18.6-20.6-34-37.3-13.4-14.6-21.9-18.5-29-26C88.7 28.3 95.2 18 91 11.7c-1.3-2-3.4 1-5.3.6z"/><path class="st3" d="M218.6 199.9l-31.8 3c-14.6 13.9-30.4 18.1-47.4 24.6-5.4.4-9.4 3.6-11.9 3.6-7.3 0-15.5-1.1-24.7-3.2l-7.6 3.2H86c-20.9 0-31.3-6.2-31.3-18.6 0-.7-5.9-1.7-5.6-3.2-15.3-1-17-7.1-17-18.2 0-1.2.1-2.8.4-4.9-5.7-1.3-10-3.4-12.8-6.4-2.9-2.9-4.4-6.6-4.4-11.1 0-3.6 1.5-7.5 4.7-11.6-7.6-6.8-11.5-14.4-11.5-22.8 0-9.7 6.3-17.4 19-23.4 12.6-5.8 29.4-8.8 50.2-8.8H83c-1.7-10.6-5.6-20.9-11.7-30.8l-3.4-4.9c-7.3-11.7-11-20.7-11-27 0-17.6 11.1-28.6 33.4-32.9l6.2 4.7 10.7 33.3 39.4 34.8c2.7 2.6 7.3 7.6 14 15l5.9 6.5c6.4 7.2 10.9 11.6 13.5 13.2 2.6 1.6 6.8 2.4 12.6 2.4h24.9c7.6 13.5 11.5 27.5 11.5 41.7 0 13.7-3.5 27.8-10.4 41.8zm-7-9.2c4.5-10.7 6.6-21 6.6-30.8 0-11.5-2.4-22.9-7.3-34.1-17.9 0-29-.9-33.6-2.7-4.6-1.7-11.4-8-20.5-18.6-3.6-4.1-9.1-10-16.3-17.4L97.7 49.2l-8.5-32.8C75 20.5 67.9 28.1 67.9 39.2c0 5.7 2.4 12 7.3 18.7l2.7 3.9c11.1 15.4 16.7 30 16.7 43.9l-5.8 2-1.7 3c-22.5 0-39.5 1.9-50.9 5.5-11.4 3.8-17.1 9.4-17.1 16.9 0 6.8 3 12.6 8.9 17.3 5.9 4.7 13.1 7.1 21.6 7.1l13 .1 38.6-14.4c-5.8-7.3-13.7-11-23.5-11-2.6 0-5.8.5-9.8 1.4-4 1-8.6 2.4-14.1 4.3l-10 .4-10-8.9 17.3-.2c5-1.7 9.5-3.1 13.7-3.9 4.1-.8 7.9-1.3 11.3-1.3 18.2 0 28.5 4.7 36.8 20l-4.3 5.8c8.9 3.6 12.8 10 17.7 19.1l-5.4 3c6.6 3.4 9.6 6.3 15.1 14.5l-10.2 8.1c7.2 4.4 10 7.6 14.4 15.6L117 222.8c4.2.7 7.9 1.1 10.8 1.1l8.3-3.2c18.9-9.1 34.2-14.1 46-27.1l29.5-2.9zM114.5 165c-4.9-5.5-10.9-9.1-17.9-10.6l-31.7 11.8H53.6c-10.7 0-18.8-1.3-24.3-3.8-1.8 2.1-2.7 4.2-2.7 6 0 3.6 2.2 6.3 6.5 8.2 4.3 1.8 10.8 2.7 19.5 2.7h22.6l39.3-14.3zm8.9 20.7c-.6-.7-1.2-1.3-1.7-1.8-3.4-3.3-7.5-5.9-12.1-7.7l-32.6 12-34.4-.2-.6 2.3c0 6.9 8.3 10.5 24.9 10.5h16l40.5-15.1zm4.5 23.9c-1-1-1.7-1.9-2.3-2.5-2.7-3.2-6.1-6-10.2-8.6l-30.5 11.3H59.3v1.1c0 7.9 12.9 11.8 26.7 11.8h7l34.9-13.1z" id="Layer_1"/><g id="Layer_1_1_" class="st0"><path class="st5" d="M220.6 199.9l-31.8 3c-14.6 13.9-30.4 18.1-47.4 24.6-5.4.4-9.4 3.6-11.9 3.6-7.3 0-15.5-1.1-24.7-3.2l-7.6 3.2H88c-20.9 0-31.3-6.2-31.3-18.6 0-.7-5.9-1.7-5.6-3.2-15.3-1-17-7.1-17-18.2 0-1.2.1-2.8.4-4.9-5.7-1.3-10-3.4-12.8-6.4-2.9-2.9-4.4-6.6-4.4-11.1 0-3.6 1.5-7.5 4.7-11.6-7.6-6.8-11.5-14.4-11.5-22.8 0-9.7 6.3-17.4 19-23.4 12.6-5.8 29.4-8.8 50.2-8.8H85c-1.7-10.6-5.6-20.9-11.7-30.8l-3.4-4.9c-7.3-11.7-11-20.7-11-27 0-17.6 11.1-28.6 33.4-32.9l6.2 4.7 10.7 33.3 39.4 34.8c2.7 2.6 7.3 7.6 14 15l5.9 6.5c6.4 7.2 10.9 11.6 13.5 13.2 2.6 1.6 6.8 2.4 12.6 2.4h24.9c7.6 13.5 11.5 27.5 11.5 41.7 0 13.7-3.5 27.8-10.4 41.8zm-7-9.2c4.5-10.7 6.6-21 6.6-30.8 0-11.5-2.4-22.9-7.3-34.1-17.9 0-29-.9-33.6-2.7-4.6-1.7-11.4-8-20.5-18.6-3.6-4.1-9.1-10-16.3-17.4L99.7 49.2l-8.5-32.8C77 20.5 69.9 28.1 69.9 39.2c0 5.7 2.4 12 7.3 18.7l2.7 3.9c11.1 15.4 16.7 30 16.7 43.9l-5.8 2-1.7 3c-22.5 0-39.5 1.9-50.9 5.5-11.4 3.8-17.1 9.4-17.1 16.9 0 6.8 3 12.6 8.9 17.3 5.9 4.7 13.1 7.1 21.6 7.1l13 .1 38.6-14.4c-5.8-7.3-13.7-11-23.5-11-2.6 0-5.8.5-9.8 1.4-4 1-8.6 2.4-14.1 4.3l-10 .4-10-8.9 17.3-.2c5-1.7 9.5-3.1 13.7-3.9 4.1-.8 7.9-1.3 11.3-1.3 18.2 0 28.5 4.7 36.8 20l-4.3 5.8c8.9 3.6 12.8 10 17.7 19.1l-5.4 3c6.6 3.4 9.6 6.3 15.1 14.5l-10.2 8.1c7.2 4.4 10 7.6 14.4 15.6L119 222.8c4.2.7 7.9 1.1 10.8 1.1l8.3-3.2c18.9-9.1 34.2-14.1 46-27.1l29.5-2.9zM116.5 165c-4.9-5.5-10.9-9.1-17.9-10.6l-31.7 11.8H55.6c-10.7 0-18.8-1.3-24.3-3.8-1.8 2.1-2.7 4.2-2.7 6 0 3.6 2.2 6.3 6.5 8.2 4.3 1.8 10.8 2.7 19.5 2.7h22.6l39.3-14.3zm8.9 20.7c-.6-.7-1.2-1.3-1.7-1.8-3.4-3.3-7.5-5.9-12.1-7.7l-32.6 12-34.4-.2-.6 2.3c0 6.9 8.3 10.5 24.9 10.5h16l40.5-15.1zm4.5 23.9c-1-1-1.7-1.9-2.3-2.5-2.7-3.2-6.1-6-10.2-8.6l-30.5 11.3H61.3v1.1c0 7.9 12.9 11.8 26.7 11.8h7l34.9-13.1z"/></g></g></svg>
\ No newline at end of file
diff --git a/portfolio/boxnet/db/upgrade.php b/portfolio/boxnet/db/upgrade.php
index 0d8fc59152d5d..1cde289354f7d 100644
--- a/portfolio/boxnet/db/upgrade.php
+++ b/portfolio/boxnet/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_portfolio_boxnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/portfolio/googledocs/db/upgrade.php b/portfolio/googledocs/db/upgrade.php
index 2f957c1f58e9f..0a9e08be3d891 100644
--- a/portfolio/googledocs/db/upgrade.php
+++ b/portfolio/googledocs/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/portfolio/picasa/db/upgrade.php b/portfolio/picasa/db/upgrade.php
index f745e0f4bf0d8..f006680cc5e72 100644
--- a/portfolio/picasa/db/upgrade.php
+++ b/portfolio/picasa/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_portfolio_picasa_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/privacy/classes/local/request/moodle_content_writer.php b/privacy/classes/local/request/moodle_content_writer.php
index ab0588d177370..1155afc8ea2e0 100644
--- a/privacy/classes/local/request/moodle_content_writer.php
+++ b/privacy/classes/local/request/moodle_content_writer.php
@@ -665,7 +665,7 @@ protected function write_html_data() {
         $navigationpage = new \core_privacy\output\exported_navigation_page(current($richtree));
         $navigationhtml = $output->render_navigation($navigationpage);
 
-        $systemname = $SITE->fullname;
+        $systemname = format_string($SITE->fullname, true, ['context' => \context_system::instance()]);
         $fullusername = fullname($USER);
         $siteurl = $CFG->wwwroot;
 
diff --git a/privacy/export_files/general.js b/privacy/export_files/general.js
index b88786184afcf..11fe97ccf8601 100644
--- a/privacy/export_files/general.js
+++ b/privacy/export_files/general.js
@@ -62,7 +62,7 @@ function loadContent(datafile, callback) {
     }
 
     newscript.type = 'text/javascript';
-    newscript.src = data;
+    newscript.src = encodeURIComponent(data);
     newscript.charset = 'utf-8';
     document.getElementsByTagName("head")[0].appendChild(newscript);
 
@@ -135,4 +135,4 @@ window.$(document).ready(function() {
         e.stopPropagation();
         handleClick(window.$(this));
     });
-});
\ No newline at end of file
+});
diff --git a/privacy/tests/approved_contextlist_test.php b/privacy/tests/approved_contextlist_test.php
index 45f6ad5c78954..a5057f0232df1 100644
--- a/privacy/tests/approved_contextlist_test.php
+++ b/privacy/tests/approved_contextlist_test.php
@@ -42,7 +42,6 @@ class approved_contextlist_test extends advanced_testcase {
      * The approved contextlist should not be modifiable once set.
      *
      * @covers ::__construct
-     * @covers ::<!public>
      * @covers \core_privacy\local\request\approved_contextlist<extended>
      */
     public function test_default_values_set() {
diff --git a/privacy/tests/approved_userlist_test.php b/privacy/tests/approved_userlist_test.php
index 3be87c74e27c3..f78e44145070b 100644
--- a/privacy/tests/approved_userlist_test.php
+++ b/privacy/tests/approved_userlist_test.php
@@ -43,7 +43,6 @@ class approved_userlist_test extends advanced_testcase {
      *
      * @covers ::__construct
      * @covers \core_privacy\local\request\approved_userlist<extended>
-     * @covers ::<!public>
      */
     public function test_default_values_set() {
         $this->resetAfterTest();
@@ -76,7 +75,6 @@ public function test_default_values_set() {
     /**
      * @covers ::create_from_userlist
      * @covers \core_privacy\local\request\approved_userlist<extended>
-     * @covers ::<!public>
      */
     public function test_create_from_userlist() {
         $this->resetAfterTest();
diff --git a/privacy/tests/collection_test.php b/privacy/tests/collection_test.php
index b7403f7e1ce90..069867042c370 100644
--- a/privacy/tests/collection_test.php
+++ b/privacy/tests/collection_test.php
@@ -43,7 +43,6 @@ class core_privacy_metadata_collection extends advanced_testcase {
      * Test that adding an unknown type causes the type to be added to the collection.
      *
      * @covers ::add_type
-     * @covers ::<!public>
      */
     public function test_add_type_generic_type() {
         $collection = new collection('core_privacy');
@@ -61,7 +60,6 @@ public function test_add_type_generic_type() {
      * Test that adding a known type works as anticipated.
      *
      * @covers ::add_type
-     * @covers ::<!public>
      */
     public function test_add_type_known_type() {
         $collection = new collection('core_privacy');
@@ -78,7 +76,6 @@ public function test_add_type_known_type() {
      * Test that adding multiple types returns them all.
      *
      * @covers ::add_type
-     * @covers ::<!public>
      */
     public function test_add_type_multiple() {
         $collection = new collection('core_privacy');
@@ -97,7 +94,6 @@ public function test_add_type_multiple() {
      * Test that the add_database_table function adds a database table.
      *
      * @covers ::add_database_table
-     * @covers ::<!public>
      */
     public function test_add_database_table() {
         $collection = new collection('core_privacy');
@@ -121,7 +117,6 @@ public function test_add_database_table() {
      * Test that the add_user_preference function adds a single user preference.
      *
      * @covers ::add_user_preference
-     * @covers ::<!public>
      */
     public function test_add_user_preference() {
         $collection = new collection('core_privacy');
@@ -143,7 +138,6 @@ public function test_add_user_preference() {
      * Test that the link_external_location function links an external location.
      *
      * @covers ::link_external_location
-     * @covers ::<!public>
      */
     public function test_link_external_location() {
         $collection = new collection('core_privacy');
@@ -167,7 +161,6 @@ public function test_link_external_location() {
      * Test that the link_subsystem function links the subsystem.
      *
      * @covers ::link_subsystem
-     * @covers ::<!public>
      */
     public function test_link_subsystem() {
         $collection = new collection('core_privacy');
@@ -189,7 +182,6 @@ public function test_link_subsystem() {
      * Test that the link_plugintype function links the plugin.
      *
      * @covers ::link_plugintype
-     * @covers ::<!public>
      */
     public function test_link_plugintype() {
         $collection = new collection('core_privacy');
@@ -227,7 +219,6 @@ public function component_list_provider() {
      * @dataProvider component_list_provider
      * @param   string  $component The component to test
      * @covers ::get_component
-     * @covers ::<!public>
      */
     public function test_get_component($component) {
         $collection = new collection($component);
diff --git a/privacy/tests/contextlist_base_test.php b/privacy/tests/contextlist_base_test.php
index 742ec33b8180e..851710e55333a 100644
--- a/privacy/tests/contextlist_base_test.php
+++ b/privacy/tests/contextlist_base_test.php
@@ -45,7 +45,6 @@ class contextlist_base_test extends advanced_testcase {
      * @param   array   $expected list of contextids
      * @param   int     $count Expected count
      * @covers ::get_contextids
-     * @covers ::<!public>
      */
     public function test_get_contextids($input, $expected, $count) {
         $uit = new test_contextlist_base();
@@ -89,7 +88,6 @@ public function get_contextids_provider() {
      * Ensure that get_contexts returns the correct list of contexts.
      *
      * @covers ::get_contexts
-     * @covers ::<!public>
      */
     public function test_get_contexts() {
         global $DB;
@@ -121,7 +119,6 @@ public function test_get_contexts() {
      * @param   array   $expected list of contextids
      * @param   int     $count Expected count
      * @covers ::count
-     * @covers ::<!public>
      */
     public function test_countable($input, $expected, $count) {
         $uit = new test_contextlist_base();
@@ -138,7 +135,6 @@ public function test_countable($input, $expected, $count) {
      * @covers ::next
      * @covers ::rewind
      * @covers ::valid
-     * @covers ::<!public>
      */
     public function test_context_iteration() {
         global $DB;
@@ -161,7 +157,6 @@ public function test_context_iteration() {
      * Test that deleting a context results in current returning nothing.
      *
      * @covers ::current
-     * @covers ::<!public>
      */
     public function test_current_context_one_context() {
         global $DB;
@@ -191,7 +186,6 @@ public function test_current_context_one_context() {
      * Test that deleting a context results in the next record being returned.
      *
      * @covers ::current
-     * @covers ::<!public>
      */
     public function test_current_context_two_contexts() {
         global $DB;
@@ -229,7 +223,6 @@ public function test_current_context_two_contexts() {
      * Test that if there are no non-deleted contexts that nothing is returned.
      *
      * @covers ::get_contexts
-     * @covers ::<!public>
      */
     public function test_get_contexts_all_deleted() {
         global $DB;
@@ -257,7 +250,6 @@ public function test_get_contexts_all_deleted() {
      * Test that get_contexts() returns only active contexts.
      *
      * @covers ::get_contexts
-     * @covers ::<!public>
      */
     public function test_get_contexts_one_deleted() {
         global $DB;
diff --git a/privacy/tests/contextlist_collection_test.php b/privacy/tests/contextlist_collection_test.php
index 2eaf5daa5d5ce..2d75eb8f360bf 100644
--- a/privacy/tests/contextlist_collection_test.php
+++ b/privacy/tests/contextlist_collection_test.php
@@ -43,7 +43,6 @@ class contextlist_collection_test extends advanced_testcase {
      * A contextlist_collection should support the contextlist type.
      *
      * @covers ::add_contextlist
-     * @covers ::<!public>
      */
     public function test_supports_contextlist() {
         $uit = new contextlist_collection(1);
@@ -58,7 +57,6 @@ public function test_supports_contextlist() {
      * A contextlist_collection should support the approved_contextlist type.
      *
      * @covers ::add_contextlist
-     * @covers ::<!public>
      */
     public function test_supports_approved_contextlist() {
         $uit = new contextlist_collection(1);
@@ -73,7 +71,6 @@ public function test_supports_approved_contextlist() {
      * Ensure that get_contextlist_for_component returns the correct contextlist.
      *
      * @covers ::get_contextlist_for_component
-     * @covers ::<!public>
      */
     public function test_get_contextlist_for_component() {
         $uit = new contextlist_collection(1);
@@ -95,7 +92,6 @@ public function test_get_contextlist_for_component() {
      * Ensure that get_contextlist_for_component does not die horribly when querying a non-existent component.
      *
      * @covers ::get_contextlist_for_component
-     * @covers ::<!public>
      */
     public function test_get_contextlist_for_component_not_found() {
         $uit = new contextlist_collection(1);
@@ -107,7 +103,6 @@ public function test_get_contextlist_for_component_not_found() {
      * Ensure that a duplicate contextlist in the collection throws an Exception.
      *
      * @covers ::add_contextlist
-     * @covers ::<!public>
      */
     public function test_duplicate_addition_throws() {
         $uit = new contextlist_collection(1);
@@ -124,7 +119,6 @@ public function test_duplicate_addition_throws() {
      * Ensure that the contextlist_collection is countable.
      *
      * @covers ::count
-     * @covers ::<!public>
      */
     public function test_countable() {
         $uit = new contextlist_collection(1);
@@ -148,7 +142,6 @@ public function test_countable() {
      * @covers ::next
      * @covers ::rewind
      * @covers ::valid
-     * @covers ::<!public>
      */
     public function test_iteration() {
         $uit = new contextlist_collection(1);
@@ -184,7 +177,6 @@ public function test_iteration() {
      * Test that the userid is correctly returned.
      *
      * @covers ::get_userid
-     * @covers ::<!public>
      */
     public function test_get_userid() {
         $uit = new contextlist_collection(1);
diff --git a/privacy/tests/contextlist_test.php b/privacy/tests/contextlist_test.php
index 26bc701e9504d..13db8120a5bcf 100644
--- a/privacy/tests/contextlist_test.php
+++ b/privacy/tests/contextlist_test.php
@@ -42,7 +42,6 @@ class contextlist_test extends advanced_testcase {
      * Ensure that valid SQL results in the relevant contexts being added.
      *
      * @covers ::add_from_sql
-     * @covers ::<!public>
      */
     public function test_add_from_sql() {
         global $DB;
@@ -61,7 +60,6 @@ public function test_add_from_sql() {
      * Ensure that valid system context id is added.
      *
      * @covers ::add_system_context
-     * @covers ::<!public>
      */
     public function test_add_system_context() {
         $cl = new contextlist();
@@ -78,7 +76,6 @@ public function test_add_system_context() {
      * Ensure that a valid user context id is added.
      *
      * @covers ::add_user_context
-     * @covers ::<!public>
      */
     public function test_add_user_context() {
         $this->resetAfterTest();
@@ -100,7 +97,6 @@ public function test_add_user_context() {
      * Ensure that valid user contexts are added.
      *
      * @covers ::add_user_contexts
-     * @covers ::<!public>
      */
     public function test_add_user_contexts() {
         $this->resetAfterTest();
@@ -126,7 +122,6 @@ public function test_add_user_contexts() {
      * @param string $sql Input SQL we try to extract the context id field name from.
      * @param string $expected Expected detected value.
      * @covers ::guess_id_field_from_sql
-     * @covers ::<!public>
      */
     public function test_guess_id_field_from_sql($sql, $expected) {
 
diff --git a/privacy/tests/manager_test.php b/privacy/tests/manager_test.php
index 633ecfe083dbf..eb1a0551df7c9 100644
--- a/privacy/tests/manager_test.php
+++ b/privacy/tests/manager_test.php
@@ -69,7 +69,6 @@ protected function get_mock_manager_with_core_components($componentnames) {
      * Test collection of metadata for components implementing a metadata provider.
      *
      * @covers ::get_metadata_for_components
-     * @covers ::<!public>
      */
     public function test_get_metadata_for_components() {
         // Get a mock manager, in which the core components list is mocked to include all mock plugins.
@@ -93,7 +92,6 @@ public function test_get_metadata_for_components() {
      * Test that get_contexts_for_userid() only returns contextlist collections for core providers.
      *
      * @covers ::get_contexts_for_userid
-     * @covers ::<!public>
      */
     public function test_get_contexts_for_userid() {
         // Get a mock manager, in which the core components list is mocked to include all mock plugins.
@@ -121,7 +119,6 @@ public function test_get_contexts_for_userid() {
      * Test verifying the output of component_is_compliant.
      *
      * @covers ::component_is_compliant
-     * @covers ::<!public>
      */
     public function test_component_is_compliant() {
         // Get a mock manager, in which the core components list is mocked to include all mock plugins.
@@ -168,7 +165,6 @@ public function component_is_compliant_provider() {
      * @param   string  $component
      * @param   boolean $expected
      * @covers ::component_is_compliant
-     * @covers ::<!public>
      */
     public function test_component_is_compliant_examples($component, $expected) {
         $manager = new \core_privacy\manager();
@@ -180,7 +176,6 @@ public function test_component_is_compliant_examples($component, $expected) {
      *  Test verifying only approved contextlists can be used with the export_user_data method.
      *
      * @covers ::export_user_data
-     * @covers ::<!public>
      */
     public function test_export_user_data() {
         // Get a mock manager, in which the core components list is mocked to include all mock plugins.
@@ -216,7 +211,6 @@ public function test_export_user_data() {
      *  Test verifying only approved contextlists can be used with the delete_data_for_user method.
      *
      * @covers ::delete_data_for_user
-     * @covers ::<!public>
      */
     public function test_delete_data_for_user() {
         $this->resetAfterTest();
@@ -250,7 +244,6 @@ public function test_delete_data_for_user() {
      * This really just checks that all providers can be safely autoloaded.
      *
      * @covers ::get_metadata_for_components
-     * @covers ::<!public>
      */
     public function test_installed_plugins() {
         $manager = new \core_privacy\manager();
@@ -262,7 +255,6 @@ public function test_installed_plugins() {
      * Test that the reason for the null provider is returned.
      *
      * @covers ::get_null_provider_reason
-     * @covers ::<!public>
      */
     public function test_get_null_provider_reason() {
         $manager = new \core_privacy\manager();
@@ -277,7 +269,6 @@ public function test_get_null_provider_reason() {
      * Test that manager::plugintype_class_callback() can be executed.
      *
      * @covers ::plugintype_class_callback
-     * @covers ::<!public>
      */
     public function test_plugintype_class_callback() {
         \core_privacy\manager::plugintype_class_callback('doesnotexist', 'unusable', 'foo', ['bar']);
@@ -287,7 +278,6 @@ public function test_plugintype_class_callback() {
      * Test that manager::component_class_callback() can be executed.
      *
      * @covers ::component_class_callback
-     * @covers ::<!public>
      */
     public function test_component_class_callback() {
         \core_privacy\manager::component_class_callback('foo_bar', 'unusable', 'foo', ['bar']);
@@ -300,7 +290,6 @@ public function test_component_class_callback() {
      * @param   string  $component
      * @param   bool    $expected
      * @covers ::is_empty_subsystem
-     * @covers ::<!public>
      */
     public function test_is_empty_subsystem($component, $expected) {
         $this->assertEquals($expected, \core_privacy\manager::is_empty_subsystem($component));
@@ -340,7 +329,6 @@ public function is_empty_subsystem_provider() {
      * Test that get_contexts_for_userid() with a failing item.
      *
      * @covers ::get_contexts_for_userid
-     * @covers ::<!public>
      */
     public function test_get_contexts_for_userid_with_failing() {
         // Get a mock manager, in which the core components list is mocked to include all mock plugins.
@@ -378,7 +366,6 @@ public function test_get_contexts_for_userid_with_failing() {
      * Test that export_user_data() with a failing item.
      *
      * @covers ::export_user_data
-     * @covers ::<!public>
      */
     public function test_export_user_data_with_failing() {
         $user = \core_user::get_user_by_username('admin');
@@ -414,7 +401,6 @@ public function test_export_user_data_with_failing() {
      * Test that delete_data_for_user() with a failing item.
      *
      * @covers ::delete_data_for_user
-     * @covers ::<!public>
      */
     public function test_delete_data_for_user_with_failing() {
         $user = \core_user::get_user_by_username('admin');
@@ -450,7 +436,6 @@ public function test_delete_data_for_user_with_failing() {
      * Test that delete_data_for_all_users_in_context() with a failing item.
      *
      * @covers ::delete_data_for_all_users_in_context
-     * @covers ::<!public>
      */
     public function test_delete_data_for_all_users_in_context_with_failing() {
         $user = \core_user::get_user_by_username('admin');
@@ -481,7 +466,6 @@ public function test_delete_data_for_all_users_in_context_with_failing() {
      * Test that get_metadata_for_components() with a failing item.
      *
      * @covers ::get_metadata_for_components
-     * @covers ::<!public>
      */
     public function test_get_metadata_for_components_with_failing() {
         $user = \core_user::get_user_by_username('admin');
diff --git a/privacy/tests/moodle_content_writer_test.php b/privacy/tests/moodle_content_writer_test.php
index 84824c5e27c8b..57ada5599508d 100644
--- a/privacy/tests/moodle_content_writer_test.php
+++ b/privacy/tests/moodle_content_writer_test.php
@@ -45,7 +45,6 @@ class moodle_content_writer_test extends advanced_testcase {
      * @dataProvider export_data_provider
      * @param   \stdClass  $data Data
      * @covers ::export_data
-     * @covers ::<!public>
      */
     public function test_export_data($data) {
         $context = \context_system::instance();
@@ -71,7 +70,6 @@ public function test_export_data($data) {
      * @dataProvider export_data_provider
      * @param   \stdClass  $data Data
      * @covers ::export_data
-     * @covers ::<!public>
      */
     public function test_export_data_different_context($data) {
         $context = \context_user::instance(\core_user::get_user_by_username('admin')->id);
@@ -95,7 +93,6 @@ public function test_export_data_different_context($data) {
      * Test that exported is saved within the correct directory locations.
      *
      * @covers ::export_data
-     * @covers ::<!public>
      */
     public function test_export_data_writes_to_multiple_context() {
         $subcontext = ['sub', 'context'];
@@ -140,7 +137,6 @@ public function test_export_data_writes_to_multiple_context() {
      * Test that multiple writes to the same location cause the latest version to be written.
      *
      * @covers ::export_data
-     * @covers ::<!public>
      */
     public function test_export_data_multiple_writes_same_context() {
         $subcontext = ['sub', 'context'];
@@ -197,7 +193,6 @@ public function export_data_provider() {
      * @param   string  $value Value
      * @param   string  $description Description
      * @covers ::export_metadata
-     * @covers ::<!public>
      */
     public function test_export_metadata($key, $value, $description) {
         $context = \context_system::instance();
@@ -223,7 +218,6 @@ public function test_export_metadata($key, $value, $description) {
      * Test that metadata can be set additively.
      *
      * @covers ::export_metadata
-     * @covers ::<!public>
      */
     public function test_export_metadata_additive() {
         $context = \context_system::instance();
@@ -260,7 +254,6 @@ public function test_export_metadata_additive() {
      * Test that metadata can be set additively.
      *
      * @covers ::export_metadata
-     * @covers ::<!public>
      */
     public function test_export_metadata_to_multiple_contexts() {
         $systemcontext = \context_system::instance();
@@ -339,7 +332,6 @@ public function export_metadata_provider() {
      * Exporting a single stored_file should cause that file to be output in the files directory.
      *
      * @covers ::export_area_files
-     * @covers ::<!public>
      */
     public function test_export_area_files() {
         $this->resetAfterTest();
@@ -446,7 +438,6 @@ public function test_export_area_files() {
      * @param   string  $content Content
      *
      * @covers ::export_file
-     * @covers ::<!public>
      */
     public function test_export_file($filearea, $itemid, $filepath, $filename, $content) {
         $this->resetAfterTest();
@@ -544,7 +535,6 @@ public function export_file_provider() {
      * @param   string      $value Value
      * @param   string      $desc Description
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_context_user($component, $key, $value, $desc) {
         $admin = \core_user::get_user_by_username('admin');
@@ -578,7 +568,6 @@ public function test_export_user_preference_context_user($component, $key, $valu
      * @param   string      $value Value
      * @param   string      $desc Description
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_context_coursecat($component, $key, $value, $desc) {
         global $DB;
@@ -613,7 +602,6 @@ public function test_export_user_preference_context_coursecat($component, $key,
      * @param   string      $value Value
      * @param   string      $desc Description
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_context_course($component, $key, $value, $desc) {
         global $DB;
@@ -649,7 +637,6 @@ public function test_export_user_preference_context_course($component, $key, $va
      * @param   string      $value Value
      * @param   string      $desc Description
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_context_module($component, $key, $value, $desc) {
         global $DB;
@@ -686,7 +673,6 @@ public function test_export_user_preference_context_module($component, $key, $va
      * @param   string      $value Value
      * @param   string      $desc Description
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_context_block($component, $key, $value, $desc) {
         global $DB;
@@ -718,7 +704,6 @@ public function test_export_user_preference_context_block($component, $key, $val
      * files.
      *
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_context_block_multiple_instances() {
         $this->resetAfterTest();
@@ -781,7 +766,6 @@ public function test_export_user_preference_context_block_multiple_instances() {
      * @param   string      $desc Description
      *
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_context_system($component, $key, $value, $desc) {
         $context = \context_system::instance();
@@ -806,7 +790,6 @@ public function test_export_user_preference_context_system($component, $key, $va
      * User preferences can be exported against the system.
      *
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_multiple_user_preference_context_system() {
         $context = \context_system::instance();
@@ -841,7 +824,6 @@ public function test_export_multiple_user_preference_context_system() {
      * User preferences can be exported against the system.
      *
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_replace() {
         $context = \context_system::instance();
@@ -905,7 +887,6 @@ public function export_user_preference_provider() {
      * @dataProvider unescaped_unicode_export_provider
      * @param string $text
      * @covers ::export_data
-     * @covers ::<!public>
      */
     public function test_export_data_unescaped_unicode($text) {
         $context = \context_system::instance();
@@ -933,7 +914,6 @@ public function test_export_data_unescaped_unicode($text) {
      * @dataProvider unescaped_unicode_export_provider
      * @param string $text
      * @covers ::export_metadata
-     * @covers ::<!public>
      */
     public function test_export_metadata_unescaped_unicode($text) {
         $context = \context_system::instance();
@@ -962,7 +942,6 @@ public function test_export_metadata_unescaped_unicode($text) {
      * @dataProvider unescaped_unicode_export_provider
      * @param string $text
      * @covers ::export_related_data
-     * @covers ::<!public>
      */
     public function test_export_related_data_unescaped_unicode($text) {
         $context = \context_system::instance();
@@ -990,7 +969,6 @@ public function test_export_related_data_unescaped_unicode($text) {
      * @dataProvider unescaped_unicode_export_provider
      * @param string $text
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_unescaped_unicode($text) {
         $context = \context_system::instance();
@@ -1033,7 +1011,6 @@ public function unescaped_unicode_export_provider() {
      * @param string $text
      *
      * @covers ::export_data
-     * @covers ::<!public>
      */
     public function test_export_data_long_filename($longtext, $expected, $text) {
         $context = \context_system::instance();
@@ -1066,7 +1043,6 @@ public function test_export_data_long_filename($longtext, $expected, $text) {
      * @param string $text
      *
      * @covers ::export_related_data
-     * @covers ::<!public>
      */
     public function test_export_related_data_long_filename($longtext, $expected, $text) {
         $context = \context_system::instance();
@@ -1246,7 +1222,6 @@ protected function get_context_path($context, $subcontext = null, $name = '') {
      * @param string $input Raw text as stored in the database.
      * @param string $expectedoutput Expected output of URL rewriting.
      * @covers ::rewrite_pluginfile_urls
-     * @covers ::<!public>
      */
     public function test_rewrite_pluginfile_urls($filearea, $itemid, $input, $expectedoutput) {
 
diff --git a/privacy/tests/writer_test.php b/privacy/tests/writer_test.php
index d37c4621faddd..be8bb465cca95 100644
--- a/privacy/tests/writer_test.php
+++ b/privacy/tests/writer_test.php
@@ -53,7 +53,6 @@ public function tearDown() {
      * Test that calling with_context multiple times will return the same write instance.
      *
      * @covers ::with_context
-     * @covers ::<!public>
      */
     public function test_with_context() {
         $writer = writer::with_context(\context_system::instance());
@@ -65,7 +64,6 @@ public function test_with_context() {
      * Test that calling with_context multiple times will return the same write instance.
      *
      * @covers ::with_context
-     * @covers ::<!public>
      */
     public function test_with_context_different_context_same_instance() {
         $writer = writer::with_context(\context_system::instance());
@@ -77,7 +75,6 @@ public function test_with_context_different_context_same_instance() {
      * Test that calling writer::reset() causes a new copy of the writer to be returned.
      *
      * @covers ::reset
-     * @covers ::<!public>
      */
     public function test_reset() {
         $writer = writer::with_context(\context_system::instance());
@@ -90,7 +87,6 @@ public function test_reset() {
      * Test that the export_user_preference calls the writer against the system context.
      *
      * @covers ::export_user_preference
-     * @covers ::<!public>
      */
     public function test_export_user_preference_sets_system_context() {
         $writer = writer::with_context(\context_user::instance(\core_user::get_user_by_username('admin')->id));
diff --git a/question/behaviour/interactive/behaviour.php b/question/behaviour/interactive/behaviour.php
index b58f0fce406d0..c9d8564c277a3 100644
--- a/question/behaviour/interactive/behaviour.php
+++ b/question/behaviour/interactive/behaviour.php
@@ -32,7 +32,7 @@
  * Question behaviour for the interactive model.
  *
  * Each question has a submit button next to it which the student can use to
- * submit it. Once the qustion is submitted, it is not possible for the
+ * submit it. Once the question is submitted, it is not possible for the
  * student to change their answer any more, but the student gets full feedback
  * straight away.
  *
@@ -41,14 +41,17 @@
  */
 class qbehaviour_interactive extends question_behaviour_with_multiple_tries {
     /**
-     * Special value used for {@link question_display_options::$readonly when
-     * we are showing the try again button to the student during an attempt.
-     * The particular number was chosen randomly. PHP will treat it the same
-     * as true, but in the renderer we reconginse it display the try again
-     * button enabled even though the rest of the question is disabled.
-     * @var integer
+     * Constant used only in {@link adjust_display_options()} below and
+     * {@link (qbehaviour_interactive_renderer}.
+     * @var int
      */
-    const READONLY_EXCEPT_TRY_AGAIN = 23485299;
+    const TRY_AGAIN_VISIBLE = 0x10;
+    /**
+     * Constant used only in {@link adjust_display_options()} below and
+     * {@link (qbehaviour_interactive_renderer}.
+     * @var int
+     */
+    const TRY_AGAIN_VISIBLE_READONLY = 0x11;
 
     public function is_compatible_question(question_definition $question) {
         return $question instanceof question_automatically_gradable;
@@ -82,6 +85,14 @@ public function adjust_display_options(question_display_options $options) {
             return;
         }
 
+        // The question in in a try-again state. We need the to let the renderer know this.
+        // The API for question-rendering is defined by the question engine, but we
+        // don't want to add logic in the renderer, so we are limited in how we can do this.
+        // However, when the question is in this state, all the question-type controls
+        // need to be rendered read-only. Therefore, we can conveniently pass this information
+        // by setting special true-like values in $options->readonly (but this is a bit of a hack).
+        $options->readonly = $options->readonly ? self::TRY_AGAIN_VISIBLE_READONLY : self::TRY_AGAIN_VISIBLE;
+
         // Let the hint adjust the options.
         $hint = $this->get_applicable_hint();
         if (!is_null($hint)) {
@@ -93,12 +104,6 @@ public function adjust_display_options(question_display_options $options) {
         parent::adjust_display_options($options);
         $options->feedback = $save->feedback;
         $options->numpartscorrect = $save->numpartscorrect;
-
-        // In a try-again state, everything except the try again button
-        // Should be read-only. This is a mild hack to achieve this.
-        if (!$options->readonly) {
-            $options->readonly = self::READONLY_EXCEPT_TRY_AGAIN;
-        }
     }
 
     public function get_applicable_hint() {
diff --git a/question/behaviour/interactive/renderer.php b/question/behaviour/interactive/renderer.php
index 89c5d9c8928c5..86681d5de9221 100644
--- a/question/behaviour/interactive/renderer.php
+++ b/question/behaviour/interactive/renderer.php
@@ -36,14 +36,19 @@
  */
 class qbehaviour_interactive_renderer extends qbehaviour_renderer {
     public function controls(question_attempt $qa, question_display_options $options) {
-        if ($options->readonly === qbehaviour_interactive::READONLY_EXCEPT_TRY_AGAIN) {
+        if ($options->readonly === qbehaviour_interactive::TRY_AGAIN_VISIBLE ||
+                $options->readonly === qbehaviour_interactive::TRY_AGAIN_VISIBLE_READONLY) {
+            // We are in the try again state, so no submit button.
             return '';
         }
         return $this->submit_button($qa, $options);
     }
 
     public function feedback(question_attempt $qa, question_display_options $options) {
-        if (!$qa->get_state()->is_active() || !$options->readonly) {
+        // Show the Try again button if we are in try-again state.
+        if (!$qa->get_state()->is_active() ||
+                ($options->readonly !== qbehaviour_interactive::TRY_AGAIN_VISIBLE &&
+                        $options->readonly !== qbehaviour_interactive::TRY_AGAIN_VISIBLE_READONLY)) {
             return '';
         }
 
@@ -54,7 +59,8 @@ public function feedback(question_attempt $qa, question_display_options $options
             'value' => get_string('tryagain', 'qbehaviour_interactive'),
             'class' => 'submit btn',
         );
-        if ($options->readonly !== qbehaviour_interactive::READONLY_EXCEPT_TRY_AGAIN) {
+        if ($options->readonly === qbehaviour_interactive::TRY_AGAIN_VISIBLE_READONLY) {
+            // This means the question really was rendered with read-only option.
             $attributes['disabled'] = 'disabled';
         }
         $output = html_writer::empty_tag('input', $attributes);
diff --git a/question/behaviour/interactive/tests/walkthrough_test.php b/question/behaviour/interactive/tests/walkthrough_test.php
index 86e78d28997b5..5f370f9f78850 100644
--- a/question/behaviour/interactive/tests/walkthrough_test.php
+++ b/question/behaviour/interactive/tests/walkthrough_test.php
@@ -18,8 +18,7 @@
  * This file contains tests that walks a question through the interactive
  * behaviour.
  *
- * @package    qbehaviour
- * @subpackage interactive
+ * @package    qbehaviour_interactive
  * @copyright  2009 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -483,4 +482,52 @@ public function test_interactive_regrade_changing_num_tries_finished() {
         // and I am currently interested in testing regrading here.
         $this->check_current_mark(1);
     }
+
+    public function test_review_of_interactive_questions_before_finished() {
+        // Create a multichoice multiple question.
+        $q = test_question_maker::make_question('shortanswer');
+        $q->hints = array(
+                new question_hint_with_parts(0, 'This is the first hint.', FORMAT_HTML, true, true),
+                new question_hint_with_parts(0, 'This is the second hint.', FORMAT_HTML, true, true),
+        );
+        $this->start_attempt_at_question($q, 'interactive', 3);
+
+        // Check the initial state.
+        $this->check_current_state(question_state::$todo);
+        $this->check_current_mark(null);
+        $this->check_current_output(
+                $this->get_contains_submit_button_expectation(true),
+                $this->get_does_not_contain_feedback_expectation(),
+                $this->get_tries_remaining_expectation(3),
+                $this->get_does_not_contain_try_again_button_expectation());
+
+        // Now check what the teacher sees when they review the question.
+        $this->displayoptions->readonly = true;
+        $this->check_current_output(
+                $this->get_contains_submit_button_expectation(false),
+                $this->get_does_not_contain_feedback_expectation(),
+                $this->get_tries_remaining_expectation(3),
+                $this->get_does_not_contain_try_again_button_expectation());
+        $this->displayoptions->readonly = false;
+
+        // Submit a wrong answer.
+        $this->process_submission(array('answer' => 'cat', '-submit' => 1));
+
+        // Check the Try again button now shows up correctly.
+        $this->check_current_state(question_state::$todo);
+        $this->check_current_mark(null);
+        $this->check_current_output(
+                $this->get_does_not_contain_submit_button_expectation(),
+                $this->get_contains_hint_expectation('This is the first hint.'),
+                $this->get_tries_remaining_expectation(2),
+                $this->get_contains_try_again_button_expectation(true));
+
+        // And check that a disabled Try again button shows up when the question is reviewed.
+        $this->displayoptions->readonly = true;
+        $this->check_current_output(
+                $this->get_does_not_contain_submit_button_expectation(),
+                $this->get_contains_hint_expectation('This is the first hint.'),
+                $this->get_tries_remaining_expectation(2),
+                $this->get_contains_try_again_button_expectation(false));
+    }
 }
diff --git a/question/behaviour/manualgraded/db/upgrade.php b/question/behaviour/manualgraded/db/upgrade.php
index 45f5cd010851f..5b49339e80e4b 100644
--- a/question/behaviour/manualgraded/db/upgrade.php
+++ b/question/behaviour/manualgraded/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_qbehaviour_manualgraded_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/category_class.php b/question/category_class.php
index 856da40420c0f..1b45eb1e93199 100644
--- a/question/category_class.php
+++ b/question/category_class.php
@@ -164,7 +164,7 @@ public function item_html($extraargs = array()){
 
 
 /**
- * Class representing q question category
+ * Class for performing operations on question categories.
  *
  * @copyright  1999 onwards Martin Dougiamas {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -180,7 +180,6 @@ class question_category_object {
      * @var array nested lists to display categories.
      */
     public $editlists = array();
-    public $newtable;
     public $tab;
     public $tabsize = 3;
 
@@ -195,12 +194,17 @@ class question_category_object {
     public $catform;
 
     /**
-     * Constructor
+     * Constructor.
      *
-     * Gets necessary strings and sets relevant path information
+     * @param int $page page number
+     * @param moodle_url $pageurl base URL of the display categories page. Used for redirects.
+     * @param context[] $contexts contexts where the current user can edit categories.
+     * @param int $currentcat id of the category to be edited. 0 if none.
+     * @param int|null $defaultcategory id of the current category. null if none.
+     * @param int $todelete id of the category to delete. 0 if none.
+     * @param context[] $addcontexts contexts where the current user can add questions.
      */
     public function __construct($page, $pageurl, $contexts, $currentcat, $defaultcategory, $todelete, $addcontexts) {
-        global $CFG, $COURSE, $OUTPUT;
 
         $this->tab = str_repeat('&nbsp;', $this->tabsize);
 
@@ -433,7 +437,19 @@ public function move_questions($oldcat, $newcat){
     }
 
     /**
-     * Creates a new category with given params
+     * Create a new category.
+     *
+     * Data is expected to come from question_category_edit_form.
+     *
+     * By default redirects on success, unless $return is true.
+     *
+     * @param string $newparent 'categoryid,contextid' of the parent category.
+     * @param string $newcategory the name.
+     * @param string $newinfo the description.
+     * @param bool $return if true, return rather than redirecting.
+     * @param int|string $newinfoformat description format. One of the FORMAT_ constants.
+     * @param null $idnumber the idnumber. '' is converted to null.
+     * @return bool|int New category id if successful, else false.
      */
     public function add_category($newparent, $newcategory, $newinfo, $return = false, $newinfoformat = FORMAT_HTML,
             $idnumber = null) {
@@ -469,9 +485,7 @@ public function add_category($newparent, $newcategory, $newinfo, $return = false
         $cat->infoformat = $newinfoformat;
         $cat->sortorder = 999;
         $cat->stamp = make_unique_id_code();
-        if ($idnumber) {
-            $cat->idnumber = $idnumber;
-        }
+        $cat->idnumber = $idnumber;
         $categoryid = $DB->insert_record("question_categories", $cat);
 
         // Log the creation of this category.
@@ -489,16 +503,17 @@ public function add_category($newparent, $newcategory, $newinfo, $return = false
     }
 
     /**
-     * Updates an existing category with given params
+     * Updates an existing category with given params.
      *
-     * @param int $updateid
-     * @param int $newparent
-     * @param string $newname
-     * @param string $newinfo
-     * @param int $newinfoformat
-     * @param int $idnumber
-     * @param bool $redirect
-     * @return int
+     * Warning! parameter order and meaning confusingly different from add_category in some ways!
+     *
+     * @param int $updateid id of the category to update.
+     * @param int $newparent 'categoryid,contextid' of the parent category to set.
+     * @param string $newname category name.
+     * @param string $newinfo category description.
+     * @param int|string $newinfoformat description format. One of the FORMAT_ constants.
+     * @param int $idnumber the idnumber. '' is converted to null.
+     * @param bool $redirect if true, will redirect once the DB is updated (default).
      */
     public function update_category($updateid, $newparent, $newname, $newinfo, $newinfoformat = FORMAT_HTML,
             $idnumber = null, $redirect = true) {
@@ -538,8 +553,9 @@ public function update_category($updateid, $newparent, $newname, $newinfo, $newi
             $idnumber = null;
         } else if (!empty($tocontextid)) {
             // While this check already exists in the form validation, this is a backstop preventing unnecessary errors.
-            if ($DB->record_exists('question_categories',
-                    ['idnumber' => $idnumber, 'contextid' => $tocontextid])) {
+            if ($DB->record_exists_select('question_categories',
+                    'idnumber = ? AND contextid = ? AND id <> ?',
+                    [$idnumber, $tocontextid, $updateid])) {
                 $idnumber = null;
             }
         }
@@ -552,9 +568,7 @@ public function update_category($updateid, $newparent, $newname, $newinfo, $newi
         $cat->infoformat = $newinfoformat;
         $cat->parent = $parentid;
         $cat->contextid = $tocontextid;
-        if ($idnumber) {
-            $cat->idnumber = $idnumber;
-        }
+        $cat->idnumber = $idnumber;
         if ($newstamprequired) {
             $cat->stamp = make_unique_id_code();
         }
diff --git a/question/classes/bank/search/category_condition.php b/question/classes/bank/search/category_condition.php
index f37a8ef176a3a..c2a4008885446 100644
--- a/question/classes/bank/search/category_condition.php
+++ b/question/classes/bank/search/category_condition.php
@@ -118,7 +118,7 @@ public function display_options_adv() {
         echo \html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'recurse',
                                                'value' => 0, 'id' => 'recurse_off'));
         echo \html_writer::checkbox('recurse', '1', $this->recurse, get_string('includesubcategories', 'question'),
-                                       array('id' => 'recurse_on', 'class' => 'searchoptions'));
+                                       array('id' => 'recurse_on', 'class' => 'searchoptions mr-1'));
         echo \html_writer::end_div() . "\n";
     }
 
@@ -132,7 +132,7 @@ public function display_options_adv() {
     protected function display_category_form($contexts, $pageurl, $current) {
         echo \html_writer::start_div('choosecategory');
         $catmenu = question_category_options($contexts, true, 0, true);
-        echo \html_writer::label(get_string('selectacategory', 'question'), 'id_selectacategory');
+        echo \html_writer::label(get_string('selectacategory', 'question'), 'id_selectacategory', true, array("class" => "mr-1"));
         echo \html_writer::select($catmenu, 'category', $current, array(),
                 array('class' => 'searchoptions custom-select', 'id' => 'id_selectacategory'));
         echo \html_writer::end_div() . "\n";
@@ -170,7 +170,7 @@ protected function print_category_info($category) {
         $formatoptions = new \stdClass();
         $formatoptions->noclean = true;
         $formatoptions->overflowdiv = true;
-        echo \html_writer::start_div('boxaligncenter categoryinfo');
+        echo \html_writer::start_div('boxaligncenter categoryinfo pl-0');
         if (isset($this->maxinfolength)) {
             echo shorten_text(format_text($category->info, $category->infoformat, $formatoptions, $this->course->id),
                                      $this->maxinfolength);
diff --git a/question/classes/bank/search/hidden_condition.php b/question/classes/bank/search/hidden_condition.php
index 247d64d8b6267..cf80f2eeb3822 100644
--- a/question/classes/bank/search/hidden_condition.php
+++ b/question/classes/bank/search/hidden_condition.php
@@ -62,7 +62,7 @@ public function display_options_adv() {
         echo \html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'showhidden',
                                                    'value' => '0', 'id' => 'showhidden_off'));
         echo \html_writer::checkbox('showhidden', '1', (! $this->hide), get_string('showhidden', 'question'),
-                                   array('id' => 'showhidden_on', 'class' => 'searchoptions'));
+                                   array('id' => 'showhidden_on', 'class' => 'searchoptions mr-1'));
         echo \html_writer::end_div() . "\n";
     }
 }
diff --git a/question/classes/bank/view.php b/question/classes/bank/view.php
index 5197b872e34e5..10b69dd8f3e47 100644
--- a/question/classes/bank/view.php
+++ b/question/classes/bank/view.php
@@ -652,8 +652,8 @@ protected function display_showtext_checkbox($showquestiontext) {
         echo '<div>';
         echo \html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'qbshowtext',
                                                'value' => 0, 'id' => 'qbshowtext_off'));
-        echo \html_writer::checkbox('qbshowtext', '1', $showquestiontext, get_string('showquestiontext', 'question'),
-                                       array('id' => 'qbshowtext_on', 'class' => 'searchoptions'));
+        echo \html_writer::checkbox('qbshowtext', '1', $showquestiontext, ' ' . get_string('showquestiontext', 'question'),
+                                       array('id' => 'qbshowtext_on', 'class' => 'searchoptions mr-1'));
         echo "</div>\n";
     }
 
diff --git a/question/engine/bank.php b/question/engine/bank.php
index 61b01a7229eb7..c239388d59194 100644
--- a/question/engine/bank.php
+++ b/question/engine/bank.php
@@ -610,7 +610,7 @@ public function load_many_for_cache(array $questionids) {
                                             WHERE q.id ' . $idcondition, $params);
 
         foreach ($questionids as $id) {
-            if (!array_key_exists($id, $questionids)) {
+            if (!array_key_exists($id, $questiondata)) {
                 throw new dml_missing_record_exception('question', '', array('id' => $id));
             }
             get_question_options($questiondata[$id]);
diff --git a/question/engine/datalib.php b/question/engine/datalib.php
index 0ef5816aba693..7d5f180420279 100644
--- a/question/engine/datalib.php
+++ b/question/engine/datalib.php
@@ -100,10 +100,9 @@ public function insert_questions_usage_by_activity(question_usage_by_activity $q
             $stepdata[] = $this->insert_question_attempt($qa, $quba->get_owning_context());
         }
 
-        $stepdata = call_user_func_array('array_merge', $stepdata);
-        if ($stepdata) {
-            $this->insert_all_step_data($stepdata);
-        }
+        $this->insert_all_step_data($this->combine_step_data($stepdata));
+
+        $quba->set_observer(new question_engine_unit_of_work($quba));
     }
 
     /**
@@ -148,7 +147,7 @@ public function insert_question_attempt(question_attempt $qa, $context) {
             $stepdata[] = $this->insert_question_attempt_step($step, $record->id, $seq, $context);
         }
 
-        return call_user_func_array('array_merge', $stepdata);
+        return $this->combine_step_data($stepdata);
     }
 
     /**
@@ -169,6 +168,22 @@ protected function make_step_record(question_attempt_step $step, $questionattemp
         return $record;
     }
 
+    /**
+     * Take an array of arrays, and flatten it, even if the outer array is empty.
+     *
+     * Only public so it can be called from the unit of work. Not part of the
+     * public API of this class.
+     *
+     * @param array $stepdata array of zero or more arrays.
+     * @return array made by concatenating all the separate arrays.
+     */
+    public function combine_step_data(array $stepdata): array {
+        if (empty($stepdata)) {
+            return [];
+        }
+        return call_user_func_array('array_merge', $stepdata);
+    }
+
     /**
      * Helper method used by insert_question_attempt_step and update_question_attempt_step
      * @param question_attempt_step $step the step to store.
@@ -1579,9 +1594,7 @@ public function save(question_engine_data_mapper $dm) {
             $dm->update_questions_usage_by_activity($this->quba);
         }
 
-        if ($stepdata) {
-            $dm->insert_all_step_data(call_user_func_array('array_merge', $stepdata));
-        }
+        $dm->insert_all_step_data($dm->combine_step_data($stepdata));
 
         $this->stepsdeleted = array();
         $this->stepsmodified = array();
diff --git a/question/engine/lib.php b/question/engine/lib.php
index 93dffb2650756..2f232abb1ddf5 100644
--- a/question/engine/lib.php
+++ b/question/engine/lib.php
@@ -453,6 +453,8 @@ public static function get_dp_options() {
 
     /**
      * Initialise the JavaScript required on pages where questions will be displayed.
+     *
+     * @return string
      */
     public static function initialise_js() {
         return question_flags::initialise_js();
@@ -582,7 +584,7 @@ class question_display_options {
     /**
      * Used in places like the question history table, to show a link to review
      * this question in a certain state. If blank, a link is not shown.
-     * @var string base URL for a review question script.
+     * @var moodle_url base URL for a review question script.
      */
     public $questionreviewlink = null;
 
diff --git a/question/engine/questionattempt.php b/question/engine/questionattempt.php
index 150174482dbf2..bf6eb62780ad8 100644
--- a/question/engine/questionattempt.php
+++ b/question/engine/questionattempt.php
@@ -1369,8 +1369,13 @@ public function regrade(question_attempt $oldqa, $finished) {
 
             } else {
                 // This is the normal case. Replay the next step of the attempt.
-                $this->process_action($step->get_submitted_data(),
-                        $step->get_timecreated(), $step->get_user_id(), $step->get_id());
+                if ($step === $oldqa->autosavedstep) {
+                    $this->process_autosave($step->get_submitted_data(),
+                            $step->get_timecreated(), $step->get_user_id());
+                } else {
+                    $this->process_action($step->get_submitted_data(),
+                            $step->get_timecreated(), $step->get_user_id(), $step->get_id());
+                }
             }
         }
 
diff --git a/question/engine/renderer.php b/question/engine/renderer.php
index 6d19acbf75304..d49777638b58b 100644
--- a/question/engine/renderer.php
+++ b/question/engine/renderer.php
@@ -323,21 +323,23 @@ protected function get_flag_html($flagged, $id = '') {
         if ($flagged) {
             $icon = 'i/flagged';
             $alt = get_string('flagged', 'question');
+            $label = get_string('clickunflag', 'question');
         } else {
             $icon = 'i/unflagged';
             $alt = get_string('notflagged', 'question');
+            $label = get_string('clickflag', 'question');
         }
         $attributes = array(
             'src' => $this->image_url($icon),
             'alt' => $alt,
+            'class' => 'questionflagimage',
         );
         if ($id) {
             $attributes['id'] = $id;
         }
         $img = html_writer::empty_tag('img', $attributes);
-        if ($flagged) {
-            $img .= ' ' . get_string('flagged', 'question');
-        }
+        $img .= html_writer::span($label);
+
         return $img;
     }
 
diff --git a/question/engine/tests/datalib_test.php b/question/engine/tests/datalib_test.php
index af8b9d613a58d..d00d260759a5e 100644
--- a/question/engine/tests/datalib_test.php
+++ b/question/engine/tests/datalib_test.php
@@ -154,4 +154,101 @@ public function test_load_used_variants() {
                     array($questiondata1->id, $questiondata2->id, $questiondata3->id),
                     new qubaid_list(array($quba->get_id()))));
     }
+
+    public function test_repeated_usage_saving_new_usage() {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        $initialqurows = $DB->count_records('question_usages');
+        $initialqarows = $DB->count_records('question_attempts');
+        $initialqasrows = $DB->count_records('question_attempt_steps');
+
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $cat = $generator->create_question_category();
+        $questiondata1 = $generator->create_question('shortanswer', null, array('category' => $cat->id));
+
+        $quba = question_engine::make_questions_usage_by_activity('test', context_system::instance());
+        $quba->set_preferred_behaviour('deferredfeedback');
+        $quba->add_question(question_bank::load_question($questiondata1->id));
+        $quba->start_all_questions();
+        question_engine::save_questions_usage_by_activity($quba);
+
+        // Check one usage, question_attempts and step added.
+        $firstid = $quba->get_id();
+        $this->assertEquals(1, $DB->count_records('question_usages') - $initialqurows);
+        $this->assertEquals(1, $DB->count_records('question_attempts') - $initialqarows);
+        $this->assertEquals(1, $DB->count_records('question_attempt_steps') - $initialqasrows);
+
+        $quba->finish_all_questions();
+        question_engine::save_questions_usage_by_activity($quba);
+
+        // Check usage id not changed.
+        $this->assertEquals($firstid, $quba->get_id());
+
+        // Check still one usage, question_attempts, but now two steps.
+        $this->assertEquals(1, $DB->count_records('question_usages') - $initialqurows);
+        $this->assertEquals(1, $DB->count_records('question_attempts') - $initialqarows);
+        $this->assertEquals(2, $DB->count_records('question_attempt_steps') - $initialqasrows);
+    }
+
+    public function test_repeated_usage_saving_existing_usage() {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $cat = $generator->create_question_category();
+        $questiondata1 = $generator->create_question('shortanswer', null, array('category' => $cat->id));
+
+        $initquba = question_engine::make_questions_usage_by_activity('test', context_system::instance());
+        $initquba->set_preferred_behaviour('deferredfeedback');
+        $slot = $initquba->add_question(question_bank::load_question($questiondata1->id));
+        $initquba->start_all_questions();
+        question_engine::save_questions_usage_by_activity($initquba);
+
+        $quba = question_engine::load_questions_usage_by_activity($initquba->get_id());
+
+        $initialqurows = $DB->count_records('question_usages');
+        $initialqarows = $DB->count_records('question_attempts');
+        $initialqasrows = $DB->count_records('question_attempt_steps');
+
+        $quba->process_all_actions(time(), $quba->prepare_simulated_post_data(
+                [$slot => ['answer' => 'Frog']]));
+        question_engine::save_questions_usage_by_activity($quba);
+
+        // Check one usage, question_attempts and step added.
+        $this->assertEquals(0, $DB->count_records('question_usages') - $initialqurows);
+        $this->assertEquals(0, $DB->count_records('question_attempts') - $initialqarows);
+        $this->assertEquals(1, $DB->count_records('question_attempt_steps') - $initialqasrows);
+
+        $quba->finish_all_questions();
+        question_engine::save_questions_usage_by_activity($quba);
+
+        // Check still one usage, question_attempts, but now two steps.
+        $this->assertEquals(0, $DB->count_records('question_usages') - $initialqurows);
+        $this->assertEquals(0, $DB->count_records('question_attempts') - $initialqarows);
+        $this->assertEquals(2, $DB->count_records('question_attempt_steps') - $initialqasrows);
+    }
+
+    /**
+     * Test that database operations on an empty usage work without errors.
+     */
+    public function test_save_and_load_an_empty_usage() {
+        $this->resetAfterTest();
+
+        // Create a new usage.
+        $quba = question_engine::make_questions_usage_by_activity('test', context_system::instance());
+        $quba->set_preferred_behaviour('deferredfeedback');
+
+        // Save it.
+        question_engine::save_questions_usage_by_activity($quba);
+
+        // Reload it.
+        $reloadedquba = question_engine::load_questions_usage_by_activity($quba->get_id());
+        $this->assertCount(0, $quba->get_slots());
+
+        // Delete it.
+        question_engine::delete_questions_usage_by_activity($quba->get_id());
+    }
 }
diff --git a/question/engine/tests/questionbank_test.php b/question/engine/tests/questionbank_test.php
index 873507909bf7b..c0b4cb242894c 100644
--- a/question/engine/tests/questionbank_test.php
+++ b/question/engine/tests/questionbank_test.php
@@ -110,4 +110,20 @@ public function test_get_questions_from_categories_with_usage_counts() {
         ), question_bank::get_finder()->get_questions_from_categories_with_usage_counts(
                 array($cat->id), new qubaid_list(array($quba->get_id()))));
     }
+
+    public function test_load_many_for_cache() {
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $cat = $generator->create_question_category();
+        $q1 = $generator->create_question('shortanswer', null, ['category' => $cat->id]);
+
+        $qs = question_finder::get_instance()->load_many_for_cache([$q1->id]);
+        $this->assertArrayHasKey($q1->id, $qs);
+    }
+
+    public function test_load_many_for_cache_missing_id() {
+        // Try to load a non-existent question.
+        $this->expectException('dml_missing_record_exception');
+        question_finder::get_instance()->load_many_for_cache([-1]);
+    }
 }
diff --git a/question/engine/tests/questionusage_autosave_test.php b/question/engine/tests/questionusage_autosave_test.php
index aa3b03fcd0383..6ca87f43ad8c7 100644
--- a/question/engine/tests/questionusage_autosave_test.php
+++ b/question/engine/tests/questionusage_autosave_test.php
@@ -686,6 +686,67 @@ public function test_finish_with_unhandled_autosave_data() {
         $this->delete_quba();
     }
 
+    /**
+     * Test that regrading doesn't convert autosave steps to finished steps.
+     * This can result in students loosing data (due to question_out_of_sequence_exception) if a teacher
+     * regrades an attempt while it is in progress.
+     */
+    public function test_autosave_and_regrade_then_display() {
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $cat = $generator->create_question_category();
+        $question = $generator->create_question('shortanswer', null,
+                array('category' => $cat->id));
+
+        // Start attempt at a shortanswer question.
+        $q = question_bank::load_question($question->id);
+        $this->start_attempt_at_question($q, 'deferredfeedback', 1);
+
+        $this->check_current_state(question_state::$todo);
+        $this->check_current_mark(null);
+        $this->check_step_count(1);
+
+        // First see if the starting sequence is right.
+        $this->render();
+        $this->check_output_contains_hidden_input(':sequencecheck', 1);
+
+        // Add a submission.
+        $this->process_submission(array('answer' => 'first response'));
+        $this->save_quba();
+
+        // Check the submission and that the sequence went up.
+        $this->render();
+        $this->check_output_contains_text_input('answer', 'first response');
+        $this->check_output_contains_hidden_input(':sequencecheck', 2);
+        $this->assertFalse($this->get_question_attempt()->has_autosaved_step());
+
+        // Add a autosave response.
+        $this->load_quba();
+        $this->process_autosave(array('answer' => 'second response'));
+        $this->save_quba();
+
+        // Confirm that the autosave value shows up, but that the sequence hasn't increased.
+        $this->render();
+        $this->check_output_contains_text_input('answer', 'second response');
+        $this->check_output_contains_hidden_input(':sequencecheck', 2);
+        $this->assertTrue($this->get_question_attempt()->has_autosaved_step());
+
+        // Call regrade.
+        $this->load_quba();
+        $this->quba->regrade_all_questions();
+        $this->save_quba();
+
+        // Check and see if the autosave response is still there, that the sequence didn't increase,
+        // and that there is an autosave step.
+        $this->load_quba();
+        $this->render();
+        $this->check_output_contains_text_input('answer', 'second response');
+        $this->check_output_contains_hidden_input(':sequencecheck', 2);
+        $this->assertTrue($this->get_question_attempt()->has_autosaved_step());
+
+        $this->delete_quba();
+    }
+
     protected function tearDown() {
         // This test relies on the destructor for the second DB connection being called before running the next test.
         // Without this change - there will be unit test failures on "some" DBs (MySQL).
diff --git a/question/format.php b/question/format.php
index 6cf40e5b0dfd2..0177abf03e46b 100644
--- a/question/format.php
+++ b/question/format.php
@@ -575,14 +575,22 @@ protected function create_category_path($catpath, $lastcategoryinfo = null) {
                 $parent = $category->id;
             } else if ($category = $DB->get_record('question_categories',
                     array('name' => $catname, 'contextid' => $context->id, 'parent' => $parent))) {
-                // Do nothing unless the child category appears before the parent category
-                // in the imported xml file. Because the parent was created without info being available
-                // at that time, this allows the info to be added from the xml data.
-                if ($key == (count($catnames) - 1) && $lastcategoryinfo && isset($lastcategoryinfo->info) &&
-                        $lastcategoryinfo->info !== '' && $category->info === '') {
-                    $category->info = $lastcategoryinfo->info;
-                    if (isset($lastcategoryinfo->infoformat) && $lastcategoryinfo->infoformat !== '') {
-                        $category->infoformat = $lastcategoryinfo->infoformat;
+                // If this category is now the last one in the path we are processing ...
+                if ($key == (count($catnames) - 1) && $lastcategoryinfo) {
+                    // Do nothing unless the child category appears before the parent category
+                    // in the imported xml file. Because the parent was created without info being available
+                    // at that time, this allows the info to be added from the xml data.
+                    if (isset($lastcategoryinfo->info) && $lastcategoryinfo->info !== ''
+                            && $category->info === '') {
+                        $category->info = $lastcategoryinfo->info;
+                        if (isset($lastcategoryinfo->infoformat) && $lastcategoryinfo->infoformat !== '') {
+                            $category->infoformat = $lastcategoryinfo->infoformat;
+                        }
+                    }
+                    // Same for idnumber.
+                    if (isset($lastcategoryinfo->idnumber) && $lastcategoryinfo->idnumber !== ''
+                            && $category->idnumber === '') {
+                        $category->idnumber = $lastcategoryinfo->idnumber;
                     }
                     $DB->update_record('question_categories', $category);
                 }
@@ -603,11 +611,16 @@ protected function create_category_path($catpath, $lastcategoryinfo = null) {
                 $category->name = $catname;
                 $category->info = '';
                 // Only add info (category description) for the final category in the catpath.
-                if ($key == (count($catnames) - 1) && $lastcategoryinfo && isset($lastcategoryinfo->info) &&
-                        $lastcategoryinfo->info !== '') {
-                    $category->info = $lastcategoryinfo->info;
-                    if (isset($lastcategoryinfo->infoformat) && $lastcategoryinfo->infoformat !== '') {
-                        $category->infoformat = $lastcategoryinfo->infoformat;
+                if ($key == (count($catnames) - 1) && $lastcategoryinfo) {
+                    if (isset($lastcategoryinfo->info) && $lastcategoryinfo->info !== '') {
+                        $category->info = $lastcategoryinfo->info;
+                        if (isset($lastcategoryinfo->infoformat) && $lastcategoryinfo->infoformat !== '') {
+                            $category->infoformat = $lastcategoryinfo->infoformat;
+                        }
+                    }
+                    // Same for idnumber.
+                    if (isset($lastcategoryinfo->idnumber) && $lastcategoryinfo->idnumber !== '') {
+                        $category->idnumber = $lastcategoryinfo->idnumber;
                     }
                 }
                 $category->parent = $parent;
@@ -860,6 +873,10 @@ protected function presave_process($content) {
     public function exportprocess($checkcapabilities = true) {
         global $CFG, $DB;
 
+        // Raise time and memory, as exporting can be quite intensive.
+        core_php_time_limit::raise();
+        raise_memory_limit(MEMORY_EXTRA);
+
         // Get the parents (from database) for this category.
         $parents = [];
         if ($this->category) {
@@ -920,7 +937,7 @@ public function exportprocess($checkcapabilities = true) {
                         if (!count($DB->get_records('question', array('category' => $trackcategoryparent)))) {
                             $categoryname = $this->get_category_path($trackcategoryparent, $this->contexttofile);
                             $categoryinfo = $DB->get_record('question_categories', array('id' => $trackcategoryparent),
-                                'name, info, infoformat', MUST_EXIST);
+                                'name, info, infoformat, idnumber', MUST_EXIST);
                             if ($categoryinfo->name != 'top') {
                                 // Create 'dummy' question for parent category.
                                 $dummyquestion = $this->create_dummy_question_representing_category($categoryname, $categoryinfo);
@@ -933,7 +950,7 @@ public function exportprocess($checkcapabilities = true) {
                 if ($addnewcat && !in_array($trackcategory, $writtencategories)) {
                     $categoryname = $this->get_category_path($trackcategory, $this->contexttofile);
                     $categoryinfo = $DB->get_record('question_categories', array('id' => $trackcategory),
-                            'info, infoformat', MUST_EXIST);
+                            'info, infoformat, idnumber', MUST_EXIST);
                     // Create 'dummy' question for category.
                     $dummyquestion = $this->create_dummy_question_representing_category($categoryname, $categoryinfo);
                     $expout .= $this->writequestion($dummyquestion) . "\n";
@@ -982,6 +999,7 @@ protected function create_dummy_question_representing_category(string $categoryn
         $dummyquestion->contextid = 0;
         $dummyquestion->info = $categoryinfo->info;
         $dummyquestion->infoformat = $categoryinfo->infoformat;
+        $dummyquestion->idnumber = $categoryinfo->idnumber;
         $dummyquestion->name = 'Switch category to ' . $categoryname;
         return $dummyquestion;
     }
diff --git a/question/format/xml/format.php b/question/format/xml/format.php
index 98fe6d2c7250e..d2323d00afdad 100644
--- a/question/format/xml/format.php
+++ b/question/format/xml/format.php
@@ -935,6 +935,7 @@ protected function import_category($question) {
             // The import should have the format in human readable form, so translate to machine readable format.
             $qo->infoformat = $this->trans_format($question['#']['info'][0]['@']['format']);
         }
+        $qo->idnumber = $this->getpath($question, array('#', 'idnumber', 0, '#'), null);
         return $qo;
     }
 
@@ -1205,6 +1206,7 @@ public function writequestion($question) {
             $expout .= "    <info {$infoformat}>\n";
             $expout .= "      {$categoryinfo}";
             $expout .= "    </info>\n";
+            $expout .= "    <idnumber>{$question->idnumber}</idnumber>\n";
             $expout .= "  </question>\n";
             return $expout;
         }
diff --git a/question/format/xml/tests/fixtures/category_with_description.xml b/question/format/xml/tests/fixtures/category_with_description.xml
index 5c8ff8331afc0..674457bab422d 100644
--- a/question/format/xml/tests/fixtures/category_with_description.xml
+++ b/question/format/xml/tests/fixtures/category_with_description.xml
@@ -8,6 +8,7 @@
     <info format="moodle_auto_format">
         <text>This is Alpha category for test</text>
     </info>
+    <idnumber>alpha-idnumber</idnumber>
   </question>
 
 <!-- question: 91  -->
diff --git a/question/format/xml/tests/fixtures/export_category.xml b/question/format/xml/tests/fixtures/export_category.xml
index 42c9f37e57f26..63087cf72641a 100644
--- a/question/format/xml/tests/fixtures/export_category.xml
+++ b/question/format/xml/tests/fixtures/export_category.xml
@@ -8,6 +8,7 @@
     <info format="moodle_auto_format">
       <text>This is Alpha category for test</text>
     </info>
+    <idnumber>alpha-idnumber</idnumber>
   </question>
 
 <!-- question: 91  -->
diff --git a/question/format/xml/tests/fixtures/nested_categories.xml b/question/format/xml/tests/fixtures/nested_categories.xml
index 4bf5c2cfca627..ac6db64d3153b 100644
--- a/question/format/xml/tests/fixtures/nested_categories.xml
+++ b/question/format/xml/tests/fixtures/nested_categories.xml
@@ -8,6 +8,7 @@
     <info format="plain_text">
       <text>This is Delta category for test</text>
     </info>
+    <idnumber></idnumber>
   </question>
 
 <!-- question: 0  -->
@@ -18,6 +19,7 @@
     <info format="markdown">
       <text>This is Epsilon category for test</text>
     </info>
+    <idnumber></idnumber>
   </question>
 
 <!-- question: 0  -->
@@ -28,6 +30,7 @@
     <info format="moodle_auto_format">
       <text>This is Zeta category for test</text>
     </info>
+    <idnumber></idnumber>
   </question>
 
 <!-- question: 93  -->
diff --git a/question/format/xml/tests/fixtures/nested_categories_with_questions.xml b/question/format/xml/tests/fixtures/nested_categories_with_questions.xml
index db729e99dc917..8350c16c4f8eb 100644
--- a/question/format/xml/tests/fixtures/nested_categories_with_questions.xml
+++ b/question/format/xml/tests/fixtures/nested_categories_with_questions.xml
@@ -8,6 +8,7 @@
     <info format="plain_text">
       <text>This is Iota category for test</text>
     </info>
+    <idnumber></idnumber>
   </question>
 
 <!-- question: 96  -->
@@ -47,6 +48,7 @@
     <info format="markdown">
       <text>This is Kappa category for test</text>
     </info>
+    <idnumber></idnumber>
   </question>
 
 <!-- question: 106  -->
@@ -114,6 +116,7 @@
     <info format="moodle_auto_format">
       <text>This is Lambda category for test</text>
     </info>
+    <idnumber></idnumber>
   </question>
 
 <!-- question: 98  -->
@@ -153,6 +156,7 @@
     <info format="moodle_auto_format">
       <text>This is Mu category for test</text>
     </info>
+    <idnumber></idnumber>
   </question>
 
 <!-- question: 99  -->
diff --git a/question/format/xml/tests/qformat_xml_import_export_test.php b/question/format/xml/tests/qformat_xml_import_export_test.php
index a0af0afd86525..4926bea104011 100644
--- a/question/format/xml/tests/qformat_xml_import_export_test.php
+++ b/question/format/xml/tests/qformat_xml_import_export_test.php
@@ -38,8 +38,8 @@ class qformat_xml_import_export_test extends advanced_testcase {
     /**
      * Create object qformat_xml for test.
      * @param string $filename with name for testing file.
-     * @param object $course
-     * @return object qformat_xml.
+     * @param stdClass $course
+     * @return qformat_xml XML question format object.
      */
     public function create_qformat($filename, $course) {
         global $DB;
@@ -99,11 +99,12 @@ protected function normalise_xml($xml) {
      * @param string $info imported category info field (description of category).
      * @param int $infoformat imported category info field format.
      */
-    public function assert_category_imported($name, $info, $infoformat) {
+    public function assert_category_imported($name, $info, $infoformat, $idnumber = null) {
         global $DB;
         $category = $DB->get_record('question_categories', ['name' => $name], '*', MUST_EXIST);
         $this->assertEquals($info, $category->info);
         $this->assertEquals($infoformat, $category->infoformat);
+        $this->assertSame($idnumber, $category->idnumber);
     }
 
     /**
@@ -146,7 +147,8 @@ public function test_import_category() {
         $qformat = $this->create_qformat('category_with_description.xml', $course);
         $imported = $qformat->importprocess();
         $this->assertTrue($imported);
-        $this->assert_category_imported('Alpha', 'This is Alpha category for test', FORMAT_MOODLE);
+        $this->assert_category_imported('Alpha',
+                'This is Alpha category for test', FORMAT_MOODLE, 'alpha-idnumber');
         $this->assert_category_has_parent('Alpha', 'top');
     }
 
@@ -246,6 +248,7 @@ public function test_export_category() {
                 'contextid' => '2',
                 'info' => 'This is Alpha category for test',
                 'infoformat' => '0',
+                'idnumber' => 'alpha-idnumber',
                 'stamp' => make_unique_id_code(),
                 'parent' => '0',
                 'sortorder' => '999']);
diff --git a/question/format/xml/tests/xmlformat_test.php b/question/format/xml/tests/xmlformat_test.php
index c85fff02b26b9..c8cd52c41f816 100644
--- a/question/format/xml/tests/xmlformat_test.php
+++ b/question/format/xml/tests/xmlformat_test.php
@@ -1721,6 +1721,7 @@ public function test_create_dummy_question() {
         $categoryinfo = new stdClass();
         $categoryinfo->info = 'info1';
         $categoryinfo->infoformat = 'infoformat1';
+        $categoryinfo->idnumber = null;
         $dummyquestion = $testobject->mock_create_dummy_question_representing_category($categoryname, $categoryinfo);
 
         $this->assertEquals('category', $dummyquestion->qtype);
diff --git a/question/import_form.php b/question/import_form.php
index ad2cc18feb6b4..f4693e4018414 100644
--- a/question/import_form.php
+++ b/question/import_form.php
@@ -112,6 +112,7 @@ protected function definition() {
      * @param array $data the submitted data.
      * @param array $errors the errors so far.
      * @return array the updated errors.
+     * @throws moodle_exception
      */
     protected function validate_uploaded_file($data, $errors) {
         if (empty($data['newfile'])) {
@@ -120,7 +121,7 @@ protected function validate_uploaded_file($data, $errors) {
         }
 
         $files = $this->get_draft_files('newfile');
-        if (count($files) < 1) {
+        if (!is_array($files) || count($files) < 1) {
             $errors['newfile'] = get_string('required');
             return $errors;
         }
diff --git a/question/tests/behat/behat_question.php b/question/tests/behat/behat_question.php
index e47f30a1dbf8c..3a0d775872806 100644
--- a/question/tests/behat/behat_question.php
+++ b/question/tests/behat/behat_question.php
@@ -86,4 +86,21 @@ public function the_state_of_question_is_shown_as($questiondescription, $state)
         $xpath = $questionxpath . "/div[@class='info']/div[@class='state' and contains(., {$stateliteral})]";
         $this->find('xpath', $xpath, $exception);
     }
+
+    /**
+     * Activates a particular action on a particular question in the question bank UI.
+     *
+     * @When I choose :action action for :questionname in the question bank
+     * @param string $action the label for the action you want to activate.
+     * @param string $questionname the question name.
+     */
+    public function i_action_the_question($action, $questionname) {
+        if ($action == 'Edit question') {
+            $action = 'Edit';
+        }
+
+        // Click the action from the menu.
+        $this->execute("behat_general::i_click_on_in_the",
+                [$action, 'link', $questionname, 'table_row']);
+    }
 }
diff --git a/question/tests/behat/copy_questions.feature b/question/tests/behat/copy_questions.feature
index e6e60967137b5..f37a068d4737e 100644
--- a/question/tests/behat/copy_questions.feature
+++ b/question/tests/behat/copy_questions.feature
@@ -26,7 +26,7 @@ Feature: A teacher can duplicate questions in the question bank
 
   @javascript
   Scenario: Duplicating a previously created question
-    When I click on "Duplicate" "link" in the "Test question to be copied" "table_row"
+    When I choose "Duplicate" action for "Test question to be copied" in the question bank
     And I set the following fields to these values:
       | Question name | Duplicated question name                |
       | Question text | Write a lot about duplicating questions |
@@ -38,12 +38,12 @@ Feature: A teacher can duplicate questions in the question bank
 
   @javascript
   Scenario: Duplicated questions automatically get a new name suggested
-    When I click on "Duplicate" "link" in the "Test question to be copied" "table_row"
+    When I choose "Duplicate" action for "Test question to be copied" in the question bank
     Then the field "Question name" matches value "Test question to be copied (copy)"
 
   @javascript
   Scenario: The duplicate operation can be cancelled
-    When I click on "Duplicate" "link" in the "Test question to be copied" "table_row"
+    When I choose "Duplicate" action for "Test question to be copied" in the question bank
     And I press "Cancel"
     Then I should see "Test question to be copied"
     And the field "Select a category" matches value "&nbsp;&nbsp;&nbsp;Test questions (1)"
diff --git a/question/tests/behat/delete_question_activities.feature b/question/tests/behat/delete_question_activities.feature
new file mode 100644
index 0000000000000..34c02575eca29
--- /dev/null
+++ b/question/tests/behat/delete_question_activities.feature
@@ -0,0 +1,32 @@
+@core @core_question
+Feature: An activity module instance with questions in its context can be deleted
+  In order to delete an activity module from the course
+  As a teacher
+  I need to be able to delete the activity even if it has questions created in its context
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | format |
+      | Course 1 | C1 | weeks |
+    And the following "course enrolments" exist:
+      | user | course | role |
+      | teacher1 | C1 | editingteacher |
+
+  @javascript
+  Scenario: Synchronously deleting a quiz with existing questions in its context
+    Given the following config values are set as admin:
+      | coursebinenable | 0 | tool_recyclebin |
+    And I log in as "teacher1"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "Quiz" to section "1" and I fill the form with:
+      | Name | Test quiz Q001 |
+    And I add a "True/False" question to the "Test quiz" quiz with:
+      | Category      | Default for Test quiz Q001       |
+      | Question name | Test used question to be deleted |
+      | Question text | Write about whatever you want    |
+    And I am on "Course 1" course homepage
+    When I delete "Test quiz Q001" activity
+    Then I should not see "Test quiz Q001"
diff --git a/question/tests/behat/delete_questions.feature b/question/tests/behat/delete_questions.feature
index c8d3b5f7204bc..44354127ebf71 100644
--- a/question/tests/behat/delete_questions.feature
+++ b/question/tests/behat/delete_questions.feature
@@ -26,14 +26,14 @@ Feature: A teacher can delete questions in the question bank
 
   @javascript
   Scenario: A question not used anywhere can really be deleted
-    When I click on "Delete" "link" in the "Test question to be deleted" "table_row"
+    When I choose "Delete" action for "Test question to be deleted" in the question bank
     And I press "Delete"
     And I click on "Also show old questions" "checkbox"
     Then I should not see "Test question to be deleted"
 
   @javascript
   Scenario: Deleting a question can be cancelled
-    When I click on "Delete" "link" in the "Test question to be deleted" "table_row"
+    When I choose "Delete" action for "Test question to be deleted" in the question bank
     And I press "Cancel"
     Then I should see "Test question to be deleted"
 
@@ -47,7 +47,7 @@ Feature: A teacher can delete questions in the question bank
       | Question text | Write about whatever you want    |
     And I am on "Course 1" course homepage
     And I navigate to "Question bank > Questions" in current page administration
-    When I click on "Delete" "link" in the "Test used question to be deleted" "table_row"
+    When I choose "Delete" action for "Test used question to be deleted" in the question bank
     And I press "Delete"
     Then I should not see "Test used question to be deleted"
     And I click on "Also show old questions" "checkbox"
diff --git a/question/tests/behat/edit_questions.feature b/question/tests/behat/edit_questions.feature
index 6adc676255bca..183d0c10e07a7 100644
--- a/question/tests/behat/edit_questions.feature
+++ b/question/tests/behat/edit_questions.feature
@@ -26,7 +26,7 @@ Feature: A teacher can edit questions in the question bank
 
   @javascript
   Scenario: Edit a previously created question
-    When I click on "Edit" "link" in the "Test question to be edited" "table_row"
+    When I choose "Edit question" action for "Test question to be edited" in the question bank
     And I set the following fields to these values:
       | Question name | Edited question name |
       | Question text | Write a lot about what you want |
@@ -38,7 +38,7 @@ Feature: A teacher can edit questions in the question bank
 
   @javascript
   Scenario: Editing a question can be cancelled
-    When I click on "Edit" "link" in the "Test question to be edited" "table_row"
+    When I choose "Edit question" action for "Test question to be edited" in the question bank
     And I set the field "Question name" to "Edited question name"
     And I press "Cancel"
     Then I should see "Test question to be edited"
diff --git a/question/tests/behat/filter_questions_by_tag.feature b/question/tests/behat/filter_questions_by_tag.feature
index 4f0be1fb97bfb..acbefe69762cf 100644
--- a/question/tests/behat/filter_questions_by_tag.feature
+++ b/question/tests/behat/filter_questions_by_tag.feature
@@ -18,17 +18,17 @@ Feature: The questions in the question bank can be filtered by tags
       | contextlevel | reference | name           |
       | Course       | C1        | Test questions |
     And the following "questions" exist:
-      | questioncategory | qtype     | name              | user     | questiontext    |
+      | questioncategory | qtype     | name            | user     | questiontext    |
       | Test questions   | essay     | question 1 name | admin    | Question 1 text |
       | Test questions   | essay     | question 2 name | teacher1 | Question 2 text |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I navigate to "Question bank > Questions" in current page administration
-    And I click on "Edit" "link" in the "question 1 name" "table_row"
+    And I choose "Edit question" action for "question 1 name" in the question bank
     And I set the following fields to these values:
       | Tags | foo |
     And I press "id_submitbutton"
-    And I click on "Edit" "link" in the "question 2 name" "table_row"
+    And I choose "Edit question" action for "question 2 name" in the question bank
     And I set the following fields to these values:
       | Tags | bar |
     And I press "id_submitbutton"
diff --git a/question/tests/behat/preview_question.feature b/question/tests/behat/preview_question.feature
index 5cacce52953b1..e3630e34a3906 100644
--- a/question/tests/behat/preview_question.feature
+++ b/question/tests/behat/preview_question.feature
@@ -1,4 +1,4 @@
-@core @core_question
+@core @core_question @javascript @_switch_window
 Feature: A teacher can preview questions in the question bank
   In order to ensure the questions are properly created
   As a teacher
@@ -23,10 +23,9 @@ Feature: A teacher can preview questions in the question bank
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I navigate to "Question bank > Questions" in current page administration
-    When I click on "Preview" "link" in the "Test question to be previewed" "table_row"
+    When I choose "Preview" action for "Test question to be previewed" in the question bank
     And I switch to "questionpreview" window
 
-  @javascript @_switch_window
   Scenario: Question preview shows the question and other information
     Then the state of "What is pi to two d.p.?" question is shown as "Not yet answered"
     And I should see "Marked out of 1.00"
@@ -34,19 +33,16 @@ Feature: A teacher can preview questions in the question bank
     And I should see "Attempt options"
     And I should see "Display options"
 
-  @javascript @_switch_window
   Scenario: Preview lets the teacher see what happens when an answer is saved
     When I set the field "Answer:" to "1"
     And I press "Save"
     Then the state of "What is pi to two d.p.?" question is shown as "Answer saved"
 
-  @javascript @_switch_window
   Scenario: Preview lets the teacher see what happens when an answer is submitted
     When I set the field "Answer:" to "3.14"
     And I press "Submit and finish"
     Then the state of "What is pi to two d.p.?" question is shown as "Correct"
 
-  @javascript @_switch_window
   Scenario: Preview lets the teacher see what happens with different review options
     Given I set the field "Answer:" to "3.14"
     And I press "Submit and finish"
@@ -56,7 +52,6 @@ Feature: A teacher can preview questions in the question bank
     Then the state of "What is pi to two d.p.?" question is shown as "Complete"
     And I should see "1.00000"
 
-  @javascript @_switch_window
   Scenario: Preview lets the teacher see what happens with different behaviours
     When I set the field "How questions behave" to "Immediate feedback"
     And I set the field "Marked out of" to "3"
@@ -67,18 +62,20 @@ Feature: A teacher can preview questions in the question bank
     And I should see "Mark 0.00 out of 3.00"
     And I should see "Not accurate enough."
 
-  @javascript @_switch_window
   Scenario: Preview lets the teacher "Start again" while previewing
     Given I set the field "Answer:" to "1"
     And I press "Submit and finish"
     When I press "Start again"
     Then the state of "What is pi to two d.p.?" question is shown as "Not yet answered"
 
-  @javascript @_switch_window
   Scenario: Preview lets the teacher "Fill in correct response" while previewing
     When I press "Fill in correct responses"
     Then the field "Answer:" matches value "3.14"
 
-  @javascript @_switch_window
   Scenario: Preview has an option to export the individual quesiton.
     Then following "Download this question in Moodle XML format" should download between "1000" and "2500" bytes
+
+  Scenario: Preview a question with very small grade
+    When I set the field "Marked out of" to "0.00000123456789"
+    And I press "Start again with these options"
+    Then the field "Marked out of" matches value "0.00000123456789"
diff --git a/question/tests/behat/question_categories.feature b/question/tests/behat/question_categories.feature
index 6d7edf25f9663..5de4f4c3fcc75 100644
--- a/question/tests/behat/question_categories.feature
+++ b/question/tests/behat/question_categories.feature
@@ -76,7 +76,7 @@ Feature: A teacher can put questions in categories in the question bank
   Scenario: Move a question between categories via the question settings page
     When I navigate to "Question bank > Questions" in current page administration
     And I set the field "Select a category" to "Used category"
-    And I click on "Edit" "link" in the "Test question to be moved" "table_row"
+    And I choose "Edit question" action for "Test question to be moved" in the question bank
     And I click on "Use this category" "checkbox"
     And I set the field "Save in category" to "Subcategory"
     And I press "id_submitbutton"
diff --git a/question/tests/behat/question_categories_idnumber.feature b/question/tests/behat/question_categories_idnumber.feature
index 695a5a45d5c21..8f496d1e18a8f 100644
--- a/question/tests/behat/question_categories_idnumber.feature
+++ b/question/tests/behat/question_categories_idnumber.feature
@@ -58,7 +58,7 @@ Feature: A teacher can put questions with idnumbers in categories with idnumbers
       | Used category    | essay | Test question 1 | Write about whatever you want | q1       |
       | Used category    | essay | Test question 2 | Write about whatever you want | q2       |
     And I navigate to "Question bank > Questions" in current page administration
-    And I click on "Edit" "link" in the "Test question 2" "table_row"
+    And I choose "Edit question" action for "Test question 2" in the question bank
     And I set the field "ID number" to "q1"
     And I press "submitbutton"
     # This is the standard form warning reminding the user that the idnumber needs to be unique for a category.
@@ -73,11 +73,11 @@ Feature: A teacher can put questions with idnumbers in categories with idnumbers
       | questioncategory | qtype | name            | questiontext                  | idnumber |
       | Used category    | essay | Test question 1 | Write about whatever you want | q1       |
     And I navigate to "Question bank > Questions" in current page administration
-    And I click on "Edit" "link" in the "Test question 1" "table_row"
+    And I choose "Edit question" action for "Test question 1" in the question bank
     And I press "Save changes"
     Then I should not see "This ID number is already in use"
 
-  Scenario: Question idnumber conficts found when saving to a different category.
+  Scenario: Question idnumber conflicts found when saving to a different category.
     When the following "question categories" exist:
       | contextlevel | reference | questioncategory | name       |
       | Course       | C1        | Top              | top        |
@@ -88,7 +88,7 @@ Feature: A teacher can put questions with idnumbers in categories with idnumbers
       | Category 1       | essay | Question to edit | Write about whatever you want | q1       |
       | Category 2       | essay | Other question   | Write about whatever you want | q2       |
     And I navigate to "Question bank > Questions" in current page administration
-    And I click on "Edit" "link" in the "Question to edit" "table_row"
+    And I choose "Edit question" action for "Question to edit" in the question bank
     And I set the following fields to these values:
       | Use this category | 0          |
       | ID number         | q2         |
@@ -109,7 +109,7 @@ Feature: A teacher can put questions with idnumbers in categories with idnumbers
       | Used category    | essay | Test question 2 | Write about whatever you want | q2       |
       | Subcategory      | essay | Test question 3 | Write about whatever you want | q3       |
     When I navigate to "Question bank > Questions" in current page administration
-    And I click on "Edit" "link" in the "Test question 3" "table_row"
+    And I choose "Edit question" action for "Test question 3" in the question bank
     # The q1 idnumber is allowed for this question while it is in the Subcategory.
     And I set the field "ID number" to "q1"
     And I press "submitbutton"
@@ -117,6 +117,6 @@ Feature: A teacher can put questions with idnumbers in categories with idnumbers
     And I click on "Test question 3" "checkbox" in the "Test question 3" "table_row"
     And I set the field "Question category" to "Used category"
     And I press "Move to >>"
-    And I click on "Edit" "link" in the "Test question 3" "table_row"
+    And I choose "Edit question" action for "Test question 3" in the question bank
     # The question just moved into this category needs to have a unique idnumber, so a number is appended.
     Then the field "ID number" matches value "q1_1"
diff --git a/question/tests/category_class_test.php b/question/tests/category_class_test.php
new file mode 100644
index 0000000000000..4bfaf200950c8
--- /dev/null
+++ b/question/tests/category_class_test.php
@@ -0,0 +1,178 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Events tests.
+ *
+ * @package core_question
+ * @copyright 2019 the Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+
+require_once($CFG->dirroot . '/question/editlib.php');
+require_once($CFG->dirroot . '/question/category_class.php');
+
+class core_question_category_class_testcase extends advanced_testcase {
+
+    /**
+     * @var question_category_object used in the tests.
+     */
+    protected $qcobject;
+
+    /**
+     * @var context a context to use.
+     */
+    protected $context;
+
+    /**
+     * @var stdClass top category in context.
+     */
+    protected $topcat;
+
+    protected function setUp() {
+        parent::setUp();
+        self::setAdminUser();
+        $this->resetAfterTest();
+        $this->context = context_course::instance(SITEID);
+        $contexts = new question_edit_contexts($this->context);
+        $this->topcat = question_get_top_category($this->context->id, true);
+        $this->qcobject = new question_category_object(null,
+                new moodle_url('/question/category.php', ['courseid' => SITEID]),
+                $contexts->having_one_edit_tab_cap('categories'), 0, null, 0,
+                $contexts->having_cap('moodle/question:add'));
+    }
+
+    /**
+     * Test creating a category.
+     */
+    public function test_add_category_no_idnumber() {
+        global $DB;
+
+        $id = $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'New category', '', true, FORMAT_HTML, ''); // No idnumber passed as '' to match form data.
+
+        $newcat = $DB->get_record('question_categories', ['id' => $id], '*', MUST_EXIST);
+        $this->assertSame('New category', $newcat->name);
+        $this->assertNull($newcat->idnumber);
+    }
+
+    /**
+     * Test creating a category with a tricky idnumber.
+     */
+    public function test_add_category_set_idnumber_0() {
+        global $DB;
+
+        $id = $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'New category', '', true, FORMAT_HTML, '0');
+
+        $newcat = $DB->get_record('question_categories', ['id' => $id], '*', MUST_EXIST);
+        $this->assertSame('New category', $newcat->name);
+        $this->assertSame('0', $newcat->idnumber);
+    }
+
+    /**
+     * Trying to add a category with duplicate idnumber blanks it.
+     * (In reality, this would probably get caught by form validation.)
+     */
+    public function test_add_category_try_to_set_duplicate_idnumber() {
+        global $DB;
+
+        $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'Existing category', '', true, FORMAT_HTML, 'frog');
+
+        $id = $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'New category', '', true, FORMAT_HTML, 'frog');
+
+        $newcat = $DB->get_record('question_categories', ['id' => $id], '*', MUST_EXIST);
+        $this->assertSame('New category', $newcat->name);
+        $this->assertNull($newcat->idnumber);
+    }
+
+    /**
+     * Test updating a category.
+     */
+    public function test_update_category() {
+        global $DB;
+
+        $id = $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'Old name', 'Description', true, FORMAT_HTML, 'frog');
+
+        $this->qcobject->update_category($id, $this->topcat->id . ',' . $this->topcat->contextid,
+                'New name', 'New description', FORMAT_HTML, '0', false);
+
+        $newcat = $DB->get_record('question_categories', ['id' => $id], '*', MUST_EXIST);
+        $this->assertSame('New name', $newcat->name);
+        $this->assertSame('0', $newcat->idnumber);
+    }
+
+    /**
+     * Test updating a category to remove the idnumber.
+     */
+    public function test_update_category_removing_idnumber() {
+        global $DB;
+
+        $id = $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'Old name', 'Description', true, FORMAT_HTML, 'frog');
+
+        $this->qcobject->update_category($id, $this->topcat->id . ',' . $this->topcat->contextid,
+                'New name', 'New description', FORMAT_HTML, '', false);
+
+        $newcat = $DB->get_record('question_categories', ['id' => $id], '*', MUST_EXIST);
+        $this->assertSame('New name', $newcat->name);
+        $this->assertNull($newcat->idnumber);
+    }
+
+    /**
+     * Test updating a category without changing the idnumber.
+     */
+    public function test_update_category_dont_change_idnumber() {
+        global $DB;
+
+        $id = $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'Old name', 'Description', true, FORMAT_HTML, 'frog');
+
+        $this->qcobject->update_category($id, $this->topcat->id . ',' . $this->topcat->contextid,
+                'New name', 'New description', FORMAT_HTML, 'frog', false);
+
+        $newcat = $DB->get_record('question_categories', ['id' => $id], '*', MUST_EXIST);
+        $this->assertSame('New name', $newcat->name);
+        $this->assertSame('frog', $newcat->idnumber);
+    }
+
+    /**
+     * Trying to update a category so its idnumber duplicates idnumber blanks it.
+     * (In reality, this would probably get caught by form validation.)
+     */
+    public function test_update_category_try_to_set_duplicate_idnumber() {
+        global $DB;
+
+        $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'Existing category', '', true, FORMAT_HTML, 'toad');
+        $id = $this->qcobject->add_category($this->topcat->id . ',' . $this->topcat->contextid,
+                'old name', '', true, FORMAT_HTML, 'frog');
+
+        $this->qcobject->update_category($id, $this->topcat->id . ',' . $this->topcat->contextid,
+                'New name', '', FORMAT_HTML, 'toad', false);
+
+        $newcat = $DB->get_record('question_categories', ['id' => $id], '*', MUST_EXIST);
+        $this->assertSame('New name', $newcat->name);
+        $this->assertNull($newcat->idnumber);
+    }
+}
diff --git a/question/tests/generator/lib.php b/question/tests/generator/lib.php
index 4d09630e4c63b..5d10eb812d0c5 100644
--- a/question/tests/generator/lib.php
+++ b/question/tests/generator/lib.php
@@ -102,7 +102,7 @@ public function create_question($qtype, $which = null, $overrides = null) {
      * @param array|stdClass $overrides any fields that should be different from the base example.
      */
     public function update_question($question, $which = null, $overrides = null) {
-        global $CFG;
+        global $CFG, $DB;
         require_once($CFG->dirroot . '/question/engine/tests/helpers.php');
 
         $qtype = $question->qtype;
@@ -113,7 +113,16 @@ public function update_question($question, $which = null, $overrides = null) {
         $fromform = (object) $this->datagenerator->combine_defaults_and_record(
                 (array) $fromform, $overrides);
 
-        return question_bank::get_qtype($qtype)->save_question($question, $fromform);
+        $question = question_bank::get_qtype($qtype)->save_question($question, $fromform);
+
+        if ($overrides && array_key_exists('createdby', $overrides)) {
+            // Manually update the createdby because questiontypebase forces current user and some tests require a
+            // specific user.
+            $question->createdby = $overrides['createdby'];
+            $DB->update_record('question', $question);
+        }
+
+        return $question;
     }
 
     /**
diff --git a/question/type/calculated/datasetitems_form.php b/question/type/calculated/datasetitems_form.php
index 21ac15f32fa60..a29cc7bfe37af 100644
--- a/question/type/calculated/datasetitems_form.php
+++ b/question/type/calculated/datasetitems_form.php
@@ -410,7 +410,7 @@ public function set_data($question) {
                     if ($this->_form->getElementType("number[{$j}]") == 'hidden') {
                         // Some of the number elements are from the float type and some are from the hidden type.
                         // We need to manually handle localised floats for hidden elements.
-                        $value = format_float($value, strlen($value), true, true);
+                        $value = format_float($value, -1);
                     }
                     $formdata["number[{$j}]"] = $value;
                     $formdata["definition[{$j}]"] = $defid;
@@ -449,7 +449,7 @@ public function set_data($question) {
                 if ($this->_form->getElementType("number[{$j}]") == 'hidden') {
                     // Some of the number elements are from the float type and some are from the hidden type.
                     // We need to manually handle localised floats for hidden elements.
-                    $value = format_float($value, strlen($value), true, true);
+                    $value = format_float($value, -1);
                 }
                 $formdata["number[{$j}]"] = $value;
                 $formdata["definition[{$j}]"] = $defid;
diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php
index a639b0045d93c..6769936f5735d 100644
--- a/question/type/calculated/db/upgrade.php
+++ b/question/type/calculated/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_calculated_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/calculatedsimple/edit_calculatedsimple_form.php b/question/type/calculatedsimple/edit_calculatedsimple_form.php
index a48372e02fc65..7af36e2d43d5d 100644
--- a/question/type/calculatedsimple/edit_calculatedsimple_form.php
+++ b/question/type/calculatedsimple/edit_calculatedsimple_form.php
@@ -508,8 +508,7 @@ protected function definition_inner($mform) {
                             $mform->addElement('hidden', "number[{$j}]", '');
                             $mform->setType("number[{$j}]", PARAM_LOCALISEDFLOAT); // Localisation handling has to be done manually.
                             if (isset($this->formdata["number[{$j}]"])) {
-                                $number = $this->formdata["number[{$j}]"];
-                                $this->formdata["number[{$j}]"] = format_float($number, strlen($number), true, true);
+                                $this->formdata["number[{$j}]"] = format_float($this->formdata["number[{$j}]"], -1);
                             }
                         }
 
diff --git a/question/type/ddimageortext/lang/en/qtype_ddimageortext.php b/question/type/ddimageortext/lang/en/qtype_ddimageortext.php
index 4143d01f86d97..7c8c59fa7e23b 100644
--- a/question/type/ddimageortext/lang/en/qtype_ddimageortext.php
+++ b/question/type/ddimageortext/lang/en/qtype_ddimageortext.php
@@ -70,3 +70,4 @@
 $string['summariseplaceno'] = 'Drop zone {$a}';
 $string['xleft'] = 'Left';
 $string['ytop'] = 'Top';
+$string['deletedchoice'] = '[Deleted choice]';
diff --git a/question/type/ddimageortext/questionbase.php b/question/type/ddimageortext/questionbase.php
index bbaf9bfba059b..4754bf5760ce8 100644
--- a/question/type/ddimageortext/questionbase.php
+++ b/question/type/ddimageortext/questionbase.php
@@ -62,7 +62,11 @@ public function summarise_response(array $response) {
                                                                 $response[$this->field($placeno)]) {
                 $selected = $this->get_selected_choice($place->group,
                                                                 $response[$this->field($placeno)]);
-                $summarisechoice = $selected->summarise();
+                if (isset($selected)) {
+                    $summarisechoice = $selected->summarise();
+                } else {
+                    $summarisechoice = get_string('deletedchoice', 'qtype_ddimageortext');
+                }
                 $allblank = false;
             } else {
                 $summarisechoice = '';
diff --git a/question/type/ddimageortext/tests/behat/backup_and_restore.feature b/question/type/ddimageortext/tests/behat/backup_and_restore.feature
index b81f46c1a15e2..653d407e32e8a 100644
--- a/question/type/ddimageortext/tests/behat/backup_and_restore.feature
+++ b/question/type/ddimageortext/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a drag and drop onto image question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "Drag onto image" "table_row"
+    And I choose "Edit question" action for "Drag onto image" in the question bank
     Then the following fields match these values:
       | Question name                       | Drag onto image                                      |
       | General feedback                    | <p>More information about the major features of the Earth's surface can be found in Block 3, Section 6.2.</p> |
diff --git a/question/type/ddimageortext/tests/behat/edit.feature b/question/type/ddimageortext/tests/behat/edit.feature
index 19c87f9d59a3c..7fecbcfe47734 100644
--- a/question/type/ddimageortext/tests/behat/edit.feature
+++ b/question/type/ddimageortext/tests/behat/edit.feature
@@ -26,7 +26,7 @@ Feature: Test editing a drag and drop onto image questions
 
   @javascript
   Scenario: Edit a drag and drop onto image question
-    When I click on "Edit" "link" in the "Drag onto image" "table_row"
+    And I choose "Edit question" action for "Drag onto image" in the question bank
     And I set the following fields to these values:
       | Question name | Edited question name |
     And I press "id_submitbutton"
diff --git a/question/type/ddimageortext/tests/behat/preview.feature b/question/type/ddimageortext/tests/behat/preview.feature
index eac31a37f465b..4a28641884052 100644
--- a/question/type/ddimageortext/tests/behat/preview.feature
+++ b/question/type/ddimageortext/tests/behat/preview.feature
@@ -26,7 +26,7 @@ Feature: Preview a drag-drop onto image question
 
   @javascript @_bug_phantomjs
   Scenario: Preview a question using the mouse.
-    When I click on "Preview" "link" in the "Drag onto image" "table_row"
+    When I choose "Preview" action for "Drag onto image" in the question bank
     And I switch to "questionpreview" window
     # Increase window size and wait 2 seconds to ensure elements are placed properly by js.
     # Keep window large else drag will scroll the window to find element.
@@ -48,7 +48,7 @@ Feature: Preview a drag-drop onto image question
 
   @javascript
   Scenario: Preview a question using the keyboard.
-    When I click on "Preview" "link" in the "Drag onto image" "table_row"
+    When I choose "Preview" action for "Drag onto image" in the question bank
     And I switch to "questionpreview" window
     # Increase window size and wait 2 seconds to ensure elements are placed properly by js.
     And I change window size to "medium"
diff --git a/question/type/ddimageortext/tests/question_test.php b/question/type/ddimageortext/tests/question_test.php
index 08e64b1aa772e..b741bf4b7d18e 100644
--- a/question/type/ddimageortext/tests/question_test.php
+++ b/question/type/ddimageortext/tests/question_test.php
@@ -266,4 +266,19 @@ public function test_classify_response() {
             4 => new question_classified_response(4, '4. dog', 1)
         ), $dd->classify_response(array('p1' => '', 'p2' => '1', 'p3' => '2', 'p4' => '2')));
     }
+
+    public function test_summarise_response_choice_deleted() {
+        /** @var qtype_ddtoimage_question_base $dd */
+        $dd = test_question_maker::make_question('ddimageortext');
+        $dd->shufflechoices = false;
+        $dd->start_attempt(new question_attempt_step(), 1);
+        // Simulation of an instructor deleting 1 choice after an attempt has been made.
+        unset($dd->choices[1][1]);
+        $delquestionstr = get_string('deletedchoice', 'qtype_ddimageortext');
+        $this->assertEquals("Drop zone 1 -> {{$delquestionstr}} ".
+            "Drop zone 2 -> {{$delquestionstr}} ".
+            'Drop zone 3 -> {3. lazy} '.
+            'Drop zone 4 -> {3. lazy}',
+            $dd->summarise_response(array('p1' => '1', 'p2' => '1', 'p3' => '1', 'p4' => '1')));
+    }
 }
diff --git a/question/type/ddmarker/amd/build/shapes.min.js b/question/type/ddmarker/amd/build/shapes.min.js
index 6fee89794ff57..93218c4467891 100644
--- a/question/type/ddmarker/amd/build/shapes.min.js
+++ b/question/type/ddmarker/amd/build/shapes.min.js
@@ -1 +1 @@
-define(function(){"use strict";function a(a,b){this.x=a,this.y=b}function b(b,c,d){this.label=b,this.centre=new a(c||0,d||0)}function c(a,c,d,e){b.call(this,a,c,d),this.radius=e||15}function d(a,c,d,e,f){b.call(this,a,c,d),this.width=e||30,this.height=f||30}function e(c,d){b.call(this,c,0,0),this.points=d?d.slice():[new a(10,10),new a(40,10),new a(10,40)],this.normalizeShape()}function f(a){b.call(this,a)}function g(a,b){var c=a.ownerDocument.createElementNS("http://www.w3.org/2000/svg",b);return a.appendChild(c),c}function h(a,b){var c=g(a,"g");return g(c,b).setAttribute("class","shape"),g(c,"text").setAttribute("class","shapeLabel"),c}return a.prototype.toString=function(){return this.x+","+this.y},a.prototype.move=function(a,b){this.x+=a,this.y+=b},a.prototype.offset=function(b,c){return b instanceof a&&(c=b.y,b=b.x),new a(this.x+b,this.y+c)},a.parse=function(b){var c=b.split(",");if(2!==c.length)throw new Error(b+" is not a valid point");return new a(Math.round(c[0]),Math.round(c[1]))},b.prototype.getType=function(){throw new Error("Not implemented.")},b.prototype.getCoordinates=function(){throw new Error("Not implemented.")},b.prototype.parse=function(a){throw new Error("Not implemented.")},b.prototype.move=function(a,b,c,d){},b.prototype.edit=function(a,b,c,d,e){},b.prototype.normalizeShape=function(){},b.prototype.makeSvg=function(a){throw new Error("Not implemented.")},b.prototype.updateSvg=function(a){},b.prototype.makeSimilarCircle=function(){throw new Error("Not implemented.")},b.prototype.makeSimilarRectangle=function(){throw new Error("Not implemented.")},b.prototype.makeSimilarPolygon=function(){throw new Error("Not implemented.")},b.prototype.getHandlePositions=function(){return null},c.prototype=new b,c.prototype.getType=function(){return"circle"},c.prototype.getCoordinates=function(){return this.centre+";"+Math.abs(this.radius)},c.prototype.makeSvg=function(a){var b=h(a,"circle");return this.updateSvg(b),b},c.prototype.updateSvg=function(a){a.childNodes[0].setAttribute("cx",this.centre.x),a.childNodes[0].setAttribute("cy",this.centre.y),a.childNodes[0].setAttribute("r",Math.abs(this.radius)),a.childNodes[1].setAttribute("x",this.centre.x),a.childNodes[1].setAttribute("y",this.centre.y+15),a.childNodes[1].textContent=this.label},c.prototype.parse=function(b){if(!b.match(/^\d+,\d+;\d+$/))return!1;var c=b.split(";");return this.centre=a.parse(c[0]),this.radius=Math.round(c[1]),!0},c.prototype.move=function(a,b,c,d){this.centre.move(a,b),this.centre.x<this.radius&&(this.centre.x=this.radius),this.centre.x>c-this.radius&&(this.centre.x=c-this.radius),this.centre.y<this.radius&&(this.centre.y=this.radius),this.centre.y>d-this.radius&&(this.centre.y=d-this.radius)},c.prototype.edit=function(a,b,c,d,e){this.radius+=b;var f=Math.min(this.centre.x,this.centre.y,d-this.centre.x,e-this.centre.y);this.radius>f&&(this.radius=f),this.radius<-f&&(this.radius=-f)},c.prototype.normalizeShape=function(){this.radius=Math.abs(this.radius)},c.prototype.makeSimilarRectangle=function(){return new d(this.label,this.centre.x-this.radius,this.centre.y-this.radius,2*this.radius,2*this.radius)},c.prototype.makeSimilarPolygon=function(){return new e(this.label,[this.centre.offset(-this.radius,-this.radius),this.centre.offset(-this.radius,this.radius),this.centre.offset(this.radius,this.radius),this.centre.offset(this.radius,-this.radius)])},c.prototype.getHandlePositions=function(){return{moveHandle:this.centre,editHandles:[this.centre.offset(this.radius,0)]}},d.prototype=new b,d.prototype.getType=function(){return"rectangle"},d.prototype.getCoordinates=function(){return this.centre+";"+this.width+","+this.height},d.prototype.makeSvg=function(a){var b=h(a,"rect");return this.updateSvg(b),b},d.prototype.updateSvg=function(a){this.width>=0?(a.childNodes[0].setAttribute("x",this.centre.x),a.childNodes[0].setAttribute("width",this.width)):(a.childNodes[0].setAttribute("x",this.centre.x+this.width),a.childNodes[0].setAttribute("width",-this.width)),this.height>=0?(a.childNodes[0].setAttribute("y",this.centre.y),a.childNodes[0].setAttribute("height",this.height)):(a.childNodes[0].setAttribute("y",this.centre.y+this.height),a.childNodes[0].setAttribute("height",-this.height)),a.childNodes[1].setAttribute("x",this.centre.x+this.width/2),a.childNodes[1].setAttribute("y",this.centre.y+this.height/2+15),a.childNodes[1].textContent=this.label},d.prototype.parse=function(b){if(!b.match(/^\d+,\d+;\d+,\d+$/))return!1;var c=b.split(";");this.centre=a.parse(c[0]);var d=a.parse(c[1]);return this.width=d.x,this.height=d.y,!0},d.prototype.move=function(a,b,c,d){this.centre.move(a,b),this.centre.x<0&&(this.centre.x=0),this.centre.x>c-this.width&&(this.centre.x=c-this.width),this.centre.y<0&&(this.centre.y=0),this.centre.y>d-this.height&&(this.centre.y=d-this.height)},d.prototype.edit=function(a,b,c,d,e){this.width+=b,this.height+=c,this.width<-this.centre.x&&(this.width=-this.centre.x),this.width>d-this.centre.x&&(this.width=d-this.centre.x),this.height<-this.centre.y&&(this.height=-this.centre.y),this.height>e-this.centre.y&&(this.height=e-this.centre.y)},d.prototype.normalizeShape=function(){this.width<0&&(this.centre.x+=this.width,this.width=-this.width),this.height<0&&(this.centre.y+=this.height,this.height=-this.height)},d.prototype.makeSimilarCircle=function(){return new c(this.label,Math.round(this.centre.x+this.width/2),Math.round(this.centre.y+this.height/2),Math.round((this.width+this.height)/4))},d.prototype.makeSimilarPolygon=function(){return new e(this.label,[this.centre,this.centre.offset(0,this.height),this.centre.offset(this.width,this.height),this.centre.offset(this.width,0)])},d.prototype.getHandlePositions=function(){return{moveHandle:this.centre.offset(this.width/2,this.height/2),editHandles:[this.centre.offset(this.width,this.height)]}},e.prototype=new b,e.prototype.getType=function(){return"polygon"},e.prototype.getCoordinates=function(){for(var a="",b=0;b<this.points.length;b++)a+=this.centre.offset(this.points[b])+";";return a.slice(0,a.length-1)},e.prototype.makeSvg=function(a){var b=h(a,"polygon");return this.updateSvg(b),b},e.prototype.updateSvg=function(a){a.childNodes[0].setAttribute("points",this.getCoordinates().replace(/[,;]/g," ")),a.childNodes[1].setAttribute("x",this.centre.x),a.childNodes[1].setAttribute("y",this.centre.y+15),a.childNodes[1].textContent=this.label},e.prototype.parse=function(b){if(!b.match(/^\d+,\d+(?:;\d+,\d+)*$/))return!1;for(var c=b.split(";"),d=[],e=0;e<c.length;e++)d.push(a.parse(c[e]));return this.points=d,this.centre.x=0,this.centre.y=0,this.normalizeShape(),!0},e.prototype.move=function(a,b,c,d){this.centre.move(a,b);for(var e=c,f=0,g=d,h=0,i=0;i<this.points.length;i++)e=Math.min(e,this.points[i].x),f=Math.max(f,this.points[i].x),g=Math.min(g,this.points[i].y),h=Math.max(h,this.points[i].y);this.centre.x<-e&&(this.centre.x=-e),this.centre.x>c-f&&(this.centre.x=c-f),this.centre.y<-g&&(this.centre.y=-g),this.centre.y>d-h&&(this.centre.y=d-h)},e.prototype.edit=function(a,b,c,d,e){this.points[a].move(b,c),this.points[a].x<-this.centre.x&&(this.points[a].x=-this.centre.x),this.points[a].x>d-this.centre.x&&(this.points[a].x=d-this.centre.x),this.points[a].y<-this.centre.y&&(this.points[a].y=-this.centre.y),this.points[a].y>e-this.centre.y&&(this.points[a].y=e-this.centre.y)},e.prototype.addNewPointAfter=function(b){this.points.splice(b,0,new a(this.points[b].x,this.points[b].y))},e.prototype.normalizeShape=function(){var a,b=0,c=0;if(0!==this.points.length){for(a=0;a<this.points.length;a++)b+=this.points[a].x,c+=this.points[a].y;if(b=Math.round(b/this.points.length),c=Math.round(c/this.points.length),0!==b||0!==c){for(a=0;a<this.points.length;a++)this.points[a].move(-b,-c);this.centre.move(b,c)}}},e.prototype.makeSimilarCircle=function(){return this.makeSimilarRectangle().makeSimilarCircle()},e.prototype.makeSimilarRectangle=function(){for(var a,b=0,c=0,e=0,f=0,g=0;g<this.points.length;g++)a=this.points[g],b=Math.min(b,a.x),c=Math.max(c,a.x),e=Math.min(e,a.y),f=Math.max(f,a.y);return new d(this.label,this.centre.x+b,this.centre.y+e,Math.max(c-b,10),Math.max(f-e,10))},e.prototype.getHandlePositions=function(){for(var a=[],b=0;b<this.points.length;b++)a.push(this.points[b].offset(this.centre.x,this.centre.y));return{moveHandle:this.centre,editHandles:a}},f.prototype=new b,f.prototype.getType=function(){return"null"},f.prototype.getCoordinates=function(){return""},f.prototype.makeSvg=function(a){return null},f.prototype.updateSvg=function(a){},f.prototype.parse=function(a){return!1},f.prototype.makeSimilarCircle=function(){return new c(this.label)},f.prototype.makeSimilarRectangle=function(){return new d(this.label)},f.prototype.makeSimilarPolygon=function(){return new e(this.label)},{Point:a,Shape:b,Circle:c,Rectangle:d,Polygon:e,NullShape:f,createSvgElement:g,make:function(a,b){switch(a){case"circle":return new c(b);case"rectangle":return new d(b);case"polygon":return new e(b);default:return new f(b)}},getSimilar:function(a,b){if(a===b.getType())return b;switch(a){case"circle":return b.makeSimilarCircle();case"rectangle":return b.makeSimilarRectangle();case"polygon":return b.makeSimilarPolygon();default:return new f(b.label)}}}});
\ No newline at end of file
+define(function(){"use strict";function a(a,b){this.x=a,this.y=b}function b(b,c,d){this.label=b,this.centre=new a(c||0,d||0)}function c(a,c,d,e){c=c||15,d=d||15,b.call(this,a,c,d),this.radius=e||15}function d(a,c,d,e,f){b.call(this,a,c,d),this.width=e||30,this.height=f||30}function e(c,d){b.call(this,c,0,0),this.points=d?d.slice():[new a(10,10),new a(40,10),new a(10,40)],this.normalizeShape()}function f(a){b.call(this,a)}function g(a,b){var c=a.ownerDocument.createElementNS("http://www.w3.org/2000/svg",b);return a.appendChild(c),c}function h(a,b){var c=g(a,"g");return g(c,b).setAttribute("class","shape"),g(c,"text").setAttribute("class","shapeLabel"),c}return a.prototype.toString=function(){return this.x+","+this.y},a.prototype.move=function(a,b){this.x+=a,this.y+=b},a.prototype.offset=function(b,c){return b instanceof a&&(c=b.y,b=b.x),new a(this.x+b,this.y+c)},a.parse=function(b){var c=b.split(",");if(2!==c.length)throw new Error(b+" is not a valid point");return new a(Math.round(c[0]),Math.round(c[1]))},b.prototype.getType=function(){throw new Error("Not implemented.")},b.prototype.getCoordinates=function(){throw new Error("Not implemented.")},b.prototype.parse=function(a){throw new Error("Not implemented.")},b.prototype.move=function(a,b,c,d){},b.prototype.edit=function(a,b,c,d,e){},b.prototype.normalizeShape=function(){},b.prototype.makeSvg=function(a){throw new Error("Not implemented.")},b.prototype.updateSvg=function(a){},b.prototype.makeSimilarCircle=function(){throw new Error("Not implemented.")},b.prototype.makeSimilarRectangle=function(){throw new Error("Not implemented.")},b.prototype.makeSimilarPolygon=function(){throw new Error("Not implemented.")},b.prototype.getHandlePositions=function(){return null},c.prototype=new b,c.prototype.getType=function(){return"circle"},c.prototype.getCoordinates=function(){return this.centre+";"+Math.abs(this.radius)},c.prototype.makeSvg=function(a){var b=h(a,"circle");return this.updateSvg(b),b},c.prototype.updateSvg=function(a){a.childNodes[0].setAttribute("cx",this.centre.x),a.childNodes[0].setAttribute("cy",this.centre.y),a.childNodes[0].setAttribute("r",Math.abs(this.radius)),a.childNodes[1].setAttribute("x",this.centre.x),a.childNodes[1].setAttribute("y",this.centre.y+15),a.childNodes[1].textContent=this.label},c.prototype.parse=function(b){if(!b.match(/^\d+,\d+;\d+$/))return!1;var c=b.split(";");return this.centre=a.parse(c[0]),this.radius=Math.round(c[1]),!0},c.prototype.move=function(a,b,c,d){this.centre.move(a,b),this.centre.x<this.radius&&(this.centre.x=this.radius),this.centre.x>c-this.radius&&(this.centre.x=c-this.radius),this.centre.y<this.radius&&(this.centre.y=this.radius),this.centre.y>d-this.radius&&(this.centre.y=d-this.radius)},c.prototype.edit=function(a,b,c,d,e){this.radius+=b;var f=Math.min(this.centre.x,this.centre.y,d-this.centre.x,e-this.centre.y);this.radius>f&&(this.radius=f),this.radius<-f&&(this.radius=-f)},c.prototype.normalizeShape=function(){this.radius=Math.abs(this.radius)},c.prototype.makeSimilarRectangle=function(){return new d(this.label,this.centre.x-this.radius,this.centre.y-this.radius,2*this.radius,2*this.radius)},c.prototype.makeSimilarPolygon=function(){return new e(this.label,[this.centre.offset(-this.radius,-this.radius),this.centre.offset(-this.radius,this.radius),this.centre.offset(this.radius,this.radius),this.centre.offset(this.radius,-this.radius)])},c.prototype.getHandlePositions=function(){return{moveHandle:this.centre,editHandles:[this.centre.offset(this.radius,0)]}},d.prototype=new b,d.prototype.getType=function(){return"rectangle"},d.prototype.getCoordinates=function(){return this.centre+";"+this.width+","+this.height},d.prototype.makeSvg=function(a){var b=h(a,"rect");return this.updateSvg(b),b},d.prototype.updateSvg=function(a){this.width>=0?(a.childNodes[0].setAttribute("x",this.centre.x),a.childNodes[0].setAttribute("width",this.width)):(a.childNodes[0].setAttribute("x",this.centre.x+this.width),a.childNodes[0].setAttribute("width",-this.width)),this.height>=0?(a.childNodes[0].setAttribute("y",this.centre.y),a.childNodes[0].setAttribute("height",this.height)):(a.childNodes[0].setAttribute("y",this.centre.y+this.height),a.childNodes[0].setAttribute("height",-this.height)),a.childNodes[1].setAttribute("x",this.centre.x+this.width/2),a.childNodes[1].setAttribute("y",this.centre.y+this.height/2+15),a.childNodes[1].textContent=this.label},d.prototype.parse=function(b){if(!b.match(/^\d+,\d+;\d+,\d+$/))return!1;var c=b.split(";");this.centre=a.parse(c[0]);var d=a.parse(c[1]);return this.width=d.x,this.height=d.y,!0},d.prototype.move=function(a,b,c,d){this.centre.move(a,b),this.centre.x<0&&(this.centre.x=0),this.centre.x>c-this.width&&(this.centre.x=c-this.width),this.centre.y<0&&(this.centre.y=0),this.centre.y>d-this.height&&(this.centre.y=d-this.height)},d.prototype.edit=function(a,b,c,d,e){this.width+=b,this.height+=c,this.width<-this.centre.x&&(this.width=-this.centre.x),this.width>d-this.centre.x&&(this.width=d-this.centre.x),this.height<-this.centre.y&&(this.height=-this.centre.y),this.height>e-this.centre.y&&(this.height=e-this.centre.y)},d.prototype.normalizeShape=function(){this.width<0&&(this.centre.x+=this.width,this.width=-this.width),this.height<0&&(this.centre.y+=this.height,this.height=-this.height)},d.prototype.makeSimilarCircle=function(){return new c(this.label,Math.round(this.centre.x+this.width/2),Math.round(this.centre.y+this.height/2),Math.round((this.width+this.height)/4))},d.prototype.makeSimilarPolygon=function(){return new e(this.label,[this.centre,this.centre.offset(0,this.height),this.centre.offset(this.width,this.height),this.centre.offset(this.width,0)])},d.prototype.getHandlePositions=function(){return{moveHandle:this.centre.offset(this.width/2,this.height/2),editHandles:[this.centre.offset(this.width,this.height)]}},e.prototype=new b,e.prototype.getType=function(){return"polygon"},e.prototype.getCoordinates=function(){for(var a="",b=0;b<this.points.length;b++)a+=this.centre.offset(this.points[b])+";";return a.slice(0,a.length-1)},e.prototype.makeSvg=function(a){var b=h(a,"polygon");return this.updateSvg(b),b},e.prototype.updateSvg=function(a){a.childNodes[0].setAttribute("points",this.getCoordinates().replace(/[,;]/g," ")),a.childNodes[1].setAttribute("x",this.centre.x),a.childNodes[1].setAttribute("y",this.centre.y+15),a.childNodes[1].textContent=this.label},e.prototype.parse=function(b){if(!b.match(/^\d+,\d+(?:;\d+,\d+)*$/))return!1;for(var c=b.split(";"),d=[],e=0;e<c.length;e++)d.push(a.parse(c[e]));return this.points=d,this.centre.x=0,this.centre.y=0,this.normalizeShape(),!0},e.prototype.move=function(a,b,c,d){this.centre.move(a,b);for(var e=c,f=0,g=d,h=0,i=0;i<this.points.length;i++)e=Math.min(e,this.points[i].x),f=Math.max(f,this.points[i].x),g=Math.min(g,this.points[i].y),h=Math.max(h,this.points[i].y);this.centre.x<-e&&(this.centre.x=-e),this.centre.x>c-f&&(this.centre.x=c-f),this.centre.y<-g&&(this.centre.y=-g),this.centre.y>d-h&&(this.centre.y=d-h)},e.prototype.edit=function(a,b,c,d,e){this.points[a].move(b,c),this.points[a].x<-this.centre.x&&(this.points[a].x=-this.centre.x),this.points[a].x>d-this.centre.x&&(this.points[a].x=d-this.centre.x),this.points[a].y<-this.centre.y&&(this.points[a].y=-this.centre.y),this.points[a].y>e-this.centre.y&&(this.points[a].y=e-this.centre.y)},e.prototype.addNewPointAfter=function(b){this.points.splice(b,0,new a(this.points[b].x,this.points[b].y))},e.prototype.normalizeShape=function(){var a,b=0,c=0;if(0!==this.points.length){for(a=0;a<this.points.length;a++)b+=this.points[a].x,c+=this.points[a].y;if(b=Math.round(b/this.points.length),c=Math.round(c/this.points.length),0!==b||0!==c){for(a=0;a<this.points.length;a++)this.points[a].move(-b,-c);this.centre.move(b,c)}}},e.prototype.makeSimilarCircle=function(){return this.makeSimilarRectangle().makeSimilarCircle()},e.prototype.makeSimilarRectangle=function(){for(var a,b=0,c=0,e=0,f=0,g=0;g<this.points.length;g++)a=this.points[g],b=Math.min(b,a.x),c=Math.max(c,a.x),e=Math.min(e,a.y),f=Math.max(f,a.y);return new d(this.label,this.centre.x+b,this.centre.y+e,Math.max(c-b,10),Math.max(f-e,10))},e.prototype.getHandlePositions=function(){for(var a=[],b=0;b<this.points.length;b++)a.push(this.points[b].offset(this.centre.x,this.centre.y));return{moveHandle:this.centre,editHandles:a}},f.prototype=new b,f.prototype.getType=function(){return"null"},f.prototype.getCoordinates=function(){return""},f.prototype.makeSvg=function(a){return null},f.prototype.updateSvg=function(a){},f.prototype.parse=function(a){return!1},f.prototype.makeSimilarCircle=function(){return new c(this.label)},f.prototype.makeSimilarRectangle=function(){return new d(this.label)},f.prototype.makeSimilarPolygon=function(){return new e(this.label)},{Point:a,Shape:b,Circle:c,Rectangle:d,Polygon:e,NullShape:f,createSvgElement:g,make:function(a,b){switch(a){case"circle":return new c(b);case"rectangle":return new d(b);case"polygon":return new e(b);default:return new f(b)}},getSimilar:function(a,b){if(a===b.getType())return b;switch(a){case"circle":return b.makeSimilarCircle();case"rectangle":return b.makeSimilarRectangle();case"polygon":return b.makeSimilarPolygon();default:return new f(b.label)}}}});
\ No newline at end of file
diff --git a/question/type/ddmarker/amd/src/shapes.js b/question/type/ddmarker/amd/src/shapes.js
index 2345a46a41758..dec8c0945e9d3 100644
--- a/question/type/ddmarker/amd/src/shapes.js
+++ b/question/type/ddmarker/amd/src/shapes.js
@@ -234,6 +234,8 @@ define(function() {
      * @constructor
      */
     function Circle(label, x, y, radius) {
+        x = x || 15;
+        y = y || 15;
         Shape.call(this, label, x, y);
         this.radius = radius || 15;
     }
diff --git a/question/type/ddmarker/db/upgrade.php b/question/type/ddmarker/db/upgrade.php
index 160f0f2f7843a..8dbd5180e4c41 100644
--- a/question/type/ddmarker/db/upgrade.php
+++ b/question/type/ddmarker/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_qtype_ddmarker_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/ddmarker/tests/behat/backup_and_restore.feature b/question/type/ddmarker/tests/behat/backup_and_restore.feature
index ec74498440546..5fde8360817a0 100644
--- a/question/type/ddmarker/tests/behat/backup_and_restore.feature
+++ b/question/type/ddmarker/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a drag and drop markers question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "Drag markers" "table_row"
+    And I choose "Edit question" action for "Drag markers" in the question bank
     Then the following fields match these values:
       | Question name                       | Drag markers                                         |
       | Question text                       | Please place the markers on the map of Milton Keynes and be aware that there is more than one railway station. |
diff --git a/question/type/ddmarker/tests/behat/edit.feature b/question/type/ddmarker/tests/behat/edit.feature
index c3d761f71fc3c..9e918177c3620 100644
--- a/question/type/ddmarker/tests/behat/edit.feature
+++ b/question/type/ddmarker/tests/behat/edit.feature
@@ -26,7 +26,7 @@ Feature: Test editing a drag and drop markers questions
 
   @javascript
   Scenario: Edit a drag and drop markers question
-    When I click on "Edit" "link" in the "Drag markers" "table_row"
+    When I choose "Edit question" action for "Drag markers" in the question bank
     And I set the following fields to these values:
       | Question name | Edited question name |
     And I press "id_submitbutton"
diff --git a/question/type/ddmarker/tests/behat/preview.feature b/question/type/ddmarker/tests/behat/preview.feature
index 187affa9b73c0..b95996eddab05 100644
--- a/question/type/ddmarker/tests/behat/preview.feature
+++ b/question/type/ddmarker/tests/behat/preview.feature
@@ -26,7 +26,7 @@ Feature: Preview a drag-drop marker question
 
   @javascript @_bug_phantomjs
   Scenario: Preview a question using the mouse.
-    When I click on "Preview" "link" in the "Drag markers" "table_row"
+    When I choose "Preview" action for "Drag markers" in the question bank
     And I switch to "questionpreview" window
     # Increase window size and wait 2 seconds to ensure elements are placed properly by js.
     # Keep window large else drag will scroll the window to find element.
@@ -44,7 +44,7 @@ Feature: Preview a drag-drop marker question
 
   @javascript
   Scenario: Preview a question using the keyboard.
-    When I click on "Preview" "link" in the "Drag markers" "table_row"
+    When I choose "Preview" action for "Drag markers" in the question bank
     And I switch to "questionpreview" window
     # Increase window size and wait 2 seconds to ensure elements are placed properly by js.
     # Keep window large else drag will scroll the window to find element.
diff --git a/question/type/ddwtos/tests/behat/backup_and_restore.feature b/question/type/ddwtos/tests/behat/backup_and_restore.feature
index c3d5731245ab7..87a7fc712b4f4 100644
--- a/question/type/ddwtos/tests/behat/backup_and_restore.feature
+++ b/question/type/ddwtos/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a drag and drop into text question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "Drag to text" "table_row"
+    And I choose "Edit question" action for "Drag to text" in the question bank
     Then the following fields match these values:
       | Question name                       | Drag to text                                         |
       | Question text                       | The [[1]] brown [[2]] jumped over the [[3]] dog.     |
diff --git a/question/type/ddwtos/tests/behat/edit.feature b/question/type/ddwtos/tests/behat/edit.feature
index 288830234bba4..d7c3872f68f22 100644
--- a/question/type/ddwtos/tests/behat/edit.feature
+++ b/question/type/ddwtos/tests/behat/edit.feature
@@ -26,7 +26,7 @@ Feature: Test editing a drag and drop into text questions
 
   @javascript
   Scenario: Edit a drag and drop into text question
-    When I click on "Edit" "link" in the "Drag to text" "table_row"
+    When I choose "Edit question" action for "Drag to text" in the question bank
     Then I should see "Choice [[1]]"
     And I should see "Choice [[2]]"
     And I should see "Choice [[3]]"
diff --git a/question/type/ddwtos/tests/behat/preview.feature b/question/type/ddwtos/tests/behat/preview.feature
index fe4a9138b3a6c..4abf47cf0ec68 100644
--- a/question/type/ddwtos/tests/behat/preview.feature
+++ b/question/type/ddwtos/tests/behat/preview.feature
@@ -26,7 +26,7 @@ Feature: Preview a drag-drop into text question
 
   @javascript @_bug_phantomjs
   Scenario: Preview a question using the mouse.
-    When I click on "Preview" "link" in the "Drag to text" "table_row"
+    When I choose "Preview" action for "Drag to text" in the question bank
     And I switch to "questionpreview" window
     # Increase window size and wait 2 seconds to ensure elements are placed properly by js.
     # Keep window large else drag will scroll the window to find element.
@@ -42,7 +42,7 @@ Feature: Preview a drag-drop into text question
 
   @javascript
   Scenario: Preview a question using the keyboard & submit incomplete.
-    When I click on "Preview" "link" in the "Drag to text" "table_row"
+    When I choose "Preview" action for "Drag to text" in the question bank
     And I switch to "questionpreview" window
     And I type " " into space "1" in the drag and drop onto image question
     And I type "   " into space "2" in the drag and drop onto image question
@@ -54,7 +54,7 @@ Feature: Preview a drag-drop into text question
 
   @javascript
   Scenario: Preview a question using the keyboard.
-    When I click on "Preview" "link" in the "Drag to text" "table_row"
+    When I choose "Preview" action for "Drag to text" in the question bank
     And I switch to "questionpreview" window
     And I type "  " into space "1" in the drag and drop onto image question
     And I type "  " into space "2" in the drag and drop onto image question
@@ -70,7 +70,7 @@ Feature: Preview a drag-drop into text question
       | questioncategory | qtype  | name         | template  |
       | Test questions   | ddwtos | Funny groups | oddgroups |
     And I reload the page
-    When I click on "Preview" "link" in the "Funny groups" "table_row"
+    When I choose "Preview" action for "Funny groups" in the question bank
     And I switch to "questionpreview" window
     And I type " " into space "1" in the drag and drop onto image question
     And I type " " into space "2" in the drag and drop onto image question
diff --git a/question/type/description/tests/behat/backup_and_restore.feature b/question/type/description/tests/behat/backup_and_restore.feature
index 633703a861b0e..6e9178e6733ee 100644
--- a/question/type/description/tests/behat/backup_and_restore.feature
+++ b/question/type/description/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a Description question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "description-001" "table_row"
+    And I choose "Edit question" action for "description-001" in the question bank
     Then the following fields match these values:
       | Question name                      | description-001                                                        |
       | Question text                      | Here is some information about the questions you are about to attempt. |
diff --git a/question/type/description/tests/behat/edit.feature b/question/type/description/tests/behat/edit.feature
index 67b225615e7dc..0aa144e60eb2d 100644
--- a/question/type/description/tests/behat/edit.feature
+++ b/question/type/description/tests/behat/edit.feature
@@ -25,7 +25,7 @@ Feature: Test editing a Description question
     And I navigate to "Question bank" in current page administration
 
   Scenario: Edit a Description question
-    When I click on "Edit" "link" in the "description-001" "table_row"
+    When I choose "Edit question" action for "description-001" in the question bank
     And I set the following fields to these values:
       | Question name | |
     And I press "id_submitbutton"
diff --git a/question/type/description/tests/behat/preview.feature b/question/type/description/tests/behat/preview.feature
index f65eebda0d929..13b4660369cb6 100644
--- a/question/type/description/tests/behat/preview.feature
+++ b/question/type/description/tests/behat/preview.feature
@@ -26,7 +26,7 @@ Feature: Preview a Description question
 
   @javascript @_switch_window
   Scenario: Preview a Description question and submit a correct response.
-    When I click on "Preview" "link" in the "description-001" "table_row"
+    When I choose "Preview" action for "description-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
diff --git a/question/type/essay/db/upgrade.php b/question/type/essay/db/upgrade.php
index 93acbb48e3177..46e30cfe578d4 100644
--- a/question/type/essay/db/upgrade.php
+++ b/question/type/essay/db/upgrade.php
@@ -61,5 +61,8 @@ function xmldb_qtype_essay_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/essay/tests/behat/backup_and_restore.feature b/question/type/essay/tests/behat/backup_and_restore.feature
index 609da1c4ba1e2..e16bbf2ff73c0 100644
--- a/question/type/essay/tests/behat/backup_and_restore.feature
+++ b/question/type/essay/tests/behat/backup_and_restore.feature
@@ -36,7 +36,7 @@ Feature: Test duplicating a quiz containing an Assay question
     And I should see "essay-001"
     And I should see "essay-002"
     And I should see "essay-003"
-    And I click on "Edit" "link" in the "essay-001" "table_row"
+    And I choose "Edit question" action for "essay-001" in the question bank
     Then the following fields match these values:
       | Question name              | essay-001                                               |
       | Question text              | Please write a story about a frog.                      |
@@ -44,7 +44,7 @@ Feature: Test duplicating a quiz containing an Assay question
       | Response format            | HTML editor                                             |
       | Require text               | Require the student to enter text                       |
     And I press "Cancel"
-    And I click on "Edit" "link" in the "essay-002" "table_row"
+    And I choose "Edit question" action for "essay-002" in the question bank
     Then the following fields match these values:
       | Question name              | essay-002                                               |
       | Question text              | Please write a story about a frog.                      |
@@ -52,7 +52,7 @@ Feature: Test duplicating a quiz containing an Assay question
       | Response format            | HTML editor with file picker                            |
       | Require text               | Require the student to enter text                       |
     And I press "Cancel"
-    And I click on "Edit" "link" in the "essay-003" "table_row"
+    And I choose "Edit question" action for "essay-003" in the question bank
     Then the following fields match these values:
       | Question name              | essay-003                                               |
       | Question text              | Please write a story about a frog.                      |
diff --git a/question/type/essay/tests/behat/edit.feature b/question/type/essay/tests/behat/edit.feature
index 0657b0bc5410a..dd25a99dde85c 100644
--- a/question/type/essay/tests/behat/edit.feature
+++ b/question/type/essay/tests/behat/edit.feature
@@ -27,7 +27,7 @@ Feature: Test editing an Essay question
     And I navigate to "Question bank" in current page administration
 
   Scenario: Edit an Essay question
-    When I click on "Edit" "link" in the "essay-001" "table_row"
+    When I choose "Edit question" action for "essay-001" in the question bank
     And I set the following fields to these values:
       | Question name | |
     And I press "id_submitbutton"
diff --git a/question/type/essay/tests/behat/preview.feature b/question/type/essay/tests/behat/preview.feature
index 0aad34244a641..6eb52f327a83e 100644
--- a/question/type/essay/tests/behat/preview.feature
+++ b/question/type/essay/tests/behat/preview.feature
@@ -28,7 +28,7 @@ Feature: Preview Essay questions
 
   @javascript @_switch_window
   Scenario: Preview an Essay question and submit a partially correct response.
-    When I click on "Preview" "link" in the "essay-001" "table_row"
+    When I choose "Preview" action for "essay-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -37,7 +37,7 @@ Feature: Preview Essay questions
 
   @javascript @_switch_window
   Scenario: Preview an Essay question and submit a partially correct response.
-    When I click on "Preview" "link" in the "essay-002" "table_row"
+    When I choose "Preview" action for "essay-002" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -47,7 +47,7 @@ Feature: Preview Essay questions
 
   @javascript @_switch_window
   Scenario: Preview an Essay question and submit a partially correct response.
-    When I click on "Preview" "link" in the "essay-003" "table_row"
+    When I choose "Preview" action for "essay-003" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
diff --git a/question/type/gapselect/questionbase.php b/question/type/gapselect/questionbase.php
index 76a3882a87b31..a64e67c21915b 100644
--- a/question/type/gapselect/questionbase.php
+++ b/question/type/gapselect/questionbase.php
@@ -127,7 +127,7 @@ public function get_question_summary() {
 
     protected function get_selected_choice($group, $shuffledchoicenumber) {
         $choiceno = $this->choiceorder[$group][$shuffledchoicenumber];
-        return $this->choices[$group][$choiceno];
+        return isset($this->choices[$group][$choiceno]) ? $this->choices[$group][$choiceno] : null;
     }
 
     public function summarise_response(array $response) {
diff --git a/question/type/gapselect/tests/behat/basic_test.feature b/question/type/gapselect/tests/behat/basic_test.feature
index 9ae9e369ba041..b2301ad35f07b 100644
--- a/question/type/gapselect/tests/behat/basic_test.feature
+++ b/question/type/gapselect/tests/behat/basic_test.feature
@@ -38,7 +38,7 @@ Feature: Test all the basic functionality of this question type
     Then I should see "Select missing words 001"
 
     # Preview it.
-    When I click on "Preview" "link" in the "Select missing words 001" "table_row"
+    When I choose "Preview" action for "Select missing words 001" in the question bank
     And I switch to "questionpreview" window
 
     # Gaps (drop-down menus) do not have labels. ids and names are generated
@@ -136,7 +136,7 @@ Feature: Test all the basic functionality of this question type
     Then I should see "Select missing words 001"
 
     # Edit the copy and verify the form field contents.
-    When I click on "Edit" "link" in the "Select missing words 001" "table_row"
+    When I choose "Edit question" action for "Select missing words 001" in the question bank
     Then the following fields match these values:
       | Question name             | Select missing words 001      |
       | Question text             | The [[1]] [[2]] on the [[3]]. |
diff --git a/question/type/match/db/upgrade.php b/question/type/match/db/upgrade.php
index 1dd18fc90bf3c..bf8d92411dc19 100644
--- a/question/type/match/db/upgrade.php
+++ b/question/type/match/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_qtype_match_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/match/tests/behat/backup_and_restore.feature b/question/type/match/tests/behat/backup_and_restore.feature
index 05b3ebd140f8f..5b9841b3d0d7e 100644
--- a/question/type/match/tests/behat/backup_and_restore.feature
+++ b/question/type/match/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a Matching question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "matching-001" "table_row"
+    And I choose "Edit question" action for "matching-001" in the question bank
     Then the following fields match these values:
       | Question name                      | matching-001          |
       | Question text                      | Classify the animals. |
diff --git a/question/type/match/tests/behat/edit.feature b/question/type/match/tests/behat/edit.feature
index 480b0eac29586..3f6e383d12c2b 100644
--- a/question/type/match/tests/behat/edit.feature
+++ b/question/type/match/tests/behat/edit.feature
@@ -26,7 +26,7 @@ Feature: Test editing a Matching question
 
   @javascript @_switch_window
   Scenario: Edit a Matching question
-    When I click on "Edit" "link" in the "Matching for editing" "table_row"
+    When I choose "Edit question" action for "Matching for editing" in the question bank
     And I set the following fields to these values:
       | Question name | |
     And I press "id_submitbutton"
@@ -35,14 +35,14 @@ Feature: Test editing a Matching question
       | Question name | Edited Matching name |
     And I press "id_submitbutton"
     Then I should see "Edited Matching name"
-    When I click on "Edit" "link" in the "Edited Matching name" "table_row"
+    When I choose "Edit question" action for "Edited Matching name" in the question bank
     And I set the following fields to these values:
       | Shuffle    | 0   |
       | Question 2 | dog |
       | Question 4 | fly |
     And I press "id_submitbutton"
     Then I should see "Edited Matching name"
-    When I click on "Preview" "link" in the "Edited Matching name" "table_row"
+    When I choose "Preview" action for "Edited Matching name" in the question bank
     And I switch to "questionpreview" window
     Then I should see "frog"
     And I should see "dog"
diff --git a/question/type/match/tests/behat/preview.feature b/question/type/match/tests/behat/preview.feature
index 6683a9f17f4f6..fc2b90c0d1f78 100644
--- a/question/type/match/tests/behat/preview.feature
+++ b/question/type/match/tests/behat/preview.feature
@@ -26,11 +26,11 @@ Feature: Preview a Matching question
 
   @javascript @_switch_window
   Scenario: Preview a Matching question and submit a correct response.
-    When I click on "Edit" "link" in the "matching-001" "table_row"
+    When I choose "Edit question" action for "matching-001" in the question bank
     And I set the following fields to these values:
       | Shuffle    | 0   |
     And I press "id_submitbutton"
-    When I click on "Preview" "link" in the "matching-001" "table_row"
+    When I choose "Preview" action for "matching-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -44,11 +44,11 @@ Feature: Preview a Matching question
 
   @javascript @_switch_window
   Scenario: Preview a Matching question and submit a partially correct response.
-    When I click on "Edit" "link" in the "matching-001" "table_row"
+    When I choose "Edit question" action for "matching-001" in the question bank
     And I set the following fields to these values:
       | Shuffle    | 0   |
     And I press "id_submitbutton"
-    When I click on "Preview" "link" in the "matching-001" "table_row"
+    When I choose "Preview" action for "matching-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -62,11 +62,11 @@ Feature: Preview a Matching question
 
   @javascript @_switch_window
   Scenario: Preview a Matching question and submit an incorrect response.
-    When I click on "Edit" "link" in the "matching-001" "table_row"
+    When I choose "Edit question" action for "matching-001" in the question bank
     And I set the following fields to these values:
       | Shuffle    | 0   |
     And I press "id_submitbutton"
-    When I click on "Preview" "link" in the "matching-001" "table_row"
+    When I choose "Preview" action for "matching-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
diff --git a/question/type/missingtype/tests/missingtype_test.php b/question/type/missingtype/tests/missingtype_test.php
index cc2a922db3762..95c943772299f 100644
--- a/question/type/missingtype/tests/missingtype_test.php
+++ b/question/type/missingtype/tests/missingtype_test.php
@@ -30,7 +30,7 @@
 require_once(__DIR__ . '/../../../engine/tests/helpers.php');
 require_once(__DIR__ . '/../../../behaviour/deferredfeedback/behaviour.php');
 require_once(__DIR__ . '/../question.php');
-
+require_once($CFG->dirroot . '/question/type/missingtype/questiontype.php');
 
 /**
  * Unit tests for the 'missing' question type.
diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php
index e0bd450329f7f..f107175f6b1c5 100644
--- a/question/type/multianswer/db/upgrade.php
+++ b/question/type/multianswer/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_multianswer_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/multichoice/db/upgrade.php b/question/type/multichoice/db/upgrade.php
index b2dc15b9e3a7b..e182cae3c1e82 100644
--- a/question/type/multichoice/db/upgrade.php
+++ b/question/type/multichoice/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_multichoice_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/multichoice/tests/behat/backup_and_restore.feature b/question/type/multichoice/tests/behat/backup_and_restore.feature
index 62112bcf6d1ba..afc1c2ad268d4 100644
--- a/question/type/multichoice/tests/behat/backup_and_restore.feature
+++ b/question/type/multichoice/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a Multiple choice question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "Multi-choice-001" "table_row"
+    And I choose "Edit question" action for "Multi-choice-001" in the question bank
     Then the following fields match these values:
       | Question name                      | Multi-choice-001                   |
       | Question text                      | Which are the odd numbers?         |
diff --git a/question/type/multichoice/tests/behat/edit.feature b/question/type/multichoice/tests/behat/edit.feature
index 5cb83b1528cd1..ad50bee4b0ab2 100644
--- a/question/type/multichoice/tests/behat/edit.feature
+++ b/question/type/multichoice/tests/behat/edit.feature
@@ -26,7 +26,7 @@ Feature: Test editing a Multiple choice question
     And I navigate to "Question bank" in current page administration
 
   Scenario: Edit a Multiple choice question with multiple response (checkboxes)
-    When I click on "Edit" "link" in the "Multiple choice for editing" "table_row"
+    When I choose "Edit question" action for "Multiple choice for editing" in the question bank
     And I set the following fields to these values:
       | Question name | |
     And I press "id_submitbutton"
@@ -37,7 +37,7 @@ Feature: Test editing a Multiple choice question
     Then I should see "Edited Multiple choice name"
 
   Scenario: Edit a Multiple choice question with single response (radio buttons)
-    When I click on "Edit" "link" in the "Single choice for editing" "table_row"
+    When I choose "Edit question" action for "Single choice for editing" in the question bank
     And I set the following fields to these values:
       | Question name | Edited Single choice name |
     And I press "id_submitbutton"
diff --git a/question/type/multichoice/tests/behat/preview.feature b/question/type/multichoice/tests/behat/preview.feature
index 19e3e797c1881..8ba3b9e6723ed 100644
--- a/question/type/multichoice/tests/behat/preview.feature
+++ b/question/type/multichoice/tests/behat/preview.feature
@@ -27,7 +27,7 @@ Feature: Preview a Multiple choice question
 
   @javascript @_switch_window
   Scenario: Preview a Multiple choice question and submit a partially correct response.
-    When I click on "Preview" "link" in the "Multi-choice-001" "table_row"
+    When I choose "Preview" action for "Multi-choice-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -42,7 +42,7 @@ Feature: Preview a Multiple choice question
 
   @javascript @_switch_window
   Scenario: Preview a Multiple choice question and submit a correct response.
-    When I click on "Preview" "link" in the "Multi-choice-001" "table_row"
+    When I choose "Preview" action for "Multi-choice-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -59,7 +59,7 @@ Feature: Preview a Multiple choice question
 
   @javascript @_switch_window
   Scenario: Preview a Multiple choice question and submit a correct response.
-    When I click on "Preview" "link" in the "Multi-choice-002" "table_row"
+    When I choose "Preview" action for "Multi-choice-002" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -73,7 +73,7 @@ Feature: Preview a Multiple choice question
 
   @javascript @_switch_window
   Scenario: Preview a multiple choice question (single response) and clear a previous selected option.
-    When I click on "Preview" "link" in the "Multi-choice-002" "table_row"
+    When I choose "Preview" action for "Multi-choice-002" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
diff --git a/question/type/numerical/db/upgrade.php b/question/type/numerical/db/upgrade.php
index e303c1df9682a..8aef850c38c41 100644
--- a/question/type/numerical/db/upgrade.php
+++ b/question/type/numerical/db/upgrade.php
@@ -58,5 +58,8 @@ function xmldb_qtype_numerical_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/numerical/edit_numerical_form.php b/question/type/numerical/edit_numerical_form.php
index 6788058255f0c..c54e06d9563e7 100644
--- a/question/type/numerical/edit_numerical_form.php
+++ b/question/type/numerical/edit_numerical_form.php
@@ -212,7 +212,7 @@ protected function data_preprocessing_answers($question, $withanswerfiles = fals
             $question->tolerance[$key] = $answer->tolerance;
 
             if (is_numeric($question->answer[$key])) {
-                $question->answer[$key] = format_float($question->answer[$key], strlen($question->answer[$key]), true, true);
+                $question->answer[$key] = format_float($question->answer[$key], -1);
             }
 
             $key++;
diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php
index 6f39b42e5cedb..6e2a89a94c375 100644
--- a/question/type/numerical/questiontype.php
+++ b/question/type/numerical/questiontype.php
@@ -225,6 +225,7 @@ public function save_question_options($question) {
                 if ($options->tolerance === false) {
                     $result->notice = get_string('invalidnumerictolerance', 'qtype_numerical');
                 }
+                $options->tolerance = (string)$options->tolerance;
             }
             if (isset($options->id)) {
                 $DB->update_record('question_numerical', $options);
diff --git a/question/type/numerical/tests/behat/backup_and_restore.feature b/question/type/numerical/tests/behat/backup_and_restore.feature
index faac89a51b164..293a942782b40 100644
--- a/question/type/numerical/tests/behat/backup_and_restore.feature
+++ b/question/type/numerical/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a Numerical question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "Numerical-001" "table_row"
+    And I choose "Edit question" action for "Numerical-001" in the question bank
     Then the following fields match these values:
       | Question name                      | Numerical-001                              |
       | Question text                      | What is pi to two d.p.?                    |
diff --git a/question/type/numerical/tests/behat/edit.feature b/question/type/numerical/tests/behat/edit.feature
index 53435104f21d6..ea9691983a3e8 100644
--- a/question/type/numerical/tests/behat/edit.feature
+++ b/question/type/numerical/tests/behat/edit.feature
@@ -20,15 +20,15 @@ Feature: Test editing a Numerical question
     And the following "questions" exist:
       | questioncategory | qtype     | name                  | template |
       | Test questions   | numerical | Numerical for editing | pi |
-    And the following "language customisations" exist:
+
+  Scenario: Edit a Numerical question when using a custom decimal separator
+    Given the following "language customisations" exist:
       | component       | stringid | value |
       | core_langconfig | decsep   | #     |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I navigate to "Question bank" in current page administration
-
-  Scenario: Edit a Numerical question
-    When I click on "Edit" "link" in the "Numerical for editing" "table_row"
+    When I choose "Edit question" action for "Numerical for editing" in the question bank
     Then the field "id_answer_0" matches value "3#14"
     When I set the following fields to these values:
       | Question name | |
@@ -38,7 +38,7 @@ Feature: Test editing a Numerical question
       | Question name | Edited Numerical name |
     And I press "id_submitbutton"
     Then I should see "Edited Numerical name"
-    When I click on "Edit" "link" in the "Edited Numerical name" "table_row"
+    When I choose "Edit question" action for "Edited Numerical name" in the question bank
     And I set the following fields to these values:
       | id_answer_1    | 3#141592 |
       | id_tolerance_1 | 0#005    |
@@ -47,3 +47,17 @@ Feature: Test editing a Numerical question
       | id_answer_3    | 3,01     |
     And I press "id_submitbutton"
     Then I should see "Edited Numerical name"
+
+  Scenario: Edit a Numerical question with very small answer
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I navigate to "Question bank" in current page administration
+    When I choose "Edit question" action for "Numerical for editing" in the question bank
+    And I set the following fields to these values:
+      | id_answer_0    | 0.00000123456789 |
+      | id_tolerance_1 | 0.0000123456789  |
+    And I press "id_submitbutton"
+    And I choose "Edit question" action for "Numerical for editing" in the question bank
+    Then the following fields match these values:
+      | id_answer_0    | 0.00000123456789 |
+      | id_tolerance_1 | 0.0000123456789  |
diff --git a/question/type/numerical/tests/behat/preview.feature b/question/type/numerical/tests/behat/preview.feature
index c794d889e690d..747b9c360c2de 100644
--- a/question/type/numerical/tests/behat/preview.feature
+++ b/question/type/numerical/tests/behat/preview.feature
@@ -30,7 +30,7 @@ Feature: Preview a Numerical question
 
   @javascript @_switch_window
   Scenario: Preview a Numerical question and submit a correct response.
-    When I click on "Preview" "link" in the "Numerical-001" "table_row"
+    When I choose "Preview" action for "Numerical-001" in the question bank
     And I switch to "questionpreview" window
     Then I should see "What is pi to two d.p.?"
     When I set the field "How questions behave" to "Immediate feedback"
diff --git a/question/type/questiontypebase.php b/question/type/questiontypebase.php
index 7af2095746095..55854094d76cb 100644
--- a/question/type/questiontypebase.php
+++ b/question/type/questiontypebase.php
@@ -304,6 +304,9 @@ public function set_default_options($questiondata) {
     public function save_question($question, $form) {
         global $USER, $DB, $OUTPUT;
 
+        // The actuall update/insert done with multiple DB access, so we do it in a transaction.
+        $transaction = $DB->start_delegated_transaction ();
+
         list($question->category) = explode(',', $form->category);
         $context = $this->get_context_by_category_id($question->category);
 
@@ -350,16 +353,22 @@ public function save_question($question, $form) {
             $question->defaultmark = $form->defaultmark;
         }
 
-        if (isset($form->idnumber) && ((string) $form->idnumber !== '')) {
-            // While this check already exists in the form validation, this is a backstop preventing unnecessary errors.
-            if (strpos($form->category, ',') !== false) {
-                list($category, $categorycontextid) = explode(',', $form->category);
+        if (isset($form->idnumber)) {
+            if ((string) $form->idnumber === '') {
+                $question->idnumber = null;
             } else {
-                $category = $form->category;
-            }
-            if (!$DB->record_exists('question',
-                    ['idnumber' => $form->idnumber, 'category' => $category])) {
-                $question->idnumber = $form->idnumber;
+                // While this check already exists in the form validation,
+                // this is a backstop preventing unnecessary errors.
+                // Only set the idnumber if it has changed and will not cause a unique index violation.
+                if (strpos($form->category, ',') !== false) {
+                    list($category, $categorycontextid) = explode(',', $form->category);
+                } else {
+                    $category = $form->category;
+                }
+                if (!$DB->record_exists('question',
+                        ['idnumber' => $form->idnumber, 'category' => $category])) {
+                    $question->idnumber = $form->idnumber;
+                }
             }
         }
 
@@ -393,16 +402,6 @@ public function save_question($question, $form) {
         }
         $DB->update_record('question', $question);
 
-        if ($newquestion) {
-            // Log the creation of this question.
-            $event = \core\event\question_created::create_from_question_instance($question, $context);
-            $event->trigger();
-        } else {
-            // Log the update of this question.
-            $event = \core\event\question_updated::create_from_question_instance($question, $context);
-            $event->trigger();
-        }
-
         // Now to save all the answers and type-specific options.
         $form->id = $question->id;
         $form->qtype = $question->qtype;
@@ -431,6 +430,18 @@ public function save_question($question, $form) {
         $DB->set_field('question', 'version', question_hash($question),
                 array('id' => $question->id));
 
+        if ($newquestion) {
+            // Log the creation of this question.
+            $event = \core\event\question_created::create_from_question_instance($question, $context);
+            $event->trigger();
+        } else {
+            // Log the update of this question.
+            $event = \core\event\question_updated::create_from_question_instance($question, $context);
+            $event->trigger();
+        }
+
+        $transaction->allow_commit ();
+
         return $question;
     }
 
diff --git a/question/type/random/db/upgrade.php b/question/type/random/db/upgrade.php
index cb50b671aece4..95ee4c4e43ec4 100644
--- a/question/type/random/db/upgrade.php
+++ b/question/type/random/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_qtype_random_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/randomsamatch/db/upgrade.php b/question/type/randomsamatch/db/upgrade.php
index c8471b4ba3047..d98bf53129c9e 100644
--- a/question/type/randomsamatch/db/upgrade.php
+++ b/question/type/randomsamatch/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_qtype_randomsamatch_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/shortanswer/db/upgrade.php b/question/type/shortanswer/db/upgrade.php
index 63031fe218d6d..8b8c2743f72fa 100644
--- a/question/type/shortanswer/db/upgrade.php
+++ b/question/type/shortanswer/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_shortanswer_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/shortanswer/tests/behat/backup_and_restore.feature b/question/type/shortanswer/tests/behat/backup_and_restore.feature
index 5903e95e27134..d8f2c606e00e1 100644
--- a/question/type/shortanswer/tests/behat/backup_and_restore.feature
+++ b/question/type/shortanswer/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a Short answer question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "shortanswer-001" "table_row"
+    And I choose "Edit question" action for "shortanswer-001" in the question bank
     Then the following fields match these values:
       | Question name        | shortanswer-001                                   |
       | Question text        | Name an amphibian: __________                     |
diff --git a/question/type/shortanswer/tests/behat/edit.feature b/question/type/shortanswer/tests/behat/edit.feature
index 72741701ea62d..996eb12003e82 100644
--- a/question/type/shortanswer/tests/behat/edit.feature
+++ b/question/type/shortanswer/tests/behat/edit.feature
@@ -26,7 +26,7 @@ Feature: Test editing a Short answer question
 
   @javascript @_switch_window
   Scenario: Edit a Short answer question
-    When I click on "Edit" "link" in the "shortanswer-001 for editing" "table_row"
+    When I choose "Edit question" action for "shortanswer-001" in the question bank
     And I set the following fields to these values:
       | Question name | |
     And I press "id_submitbutton"
@@ -35,14 +35,14 @@ Feature: Test editing a Short answer question
       | Question name | Edited shortanswer-001 name |
     And I press "id_submitbutton"
     Then I should see "Edited shortanswer-001 name"
-    When I click on "Edit" "link" in the "Edited shortanswer-001 name" "table_row"
+    When I choose "Edit question" action for "Edited shortanswer-001" in the question bank
     And I set the following fields to these values:
       | id_answer_1          | newt                       |
       | id_fraction_1        | 70%                        |
       | id_feedback_1        | Newt is an OK good answer. |
     And I press "id_submitbutton"
     Then I should see "Edited shortanswer-001 name"
-    When I click on "Preview" "link" in the "Edited shortanswer-001 name" "table_row"
+    When I choose "Preview" action for "Edited shortanswer-001" in the question bank
     And I switch to "questionpreview" window
     Then I should see "Name an amphibian:"
     # Set behaviour options
diff --git a/question/type/shortanswer/tests/behat/preview.feature b/question/type/shortanswer/tests/behat/preview.feature
index e1613b97bb850..2772c38cfc5e7 100644
--- a/question/type/shortanswer/tests/behat/preview.feature
+++ b/question/type/shortanswer/tests/behat/preview.feature
@@ -26,7 +26,7 @@ Feature: Preview a Short answer question
 
   @javascript @_switch_window
   Scenario: Preview a Short answer question with correct answer
-    When I click on "Preview" "link" in the "shortanswer-001" "table_row"
+    When I choose "Preview" action for "shortanswer-001" in the question bank
     And I switch to "questionpreview" window
     Then I should see "Name an amphibian:"
     # Set behaviour options
@@ -41,7 +41,7 @@ Feature: Preview a Short answer question
 
   @javascript @_switch_window
   Scenario: Preview a Short answer question with almost correct answer
-    When I click on "Preview" "link" in the "shortanswer-001" "table_row"
+    When I choose "Preview" action for "shortanswer-001" in the question bank
     And I switch to "questionpreview" window
     Then I should see "Name an amphibian:"
     # Set behaviour options
@@ -56,7 +56,7 @@ Feature: Preview a Short answer question
 
   @javascript @_switch_window
   Scenario: Preview a Short answer question with incorrect answer
-    When I click on "Preview" "link" in the "shortanswer-001" "table_row"
+    When I choose "Preview" action for "shortanswer-001" in the question bank
     And I switch to "questionpreview" window
     Then I should see "Name an amphibian:"
     # Set behaviour options
diff --git a/question/type/truefalse/tests/behat/backup_and_restore.feature b/question/type/truefalse/tests/behat/backup_and_restore.feature
index 32e6544077bb6..dce13d6493efb 100644
--- a/question/type/truefalse/tests/behat/backup_and_restore.feature
+++ b/question/type/truefalse/tests/behat/backup_and_restore.feature
@@ -29,7 +29,7 @@ Feature: Test duplicating a quiz containing a True/False question
     And I restore "test_backup.mbz" backup into a new course using this options:
       | Schema | Course name | Course 2 |
     And I navigate to "Question bank" in current page administration
-    And I click on "Edit" "link" in the "true-false-001" "table_row"
+    And I choose "Edit question" action for "true-false-001" in the question bank
     Then the following fields match these values:
       | Question name                      | true-false-001                  |
       | Question text                      | The answer is true.             |
diff --git a/question/type/truefalse/tests/behat/edit.feature b/question/type/truefalse/tests/behat/edit.feature
index 059f7e5f7e4c6..7fa05952dceec 100644
--- a/question/type/truefalse/tests/behat/edit.feature
+++ b/question/type/truefalse/tests/behat/edit.feature
@@ -25,7 +25,7 @@ Feature: Test editing a True/False question
     And I navigate to "Question bank" in current page administration
 
   Scenario: Edit a True/False question
-    When I click on "Edit" "link" in the "true-false-001" "table_row"
+    When I choose "Edit question" action for "true-false-001" in the question bank
     And I set the following fields to these values:
       | Question name | |
     And I press "id_submitbutton"
diff --git a/question/type/truefalse/tests/behat/preview.feature b/question/type/truefalse/tests/behat/preview.feature
index e85ef1b48bfb1..83baede474940 100644
--- a/question/type/truefalse/tests/behat/preview.feature
+++ b/question/type/truefalse/tests/behat/preview.feature
@@ -26,7 +26,7 @@ Feature: Preview a Trtue/False question
 
   @javascript @_switch_window
   Scenario: Preview a True/False question and submit a correct response.
-    When I click on "Preview" "link" in the "true-false-001" "table_row"
+    When I choose "Preview" action for "true-false-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
@@ -38,7 +38,7 @@ Feature: Preview a Trtue/False question
 
   @javascript @_switch_window
   Scenario: Preview a True/False question and submit an incorrect response.
-    When I click on "Preview" "link" in the "true-false-001" "table_row"
+    When I choose "Preview" action for "true-false-001" in the question bank
     And I switch to "questionpreview" window
     And I set the field "How questions behave" to "Immediate feedback"
     And I press "Start again with these options"
diff --git a/question/type/upgrade.txt b/question/type/upgrade.txt
index f7fd3cb93e08d..dd5545f37235f 100644
--- a/question/type/upgrade.txt
+++ b/question/type/upgrade.txt
@@ -1,6 +1,21 @@
 This files describes API changes for question type plugins.
 
+=== 3.8, 3.7.3, 3.6.7 ===
+
+* Coming up in Moodle 3.8 are some changes to the question bank UI. These will break any
+  Behat automated tests which use the common pattern
+    When I click on "Duplicate" "link" in the "Test question" "table_row"
+  to trigger actions on questions when looking at the question bank screen. Therefore,
+  a new step has been introduced:
+    When I choose "Duplicate" action for "Test question" in the question bank
+  If you want your Behat tests to continue working with Moodle 3.8, you will need to use
+  the new step. The new step has been back-ported, so you can start updating your tests
+  and have them work with Moodle 3.6 and 3.7. In addition, if you want to trigger the
+  "Edit" action, you should change that to "Edit question".
+
+
 === 3.5 ===
+
   + Added new classes backup_qtype_extrafields_plugin and restore_qtype_extrafields_plugin
    in order to use extra fields method in backup/restore question type. Require and inherit new classes for using it. See
    backup_qtype_shortanswer_plugin and restore_qtype_shortanswer_plugin for an example of using this.
diff --git a/rating/classes/external.php b/rating/classes/external.php
index 5e19c26e3e8d2..0ae8a6c95e532 100644
--- a/rating/classes/external.php
+++ b/rating/classes/external.php
@@ -146,18 +146,20 @@ public static function get_item_ratings($contextlevel, $instanceid, $component,
                     $rating->rating = $maxrating;
                 }
 
-                // The rating object has all the required fields for generating the picture url.
-                $userpicture = new user_picture($rating);
-                $userpicture->size = 1; // Size f1.
-                $profileimageurl = $userpicture->get_url($PAGE)->out(false);
-
                 $result = array();
                 $result['id'] = $rating->id;
                 $result['userid'] = $rating->userid;
-                $result['userpictureurl'] = $profileimageurl;
                 $result['userfullname'] = fullname($rating);
                 $result['rating'] = $scalemenu[$rating->rating];
                 $result['timemodified'] = $rating->timemodified;
+
+                // The rating object has all the required fields for generating the picture url.
+                // Undo the aliasing of the user id column from user_picture::fields().
+                $rating->id = $rating->userid;
+                $userpicture = new user_picture($rating);
+                $userpicture->size = 1; // Size f1.
+                $result['userpictureurl'] = $userpicture->get_url($PAGE)->out(false);
+
                 $results[] = $result;
             }
         }
diff --git a/report/competency/templates/user_course_navigation.mustache b/report/competency/templates/user_course_navigation.mustache
index ad430a6ac5bd2..ede90c5a1bc7a 100644
--- a/report/competency/templates/user_course_navigation.mustache
+++ b/report/competency/templates/user_course_navigation.mustache
@@ -22,9 +22,12 @@
     Example context (json):
     { "hasusers": false, "hasmodules": false}
 }}
-<div class="float-right card p-x-1 p-b-1">
+<div class="float-right border p-2 mb-2">
 <p>{{{groupselector}}}</p>
 <form class="user-competency-course-navigation">
+<input type="hidden" name="user" value="{{userid}}"/>
+<input type="hidden" name="id" value="{{courseid}}"/>
+<input type="hidden" name="mod" value="{{moduleid}}"/>
 {{#hasusers}}
 <span>
 <label for="user-nav-{{uniqid}}" class="accesshide">{{#str}}jumptouser, tool_lp{{/str}}</label>
diff --git a/report/insights/amd/build/actions.min.js b/report/insights/amd/build/actions.min.js
index 71cc939b182af..98e554bd4684c 100644
--- a/report/insights/amd/build/actions.min.js
+++ b/report/insights/amd/build/actions.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/notification"],function(a,b,c){return{init:function(d){a("a[data-prediction-methodname][data-prediction-id="+d+"]").on("click",function(e){e.preventDefault();var f=a(e.currentTarget),g=f.attr("data-prediction-methodname"),h=f.closest("tr");if(h.length>0){var i=b.call([{methodname:g,args:{predictionid:d}}])[0];i.done(function(){h[0].remove(),a(".insights-list tr").length<2&&(document.referrer?window.location.assign(document.referrer):window.location.reload(!0))}).fail(c.exception)}})}}});
\ No newline at end of file
+define(["jquery","core/ajax","core/notification","core/url"],function(a,b,c,d){return{init:function(e,f,g){a("a[data-prediction-methodname][data-prediction-id="+e+"]").on("click",function(h){h.preventDefault();var i=a(h.currentTarget),j=i.attr("data-prediction-methodname"),k=i.closest("tr");if(k.length>0){var l=b.call([{methodname:j,args:{predictionid:e}}])[0];l.done(function(){if(k[0].remove(),a(".insights-list tr").length<2){var b={contextid:f,modelid:g},c=a.param(b);window.location.assign(d.relativeUrl("report/insights/insights.php?"+c))}}).fail(c.exception)}})}}});
\ No newline at end of file
diff --git a/report/insights/amd/src/actions.js b/report/insights/amd/src/actions.js
index 3c98868fc90d3..833d32d0e16ff 100644
--- a/report/insights/amd/src/actions.js
+++ b/report/insights/amd/src/actions.js
@@ -26,7 +26,7 @@
  *
  * @module report_insights/actions
  */
-define(['jquery', 'core/ajax', 'core/notification'], function($, Ajax, Notification) {
+define(['jquery', 'core/ajax', 'core/notification', 'core/url'], function($, Ajax, Notification, Url) {
 
     return {
 
@@ -34,9 +34,11 @@ define(['jquery', 'core/ajax', 'core/notification'], function($, Ajax, Notificat
          * Attach on click handlers to hide predictions.
          *
          * @param {Number} predictionId The prediction id.
+         * @param {Number} contextId The context in which the prediction was made.
+         * @param {Number} modelId The model id model with which the prediction was made.
          * @access public
          */
-        init: function(predictionId) {
+        init: function(predictionId, contextId, modelId) {
 
             // Select the prediction with the provided id ensuring that an external function is set as method name.
             $('a[data-prediction-methodname][data-prediction-id=' + predictionId + ']').on('click', function(e) {
@@ -57,11 +59,13 @@ define(['jquery', 'core/ajax', 'core/notification'], function($, Ajax, Notificat
 
                         // Move back if no remaining predictions.
                         if ($('.insights-list tr').length < 2) {
-                            if (document.referrer) {
-                                window.location.assign(document.referrer);
-                            } else {
-                                window.location.reload(true);
-                            }
+                            var params = {
+                                contextid: contextId,
+                                modelid: modelId
+                            };
+
+                            var queryparams = $.param(params);
+                            window.location.assign(Url.relativeUrl("report/insights/insights.php?" + queryparams));
                         }
                     }).fail(Notification.exception);
                 }
diff --git a/report/insights/done.php b/report/insights/done.php
index d64d15120b4e2..4878ef0092d2c 100644
--- a/report/insights/done.php
+++ b/report/insights/done.php
@@ -26,5 +26,18 @@
 
 require_login();
 
-$url = new \moodle_url('/');
-redirect($url, get_string('actionsaved', 'report_insights'), null, \core\output\notification::NOTIFY_SUCCESS);
+$actionvisiblename = required_param('actionvisiblename', PARAM_NOTAGS);
+
+$PAGE->set_pagelayout('popup');
+$PAGE->set_context(\context_system::instance());
+$PAGE->set_title(get_site()->fullname);
+$PAGE->set_url(new \moodle_url('/report/insights/done.php'));
+
+echo $OUTPUT->header();
+
+$notification = new \core\output\notification(get_string('actionsaved', 'report_insights', $actionvisiblename),
+    \core\output\notification::NOTIFY_SUCCESS);
+$notification->set_show_closebutton(false);
+echo $OUTPUT->render($notification);
+
+echo $OUTPUT->footer();
diff --git a/report/insights/insights.php b/report/insights/insights.php
index c45aaf9e79b9b..5dc9dfc03616c 100644
--- a/report/insights/insights.php
+++ b/report/insights/insights.php
@@ -40,10 +40,24 @@
     // Only for higher levels than course.
     $PAGE->set_context($context);
 }
+
 \core_analytics\manager::check_can_list_insights($context);
 
 // Get all models that are enabled, trained and have predictions at this context.
 $othermodels = \core_analytics\manager::get_all_models(true, true, $context);
+array_filter($othermodels, function($model) use ($context) {
+
+    // Discard insights that are not linked unless you are a manager.
+    if (!$model->get_target()->link_insights_report()) {
+        try {
+            \core_analytics\manager::check_can_manage_models();
+        } catch (\required_capability_exception $e) {
+            return false;
+        }
+    }
+    return true;
+});
+
 if (!$modelid && count($othermodels)) {
     // Autoselect the only available model.
     $model = reset($othermodels);
@@ -89,6 +103,12 @@
 
 $model = new \core_analytics\model($modelid);
 
+if (!$model->get_target()->link_insights_report()) {
+
+    // Only manager access if this target does not link the insights report.
+    \core_analytics\manager::check_can_manage_models();
+}
+
 $insightinfo = new stdClass();
 $insightinfo->contextname = $context->get_context_name();
 $insightinfo->insightname = $model->get_target()->get_name();
@@ -103,8 +123,12 @@
     exit(0);
 }
 
+if ($context->id == SYSCONTEXTID) {
+    $PAGE->set_heading(get_site()->shortname);
+} else {
+    $PAGE->set_heading($insightinfo->contextname);
+}
 $PAGE->set_title($insightinfo->insightname);
-$PAGE->set_heading($insightinfo->contextname);
 
 // Some models generate one single prediction per context. We can directly show the prediction details in this case.
 if ($model->get_analyser()::one_sample_per_analysable()) {
diff --git a/report/insights/lang/en/report_insights.php b/report/insights/lang/en/report_insights.php
index e21e8dbf31a55..2a2a543221db9 100644
--- a/report/insights/lang/en/report_insights.php
+++ b/report/insights/lang/en/report_insights.php
@@ -22,11 +22,9 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['actionsaved'] = 'Your action has been saved.';
-$string['calculatedvalue'] = 'Calculated value';
-$string['disabledmodel'] = 'Sorry, this model has been disabled by the administrator';
-$string['indicator'] = 'Indicator';
-$string['insightprediction'] = '{$a} prediction';
+$string['actionsaved'] = 'Your feedback of \'{$a}\' has been saved.';
+$string['disabledmodel'] = 'This model has been disabled by an administrator.';
+$string['indicators'] = 'Indicators';
 $string['insight'] = 'Insight';
 $string['insights'] = 'Insights';
 $string['justpredictions'] = 'Please note that the following insights are only predictions. It is not possible to predict the future with any certainty. The insights are provided so that action can be taken as necessary to prevent any negative predictions becoming reality.';
@@ -39,7 +37,6 @@
 $string['outcomeverynegative'] = 'Very negative outcome';
 $string['pluginname'] = 'Insights';
 $string['prediction'] = 'Prediction';
-$string['predictioncalculations'] = 'Indicator calculations';
 $string['predictiondetails'] = 'Prediction details';
 $string['nodetailsavailable'] = 'No prediction details are relevant.';
 $string['timecreated'] = 'Time predicted';
diff --git a/report/insights/lib.php b/report/insights/lib.php
index 97c9ecb86e407..eb7b4f42139ae 100644
--- a/report/insights/lib.php
+++ b/report/insights/lib.php
@@ -36,7 +36,7 @@ function report_insights_extend_navigation_course($navigation, $course, $context
 
     if (has_capability('moodle/analytics:listinsights', $context)) {
 
-        $modelids = report_insights_context_insights($context);
+        $modelids = \core_analytics\manager::cached_models_with_insights($context);
         if (!empty($modelids)) {
             $url = new moodle_url('/report/insights/insights.php', array('contextid' => $context->id));
             $node = navigation_node::create(get_string('insights', 'report_insights'), $url, navigation_node::TYPE_SETTING,
@@ -61,7 +61,7 @@ function report_insights_myprofile_navigation(core_user\output\myprofile\tree $t
     $context = \context_user::instance($user->id);
     if (\core_analytics\manager::check_can_list_insights($context, true)) {
 
-        $modelids = report_insights_context_insights($context);
+        $modelids = \core_analytics\manager::cached_models_with_insights($context);
         if (!empty($modelids)) {
             $url = new moodle_url('/report/insights/insights.php', array('contextid' => $context->id));
             $node = new core_user\output\myprofile\node('reports', 'insights', get_string('insights', 'report_insights'),
@@ -82,7 +82,7 @@ function report_insights_extend_navigation_category_settings($navigation, $conte
 
     if (has_capability('moodle/analytics:listinsights', $context)) {
 
-        $modelids = report_insights_context_insights($context);
+        $modelids = \core_analytics\manager::cached_models_with_insights($context);
         if (!empty($modelids)) {
             $url = new moodle_url('/report/insights/insights.php', array('contextid' => $context->id));
 
@@ -99,22 +99,3 @@ function report_insights_extend_navigation_category_settings($navigation, $conte
         }
     }
 }
-
-/**
- * Returns the models that generated insights in the provided context.
- *
- * @param \context $context
- * @return int[]
- */
-function report_insights_context_insights(\context $context) {
-
-    $cache = \cache::make('core', 'contextwithinsights');
-    $modelids = $cache->get($context->id);
-    if ($modelids === false) {
-        // They will be full unless a model has been cleared.
-        $models = \core_analytics\manager::get_models_with_insights($context);
-        $modelids = array_keys($models);
-        $cache->set($context->id, $modelids);
-    }
-    return $modelids;
-}
diff --git a/report/insights/prediction.php b/report/insights/prediction.php
index bb67a02848707..6db5e394bc644 100644
--- a/report/insights/prediction.php
+++ b/report/insights/prediction.php
@@ -71,8 +71,12 @@
     exit(0);
 }
 
+if ($context->id == SYSCONTEXTID) {
+    $PAGE->set_heading(get_site()->shortname);
+} else {
+    $PAGE->set_heading($insightinfo->contextname);
+}
 $PAGE->set_title($insightinfo->insightname);
-$PAGE->set_heading($insightinfo->contextname);
 
 echo $OUTPUT->header();
 
diff --git a/report/insights/templates/insight_details.mustache b/report/insights/templates/insight_details.mustache
index ad61ef1b94af1..33164dd933ed5 100644
--- a/report/insights/templates/insight_details.mustache
+++ b/report/insights/templates/insight_details.mustache
@@ -73,7 +73,7 @@
     }
 }}
 
-<h2 class="mb-2">{{#str}}insightprediction, report_insights, {{insightname}} {{/str}}</h2>
+<h2 class="mb-2">{{insightname}}</h2>
 <table class="generaltable insights-list">
     {{#showpredicionheading}}
         <caption>
@@ -101,29 +101,23 @@
     <caption>{{#str}}predictiondetails, report_insights{{/str}}</caption>
     <tbody>
         <tr>
-            <td scope="row">{{#str}}timecreated, report_insights{{/str}}</td>
+            <th scope="row">{{#str}}timecreated, report_insights{{/str}}</td>
             <td>{{timecreated}}</td>
         </tr>
         {{#timerange}}
             <tr>
-                <td scope="row">{{#str}}timerange, report_insights{{/str}}</td>
+                <th scope="row">{{#str}}timerange, report_insights{{/str}}</td>
                 <td>{{.}}</td>
             </tr>
         {{/timerange}}
     </tbody>
 </table>
 <table class="generaltable prediction-calculations">
-    <caption class="accesshide">{{#str}}predictioncalculations, report_insights{{/str}}</caption>
-    <thead>
-        <tr>
-            <th scope="col">{{#str}}indicator, report_insights{{/str}}</th>
-            <th scope="col">{{#str}}calculatedvalue, report_insights{{/str}}</th>
-        </tr>
-    </thead>
+    <caption>{{#str}}indicators, report_insights{{/str}}</caption>
     <tbody>
     {{#calculations}}
         <tr>
-            <td class="{{#style}}table-{{style}}{{/style}}">{{name}}</td>
+            <th scope="row" class="{{#style}}table-{{style}}{{/style}}">{{name}}</td>
             <td class="{{#style}}table-{{style}}{{/style}}">{{#outcomeicon}}{{> core/pix_icon}}{{/outcomeicon}} {{displayvalue}}</td>
         </tr>
     {{/calculations}}
diff --git a/report/participation/index.php b/report/participation/index.php
index ef66eef7fd76e..cb060fe72e50d 100644
--- a/report/participation/index.php
+++ b/report/participation/index.php
@@ -31,6 +31,9 @@
 define('DEFAULT_PAGE_SIZE', 20);
 define('SHOW_ALL_PAGE_SIZE', 5000);
 
+// Release session lock.
+\core\session\manager::write_close();
+
 $id         = required_param('id', PARAM_INT); // course id.
 $roleid     = optional_param('roleid', 0, PARAM_INT); // which role to show
 $instanceid = optional_param('instanceid', 0, PARAM_INT); // instance we're looking at.
@@ -80,7 +83,8 @@
 $PAGE->set_heading(format_string($course->fullname, true, array('context' => $context)));
 echo $OUTPUT->header();
 
-$uselegacyreader = false; // Use legacy reader with sql_internal_table_reader to aggregate records.
+// Logs will not have been recorded before the course timecreated time.
+$minlog = $course->timecreated;
 $onlyuselegacyreader = false; // Use only legacy log table to aggregate records.
 
 $logtable = report_participation_get_log_table_name(); // Log table to use for fetaching records.
@@ -90,42 +94,8 @@
     $onlyuselegacyreader = true;
 }
 
-// If no legacy and no logtable then don't proceed.
-if (!$onlyuselegacyreader && empty($logtable)) {
-    echo $OUTPUT->box_start('generalbox', 'notice');
-    echo get_string('nologreaderenabled', 'report_participation');
-    echo $OUTPUT->box_end();
-    echo $OUTPUT->footer();
-    die();
-}
-
 $modinfo = get_fast_modinfo($course);
 
-$minloginternalreader = 0; // Time of first record in sql_internal_table_reader.
-
-if ($onlyuselegacyreader) {
-    // If no sql_inrenal_reader enabled then get min. time from log table.
-    $minlog = $DB->get_field_sql('SELECT min(time) FROM {log} WHERE course = ?', array($course->id));
-} else {
-    $uselegacyreader = true;
-    $minlog = $DB->get_field_sql('SELECT min(time) FROM {log} WHERE course = ?', array($course->id));
-
-    // If legacy reader is not logging then get data from new log table.
-    // Get minimum log time for this course from preferred log reader.
-    $minloginternalreader = $DB->get_field_sql('SELECT min(timecreated) FROM {' . $logtable . '}
-                                                 WHERE courseid = ?', array($course->id));
-    // If new log store has oldest data then don't use old log table.
-    if (empty($minlog) || ($minloginternalreader <= $minlog)) {
-        $uselegacyreader = false;
-        $minlog = $minloginternalreader;
-    }
-
-    // If timefrom is greater then first record in sql_internal_table_reader then get record from sql_internal_table_reader only.
-    if (!empty($timefrom) && ($minloginternalreader < $timefrom)) {
-        $uselegacyreader = false;
-    }
-}
-
 // Print first controls.
 report_participation_print_filter_form($course, $timefrom, $minlog, $action, $roleid, $instanceid);
 
@@ -154,6 +124,7 @@
 $currentgroup = $SESSION->activegroup[$course->id][$groupmode][$course->defaultgroupingid];
 
 if (!empty($instanceid) && !empty($roleid)) {
+    $uselegacyreader = $DB->record_exists('log', ['course' => $course->id]);
 
     // Trigger a report viewed event.
     $event = \report_participation\event\report_viewed::create(array('context' => $context,
@@ -250,11 +221,6 @@
     $users = array();
     // If using legacy log then get users from old table.
     if ($uselegacyreader || $onlyuselegacyreader) {
-        $limittime = '';
-        if ($uselegacyreader && !empty($minloginternalreader)) {
-            $limittime = ' AND time < :tilltime ';
-            $params['tilltime'] = $minloginternalreader;
-        }
         $sql = "SELECT ra.userid, $usernamefields, u.idnumber, l.actioncount AS count
                   FROM (SELECT DISTINCT userid FROM {role_assignments} WHERE contextid $relatedctxsql AND roleid = :roleid ) ra
                   JOIN {user} u ON u.id = ra.userid
@@ -263,7 +229,7 @@
                     SELECT userid, COUNT(action) AS actioncount
                       FROM {log}
                      WHERE cmid = :instanceid
-                           AND time > :timefrom " . $limittime . $actionsql .
+                           AND time > :timefrom " . $actionsql .
                 " GROUP BY userid) l ON (l.userid = ra.userid)";
         if ($twhere) {
             $sql .= ' WHERE '.$twhere; // Initial bar.
@@ -380,7 +346,7 @@
         }
         echo '</div>';
         echo '<div class="p-y-1">';
-        echo html_writer::label(get_string('withselectedusers'), 'formactionselect');
+        echo html_writer::label(get_string('withselectedusers'), 'formactionid');
         $displaylist['#messageselect'] = get_string('messageselectadd');
         echo html_writer::select($displaylist, 'formaction', '', array('' => 'choosedots'), array('id' => 'formactionid'));
         echo '</div>';
diff --git a/report/participation/locallib.php b/report/participation/locallib.php
index 77b48a22bdacb..8ab59b47a9b8c 100644
--- a/report/participation/locallib.php
+++ b/report/participation/locallib.php
@@ -98,8 +98,8 @@ function report_participation_get_time_options($minlog) {
 function report_participation_get_action_sql($action, $modname) {
     global $CFG, $DB;
 
-    $crudsql = '';
-    $crudparams = array();
+    $actionsql = '';
+    $actionparams = array();
 
     $viewnames = array();
     $postnames = array();
diff --git a/report/progress/index.php b/report/progress/index.php
index a2678d0fe337f..e2f1be9297cd4 100644
--- a/report/progress/index.php
+++ b/report/progress/index.php
@@ -210,8 +210,13 @@ function csv_quote($value) {
 // Initials bar.
 $prefixfirst = 'sifirst';
 $prefixlast = 'silast';
-$pagingbar .= $OUTPUT->initials_bar($sifirst, 'firstinitial', get_string('firstname'), $prefixfirst, $url);
-$pagingbar .= $OUTPUT->initials_bar($silast, 'lastinitial', get_string('lastname'), $prefixlast, $url);
+
+// The URL used in the initials bar should reset the 'start' parameter.
+$initialsbarurl = new moodle_url($url);
+$initialsbarurl->remove_params('start');
+
+$pagingbar .= $OUTPUT->initials_bar($sifirst, 'firstinitial', get_string('firstname'), $prefixfirst, $initialsbarurl);
+$pagingbar .= $OUTPUT->initials_bar($silast, 'lastinitial', get_string('lastname'), $prefixlast, $initialsbarurl);
 
 // Do we need a paging bar?
 if ($total > COMPLETION_REPORT_PAGE) {
diff --git a/report/security/locallib.php b/report/security/locallib.php
index e696b83281d47..6b5baeb0fb431 100644
--- a/report/security/locallib.php
+++ b/report/security/locallib.php
@@ -698,7 +698,7 @@ function report_security_check_riskadmin($detailed=false) {
     if ($detailed) {
         foreach ($admins as $uid=>$user) {
             $url = "$CFG->wwwroot/user/view.php?id=$user->id";
-            $admins[$uid] = '<li><a href="'.$url.'">'.fullname($user).' ('.$user->email.')</a></li>';
+            $admins[$uid] = '<li><a href="'.$url.'">' . fullname($user, true) . ' (' . s($user->email) . ')</a></li>';
         }
         $admins = '<ul>'.implode('', $admins).'</ul>';
     }
@@ -824,7 +824,7 @@ function report_security_check_riskbackup($detailed=false) {
         foreach ($rs as $user) {
             $context = context::instance_by_id($user->contextid);
             $url = "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=$user->contextid&amp;roleid=$user->roleid";
-            $a = (object)array('fullname'=>fullname($user), 'url'=>$url, 'email'=>$user->email,
+            $a = (object)array('fullname'=>fullname($user), 'url'=>$url, 'email'=>s($user->email),
                                'contextname'=>$context->get_context_name());
             $users[] = '<li>'.get_string('check_riskbackup_unassign', 'report_security', $a).'</li>';
         }
diff --git a/report/stats/user.php b/report/stats/user.php
index 547714234f023..7309a08adffff 100644
--- a/report/stats/user.php
+++ b/report/stats/user.php
@@ -124,14 +124,35 @@
 
 $param = stats_get_parameters($time,STATS_REPORT_USER_VIEW,$course->id,STATS_MODE_DETAILED);
 $params = $param->params;
-
 $param->table = 'user_'.$param->table;
 
-$sql = 'SELECT id, timeend,'.$param->fields.' FROM {stats_'.$param->table.'} WHERE '
-.(($course->id == SITEID) ? '' : ' courseid = '.$course->id.' AND ')
-    .' userid = '.$user->id.' AND timeend >= '.$param->timeafter .$param->extras
-    .' ORDER BY timeend DESC';
-$stats = $DB->get_records_sql($sql, $params); //TODO: improve these params!!
+// Build the conditions and parameters.
+$wheres = [
+    "userid = :userid",
+    "timeend >= :timeend",
+    "stattype = :stattype",
+];
+$params['userid'] = $user->id;
+$params['timeend'] = $param->timeafter;
+$params['stattype'] = $param->stattype;
+// Add condition for course ID when specified.
+if ($course->id != SITEID) {
+    $wheres[] = "courseid = :courseid";
+    $params['courseid'] = $course->id;
+}
+// Combine the conditions.
+$wheresql = implode(" AND ", $wheres);
+
+// Build the query.
+$sql = "
+    SELECT {$param->fields}
+      FROM {stats_{$param->table}}
+     WHERE {$wheresql}
+    {$param->extras}
+  ORDER BY timeend DESC";
+
+// Fetch the stats data.
+$stats = $DB->get_records_sql($sql, $params);
 
 if (empty($stats)) {
     print_error('nostatstodisplay', '', $CFG->wwwroot.'/course/user.php?id='.$course->id.'&user='.$user->id.'&mode=outline');
diff --git a/repository/boxnet/db/upgrade.php b/repository/boxnet/db/upgrade.php
index 41d21266c1b6c..baafa6d9aaa9b 100644
--- a/repository/boxnet/db/upgrade.php
+++ b/repository/boxnet/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_repository_boxnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/dropbox/db/upgrade.php b/repository/dropbox/db/upgrade.php
index 73aaf9406b63f..6207d499b344a 100644
--- a/repository/dropbox/db/upgrade.php
+++ b/repository/dropbox/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_repository_dropbox_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/dropbox/lang/en/repository_dropbox.php b/repository/dropbox/lang/en/repository_dropbox.php
index ef390dd5660f8..78ee4bb417309 100644
--- a/repository/dropbox/lang/en/repository_dropbox.php
+++ b/repository/dropbox/lang/en/repository_dropbox.php
@@ -30,7 +30,7 @@
 $string['apikey'] = 'Dropbox API key';
 $string['dropbox'] = 'Dropbox';
 $string['secret'] = 'Dropbox secret';
-$string['instruction'] = 'You can get your API Key and secret from <a href="http://www.dropbox.com/developers/apps">Dropbox developers</a>. When setting up your key please select "Full Dropbox" as the "Access level".';
+$string['instruction'] = 'You can get your API Key and secret from <a href="https://www.dropbox.com/developers/apps">Dropbox developers</a>. When setting up your key please select "Full Dropbox" as the "Access level".';
 $string['cachelimit'] = 'Cache limit';
 $string['cachelimit_info'] = 'Enter the maximum size of files (in bytes) to be cached on server for Dropbox aliases/shortcuts. Cached files will be served when the source is no longer available. Empty value or zero mean caching of all files regardless of size.';
 $string['dropbox:view'] = 'View a Dropbox folder';
diff --git a/repository/filepicker.js b/repository/filepicker.js
index d273aa5ce0599..934085f2e07b7 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -683,7 +683,7 @@ M.core_filepicker.init = function(Y, options) {
                         if (scope.options.editor_target && scope.options.env == 'editor') {
                             // editor needs to update url
                             scope.options.editor_target.value = urlimage;
-                            scope.options.editor_target.onchange();
+                            scope.options.editor_target.dispatchEvent(new Event('change'), {'bubbles': true});
                         }
                         var fileinfo = {'client_id':scope.options.client_id,
                             'url': urlimage,
@@ -700,7 +700,7 @@ M.core_filepicker.init = function(Y, options) {
                 var data = this.process_dlg.dialogdata;
                 if (scope.options.editor_target && scope.options.env == 'editor') {
                     scope.options.editor_target.value = data.newfile.url;
-                    scope.options.editor_target.onchange();
+                    scope.options.editor_target.dispatchEvent(new Event('change'), {'bubbles': true});
                 }
                 scope.hide();
                 var formcallback_scope = scope.options.magicscope ? scope.options.magicscope : scope;
@@ -1235,7 +1235,7 @@ M.core_filepicker.init = function(Y, options) {
                         }
                         if (scope.options.editor_target && scope.options.env=='editor') {
                             scope.options.editor_target.value=obj.url;
-                            scope.options.editor_target.onchange();
+                            scope.options.editor_target.dispatchEvent(new Event('change'), {'bubbles': true});
                         }
                         scope.hide();
                         obj.client_id = client_id;
@@ -1803,7 +1803,7 @@ M.core_filepicker.init = function(Y, options) {
                             }
                             if (scope.options.editor_target&&scope.options.env=='editor') {
                                 scope.options.editor_target.value=o.url;
-                                scope.options.editor_target.onchange();
+                                scope.options.editor_target.dispatchEvent(new Event('change'), {'bubbles': true});
                             }
                             scope.hide();
                             o.client_id = client_id;
diff --git a/repository/flickr/db/upgrade.php b/repository/flickr/db/upgrade.php
index 4698713b66a69..ef2d1f4f12e4f 100644
--- a/repository/flickr/db/upgrade.php
+++ b/repository/flickr/db/upgrade.php
@@ -53,5 +53,8 @@ function xmldb_repository_flickr_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/googledocs/db/upgrade.php b/repository/googledocs/db/upgrade.php
index 3266380f01619..1ca4dd0c437d7 100644
--- a/repository/googledocs/db/upgrade.php
+++ b/repository/googledocs/db/upgrade.php
@@ -67,5 +67,8 @@ function xmldb_repository_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/onedrive/db/upgrade.php b/repository/onedrive/db/upgrade.php
index c27f339400fc2..b58098c5f1315 100644
--- a/repository/onedrive/db/upgrade.php
+++ b/repository/onedrive/db/upgrade.php
@@ -40,5 +40,8 @@ function xmldb_repository_onedrive_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/picasa/db/upgrade.php b/repository/picasa/db/upgrade.php
index 3ec6125321449..5ac7ef1d70116 100644
--- a/repository/picasa/db/upgrade.php
+++ b/repository/picasa/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_repository_picasa_upgrade($oldversion) {
     // Automatically generated Moodle v3.6.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/upload/tests/behat/behat_repository_upload.php b/repository/upload/tests/behat/behat_repository_upload.php
index a8d9bf827ee70..74d6abf203312 100644
--- a/repository/upload/tests/behat/behat_repository_upload.php
+++ b/repository/upload/tests/behat/behat_repository_upload.php
@@ -27,7 +27,8 @@
 
 require_once(__DIR__ . '/../../../../lib/behat/core_behat_file_helper.php');
 
-use Behat\Mink\Exception\ExpectationException as ExpectationException,
+use Behat\Mink\Exception\DriverException as DriverException,
+    Behat\Mink\Exception\ExpectationException as ExpectationException,
     Behat\Gherkin\Node\TableNode as TableNode;
 
 /**
@@ -46,6 +47,7 @@ class behat_repository_upload extends behat_base {
      * Uploads a file to the specified filemanager leaving other fields in upload form default. The paths should be relative to moodle codebase.
      *
      * @When /^I upload "(?P<filepath_string>(?:[^"]|\\")*)" file to "(?P<filemanager_field_string>(?:[^"]|\\")*)" filemanager$/
+     * @throws DriverException
      * @throws ExpectationException Thrown by behat_base::find
      * @param string $filepath
      * @param string $filemanagerelement
@@ -58,6 +60,7 @@ public function i_upload_file_to_filemanager($filepath, $filemanagerelement) {
      * Uploads a file to the specified filemanager leaving other fields in upload form default and confirms to overwrite an existing file. The paths should be relative to moodle codebase.
      *
      * @When /^I upload and overwrite "(?P<filepath_string>(?:[^"]|\\")*)" file to "(?P<filemanager_field_string>(?:[^"]|\\")*)" filemanager$/
+     * @throws DriverException
      * @throws ExpectationException Thrown by behat_base::find
      * @param string $filepath
      * @param string $filemanagerelement
@@ -71,6 +74,7 @@ public function i_upload_and_overwrite_file_to_filemanager($filepath, $filemanag
      * Uploads a file to the specified filemanager and confirms to overwrite an existing file. The paths should be relative to moodle codebase.
      *
      * @When /^I upload "(?P<filepath_string>(?:[^"]|\\")*)" file to "(?P<filemanager_field_string>(?:[^"]|\\")*)" filemanager as:$/
+     * @throws DriverException
      * @throws ExpectationException Thrown by behat_base::find
      * @param string $filepath
      * @param string $filemanagerelement
@@ -84,6 +88,7 @@ public function i_upload_file_to_filemanager_as($filepath, $filemanagerelement,
      * Uploads a file to the specified filemanager. The paths should be relative to moodle codebase.
      *
      * @When /^I upload and overwrite "(?P<filepath_string>(?:[^"]|\\")*)" file to "(?P<filemanager_field_string>(?:[^"]|\\")*)" filemanager as:$/
+     * @throws DriverException
      * @throws ExpectationException Thrown by behat_base::find
      * @param string $filepath
      * @param string $filemanagerelement
@@ -97,6 +102,7 @@ public function i_upload_and_overwrite_file_to_filemanager_as($filepath, $filema
     /**
      * Uploads a file to filemanager
      *
+     * @throws DriverException
      * @throws ExpectationException Thrown by behat_base::find
      * @param string $filepath Normally a path relative to $CFG->dirroot, but can be an absolute path too.
      * @param string $filemanagerelement
@@ -107,6 +113,10 @@ public function i_upload_and_overwrite_file_to_filemanager_as($filepath, $filema
     protected function upload_file_to_filemanager($filepath, $filemanagerelement, TableNode $data, $overwriteaction = false) {
         global $CFG;
 
+        if (!$this->has_tag('_file_upload')) {
+            throw new DriverException('File upload tests must have the @_file_upload tag on either the scenario or feature.');
+        }
+
         $filemanagernode = $this->get_filepicker_node($filemanagerelement);
 
         // Opening the select repository window and selecting the upload repository.
@@ -194,12 +204,15 @@ protected function get_filepicker_node($filepickerelement) {
                     $exception
             );
         } else {
-            // Gets the filemanager node specified by the locator which contains the filepicker container.
+            // Gets the filemanager node specified by the locator which contains the filepicker container
+            // either for filepickers created by mform or by admin config.
             $filepickerelement = behat_context_helper::escape($filepickerelement);
             $filepickercontainer = $this->find(
                     'xpath',
                     "//input[./@id = //label[normalize-space(.)=$filepickerelement]/@for]" .
-                    "//ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' felement ')]",
+                    "//ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' felement ')] |" .
+                    "//input[./@id = //label[normalize-space(.)=$filepickerelement]/@for]" .
+                    "//ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-setting ')]",
                     $exception
             );
         }
diff --git a/search/classes/manager.php b/search/classes/manager.php
index f462480a2e86e..d9c6cae80c151 100644
--- a/search/classes/manager.php
+++ b/search/classes/manager.php
@@ -154,6 +154,11 @@ class manager {
      */
     protected static $phpunitfaketime = 0;
 
+    /**
+     * @var int Result count when used with mock results for Behat tests.
+     */
+    protected $behatresultcount = 0;
+
     /**
      * Constructor, use \core_search\manager::instance instead to get a class instance.
      *
@@ -887,6 +892,10 @@ public function paged_search(\stdClass $formdata, $pagenum) {
         } else {
             // Get the possible count reported by engine, and limit to our max.
             $out->totalcount = $this->engine->get_query_total_count();
+            if (defined('BEHAT_SITE_RUNNING') && $this->behatresultcount) {
+                // Override results when using Behat mock results.
+                $out->totalcount = $this->behatresultcount;
+            }
             $out->totalcount = min($out->totalcount, static::MAX_RESULTS);
         }
 
@@ -955,6 +964,12 @@ public function search(\stdClass $formdata, $limit = 0) {
                     $docs[] = $doc;
                 }
 
+                // Store the mock count, and apply the limit to the returned results.
+                $this->behatresultcount = count($docs);
+                if ($this->behatresultcount > $limit) {
+                    $docs = array_slice($docs, 0, $limit);
+                }
+
                 return $docs;
             }
         }
diff --git a/search/engine/simpledb/tests/privacy_test.php b/search/engine/simpledb/tests/privacy_test.php
index 9bc7c2e7c9906..f88830c650100 100644
--- a/search/engine/simpledb/tests/privacy_test.php
+++ b/search/engine/simpledb/tests/privacy_test.php
@@ -104,6 +104,9 @@ public function setUp() {
      * @return void
      */
     public function tearDown() {
+        // Call parent tearDown() first.
+        parent::tearDown();
+
         // For unit tests before PHP 7, teardown is called even on skip. So only do our teardown if we did setup.
         if ($this->generator) {
             // Moodle DML freaks out if we don't teardown the temp table after each run.
diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
index 74b2e08e7b1c7..aff8055f3979c 100644
--- a/search/engine/solr/classes/engine.php
+++ b/search/engine/solr/classes/engine.php
@@ -272,7 +272,7 @@ protected function create_user_query($filters, $accessinfo) {
 
         $query = new \SolrDisMaxQuery();
 
-        $this->set_query($query, $data->q);
+        $this->set_query($query, self::replace_underlines($data->q));
         $this->add_fields($query);
 
         // Search filters applied, we don't cache these filters as we don't want to pollute the cache with tmp filters
@@ -433,7 +433,10 @@ public function add_fields($query) {
             $query->addField($key);
             if ($dismax && !empty($field['mainquery'])) {
                 // Add fields the main query should be run against.
-                $query->addQueryField($key);
+                // Due to a regression in the PECL solr extension, https://bugs.php.net/bug.php?id=72740,
+                // a boost value is required, even if it is optional; to avoid boosting one among other fields,
+                // the explicit boost value will be the default one, for every field.
+                $query->addQueryField($key, 1);
             }
         }
     }
@@ -750,6 +753,23 @@ public function add_document($document, $fileindexing = false) {
         return true;
     }
 
+    /**
+     * Replaces underlines at edges of words in the content with spaces.
+     *
+     * For example '_frogs_' will become 'frogs', '_frogs and toads_' will become 'frogs and toads',
+     * and 'frogs_and_toads' will be left as 'frogs_and_toads'.
+     *
+     * The reason for this is that for italic content_to_text puts _italic_ underlines at the start
+     * and end of the italicised phrase (not between words). Solr treats underlines as part of the
+     * word, which means that if you search for a word in italic then you can't find it.
+     *
+     * @param string $str String to replace
+     * @return string Replaced string
+     */
+    protected static function replace_underlines(string $str): string {
+        return preg_replace('~\b_|_\b~', '', $str);
+    }
+
     /**
      * Adds a text document to the search engine.
      *
@@ -758,6 +778,14 @@ public function add_document($document, $fileindexing = false) {
      */
     protected function add_solr_document($doc) {
         $solrdoc = new \SolrInputDocument();
+
+        // Replace underlines in the content with spaces. The reason for this is that for italic
+        // text, content_to_text puts _italic_ underlines. Solr treats underlines as part of the
+        // word, which means that if you search for a word in italic then you can't find it.
+        if (array_key_exists('content', $doc)) {
+            $doc['content'] = self::replace_underlines($doc['content']);
+        }
+
         foreach ($doc as $field => $value) {
             $solrdoc->addField($field, $value);
         }
diff --git a/search/engine/solr/tests/engine_test.php b/search/engine/solr/tests/engine_test.php
index 0f43ed8273351..47f244ea90a5c 100644
--- a/search/engine/solr/tests/engine_test.php
+++ b/search/engine/solr/tests/engine_test.php
@@ -1010,6 +1010,68 @@ public function test_user_restriction() {
                 ['Post1', 'Post2'], $results);
     }
 
+    /**
+     * Tests searching for results containing words in italic text. (This used to fail.)
+     */
+    public function test_italics() {
+        global $USER;
+
+        // Use real search areas.
+        $this->search->clear_static();
+        $this->search->add_core_search_areas();
+
+        // Create a course and a forum.
+        $generator = $this->getDataGenerator();
+        $course = $generator->create_course();
+        $forum = $generator->create_module('forum', ['course' => $course->id]);
+
+        // As admin user, create forum discussions with various words in italics or with underlines.
+        $this->setAdminUser();
+        $forumgen = $generator->get_plugin_generator('mod_forum');
+        $forumgen->create_discussion(['course' => $course->id, 'forum' => $forum->id,
+                'userid' => $USER->id, 'name' => 'Post1',
+                'message' => '<p>This is a post about <i>frogs</i>.</p>']);
+        $forumgen->create_discussion(['course' => $course->id, 'forum' => $forum->id,
+                'userid' => $USER->id, 'name' => 'Post2',
+                'message' => '<p>This is a post about <i>toads and zombies</i>.</p>']);
+        $forumgen->create_discussion(['course' => $course->id, 'forum' => $forum->id,
+                'userid' => $USER->id, 'name' => 'Post3',
+                'message' => '<p>This is a post about toads_and_zombies.</p>']);
+        $forumgen->create_discussion(['course' => $course->id, 'forum' => $forum->id,
+                'userid' => $USER->id, 'name' => 'Post4',
+                'message' => '<p>This is a post about _leading and trailing_ underlines.</p>']);
+
+        // Index the data.
+        $this->search->index();
+
+        // Search for 'frogs' should find the post.
+        $querydata = new stdClass();
+        $querydata->q = 'frogs';
+        $results = $this->search->search($querydata);
+        $this->assert_result_titles(['Post1'], $results);
+
+        // Search for 'toads' or 'zombies' should find post 2 (and not 3)...
+        $querydata->q = 'toads';
+        $results = $this->search->search($querydata);
+        $this->assert_result_titles(['Post2'], $results);
+        $querydata->q = 'zombies';
+        $results = $this->search->search($querydata);
+        $this->assert_result_titles(['Post2'], $results);
+
+        // Search for 'toads_and_zombies' should find post 3.
+        $querydata->q = 'toads_and_zombies';
+        $results = $this->search->search($querydata);
+        $this->assert_result_titles(['Post3'], $results);
+
+        // Search for '_leading' or 'trailing_' should find post 4.
+        $querydata->q = '_leading';
+        $results = $this->search->search($querydata);
+        $this->assert_result_titles(['Post4'], $results);
+        $querydata->q = 'trailing_';
+        $results = $this->search->search($querydata);
+        $this->assert_result_titles(['Post4'], $results);
+    }
+
     /**
      * Asserts that the returned documents have the expected titles (regardless of order).
      *
diff --git a/search/tests/behat/behat_search.php b/search/tests/behat/behat_search.php
index 206819de96967..c7ca9478f318f 100644
--- a/search/tests/behat/behat_search.php
+++ b/search/tests/behat/behat_search.php
@@ -135,4 +135,14 @@ public function global_search_expects_the_query_and_will_return($query, TableNod
 
         set_config('behat_fakeresult', json_encode($outdata), 'core_search');
     }
+
+    /**
+     * Updates the global search index to take account of any added activities.
+     *
+     * @Given /^I update the global search index$/
+     * @throws moodle_exception
+     */
+    public function i_update_the_global_search_index() {
+        \core_search\manager::instance()->index(false);
+    }
 }
diff --git a/search/tests/behat/search_by_user.feature b/search/tests/behat/search_by_user.feature
index 37f7f13d2a8f9..e5c1093fabbb8 100644
--- a/search/tests/behat/search_by_user.feature
+++ b/search/tests/behat/search_by_user.feature
@@ -34,10 +34,10 @@ Feature: Select users when searching for user-created content
       | activity | PAGE1    |
     And I search for "frogs" using the header global search box
     And I expand all fieldsets
-    And I set the field with xpath "//select[@id='id_userids']/../input[@type='text']" to "Anne"
+    When I expand the "Users" autocomplete
     # Alphabetical surname order.
-    Then "Anne Additional" "text" should appear before "Anne Ditin" "text"
-    And "Anne Ditin" "text" should appear before "Anne Other" "text"
+    Then "Anne Additional" "text" should appear before "Anne Ditin" "text" in the "Users" "autocomplete"
+    And "Anne Ditin" "text" should appear before "Anne Other" "text" in the "Users" "autocomplete"
 
   @javascript
   Scenario: As administrator, search for users within course
@@ -49,9 +49,9 @@ Feature: Select users when searching for user-created content
     And I search for "frogs" using the header global search box
     And I expand all fieldsets
     And I select "Course: Frogs" from the "Search within" singleselect
-    And I set the field with xpath "//select[@id='id_userids']/../input[@type='text']" to "Anne"
+    When I expand the "Users" autocomplete
     # Users in selected course appear first.
-    And "Anne Additional" "text" should appear after "Anne Other" "text"
+    Then "Anne Additional" "text" should appear after "Anne Other" "text" in the "Users" "autocomplete"
 
   @javascript
   Scenario: As student, cannot see users on other courses
@@ -62,6 +62,6 @@ Feature: Select users when searching for user-created content
       | activity | PAGE1    |
     And I search for "frogs" using the header global search box
     And I expand all fieldsets
-    And I set the field with xpath "//select[@id='id_userids']/../input[@type='text']" to "A"
-    Then "Anne Ditin" "text" should appear before "Anne Other" "text"
+    When I expand the "Users" autocomplete
+    Then "Anne Ditin" "text" should appear before "Anne Other" "text" in the "Users" "autocomplete"
     And "Anne Additional" "text" should not exist
diff --git a/search/tests/behat/search_query.feature b/search/tests/behat/search_query.feature
index be0938449fee6..1d7c87af489fb 100644
--- a/search/tests/behat/search_query.feature
+++ b/search/tests/behat/search_query.feature
@@ -6,22 +6,20 @@ Feature: Use global search interface
 
   Background:
     Given the following config values are set as admin:
-      | enableglobalsearch | 1 |
-      | searchengine | solr |
+      | enableglobalsearch | 1        |
+      | searchengine       | simpledb |
     And the following "courses" exist:
       | shortname | fullname   |
       | F1        | Amphibians |
     And the following "activities" exist:
-      | activity | name       | intro      | course | idnumber |
-      | page     | PageName1  | PageDesc1  | F1     | PAGE1    |
-      | forum    | ForumName1 | ForumDesc1 | F1     | FORUM1   |
+      | activity | name                        | intro      | course | idnumber |
+      | page     | PageName1 frogs amphibians  | PageDesc1  | F1     | PAGE1    |
+      | forum    | ForumName1 toads amphibians | ForumDesc1 | F1     | FORUM1   |
+    And I update the global search index
     And I log in as "admin"
 
   @javascript
   Scenario: Search from header search box with one result
-    Given global search expects the query "frogs" and will return:
-      | type     | idnumber |
-      | activity | PAGE1    |
     When I search for "frogs" using the header global search box
     Then I should see "PageName1"
     And I should see "PageDesc1"
@@ -32,15 +30,9 @@ Feature: Use global search interface
 
   @javascript
   Scenario: Search from search page with two results
-    Given global search expects the query "zombies" and will return:
-      | nothing |
     When I search for "zombies" using the header global search box
     Then I should see "No results"
-    And I set the field "id_q" to "Toads"
-    And global search expects the query "Toads" and will return:
-      | type     | idnumber |
-      | activity | FORUM1   |
-      | activity | PAGE1    |
+    And I set the field "id_q" to "amphibians"
     # You cannot press "Search" because there's a fieldset with the same name that gets in the way.
     And I press "id_submitbutton"
     And I should see "ForumName1"
@@ -54,9 +46,6 @@ Feature: Use global search interface
 
   @javascript
   Scenario: Search starting from site context (no within option)
-    Given global search expects the query "frogs" and will return:
-      | type     | idnumber |
-      | activity | PAGE1    |
     When I search for "frogs" using the header global search box
     And I expand all fieldsets
     Then I should not see "Search within"
@@ -64,9 +53,6 @@ Feature: Use global search interface
 
   @javascript
   Scenario: Search starting from course context (within option lists course)
-    Given global search expects the query "frogs" and will return:
-      | type     | idnumber |
-      | activity | PAGE1    |
     When I am on "Amphibians" course homepage
     And I search for "frogs" using the header global search box
     And I expand all fieldsets
@@ -78,9 +64,6 @@ Feature: Use global search interface
 
   @javascript
   Scenario: Search starting from forum context (within option lists course and forum)
-    Given global search expects the query "frogs" and will return:
-      | type     | idnumber |
-      | activity | PAGE1    |
     When I am on "Amphibians" course homepage
     And I follow "ForumName1"
     And I search for "frogs" using the header global search box
@@ -95,7 +78,10 @@ Feature: Use global search interface
 
   @javascript
   Scenario: Check that groups option in search form appears when intended
-    Given the following "groups" exist:
+    # Switch to mocked Solr search because simpledb doesn't support groups.
+    Given the following config values are set as admin:
+      | searchengine | solr |
+    And the following "groups" exist:
       | name    | course | idnumber |
       | A Group | F1     | G1       |
       | B Group | F1     | G2       |
diff --git a/theme/boost/amd/build/aria.min.js b/theme/boost/amd/build/aria.min.js
index fb855166ae6c3..15ae54e0a18e4 100644
--- a/theme/boost/amd/build/aria.min.js
+++ b/theme/boost/amd/build/aria.min.js
@@ -1 +1 @@
-define(["jquery","core/pending"],function(a,b){return{init:function(){var c=!1,d=function(){c=!0},e=function(){var a=c;return c=!1,a};a('[data-toggle="dropdown"]').keydown(function(b){var c,e=b.which||b.keyCode;38==e&&d(),27==e&&(c=a(b.target).attr("aria-expanded"),b.preventDefault(),"false"==c&&a(b.target).click()),32!=e&&13!=e||(b.preventDefault(),a(b.target).click())});var f=function(c){var d=function(b){a(this).focus(),b.resolve()}.bind(c);setTimeout(d,50,new b("core/aria:delayed-focus"))};a(".dropdown").on("shown.bs.dropdown",function(b){var c=a(b.target).find('[role="menu"]'),d=!1,g=!1;c&&(d=a(c).find('[role="menuitem"]')),d&&d.length>0&&(g=e()?d[d.length-1]:d[0]),g&&f(g)}),a('.dropdown [role="menu"] [role="menuitem"]').keypress(function(b){var c,d,e=String.fromCharCode(b.which||b.keyCode),g=a(b.target).closest('[role="menu"]'),h=0,i=!1;if(g&&(i=a(g).find('[role="menuitem"]')))for(e=e.toLowerCase(),h=0;h<i.length;h++)if(c=a(i[h]),d=c.text().trim().toLowerCase(),0==d.indexOf(e)){f(c);break}}),a('.dropdown [role="menu"] [role="menuitem"]').keydown(function(b){var c=b.which||b.keyCode,d=!1,e=a(b.target).closest('[role="menu"]'),g=0,h=!1;if(e&&(h=a(e).find('[role="menuitem"]'))){if(40==c){for(g=0;g<h.length-1;g++)if(h[g]==b.target){d=h[g+1];break}d||(d=h[0])}else if(38==c){for(g=1;g<h.length;g++)if(h[g]==b.target){d=h[g-1];break}d||(d=h[h.length-1])}else 36==c?d=h[0]:35==c&&(d=h[h.length-1]);d&&(b.preventDefault(),f(d))}}),a(".dropdown").on("hidden.bs.dropdown",function(b){var c=a(b.target).find('[data-toggle="dropdown"]');c&&f(c)}),a(function(){window.setTimeout(function(b){var c=a('[role="alert"][data-aria-autofocus="true"]');c.length>0&&(a(c[0]).attr("tabindex","0"),a(c[0]).focus()),b.resolve()},300,new b("core/aria:delayed-focus"))})}}});
\ No newline at end of file
+define(["jquery","core/pending"],function(a,b){return{init:function(){var c=!1,d=function(){c=!0},e=function(){var a=c;return c=!1,a};a('[data-toggle="dropdown"]').keydown(function(b){var c,e=b.which||b.keyCode;38==e&&d(),27==e&&(c=a(b.target).attr("aria-expanded"),b.preventDefault(),"false"==c&&a(b.target).click()),32!=e&&13!=e||(b.preventDefault(),a(b.target).click())});var f=function(c){var d=function(b){a(this).focus(),b.resolve()}.bind(c);setTimeout(d,50,new b("core/aria:delayed-focus"))};a(".dropdown").on("shown.bs.dropdown",function(b){var c=a(b.target).find('[role="menu"]'),d=!1,g=!1;c&&(d=a(c).find('[role="menuitem"]')),d&&d.length>0&&(g=e()?d[d.length-1]:d[0]),g&&f(g)}),a('.dropdown [role="menu"] [role="menuitem"]').keypress(function(b){var c,d,e=String.fromCharCode(b.which||b.keyCode),g=a(b.target).closest('[role="menu"]'),h=0,i=!1;if(g&&(i=a(g).find('[role="menuitem"]')))for(e=e.toLowerCase(),h=0;h<i.length;h++)if(c=a(i[h]),d=c.text().trim().toLowerCase(),0==d.indexOf(e)){f(c);break}}),a('.dropdown [role="menu"] [role="menuitem"]').keydown(function(b){var c=b.which||b.keyCode,d=!1,e=a(b.target).closest('[role="menu"]'),g=0,h=!1;if(e&&(h=a(e).find('[role="menuitem"]'))){if(40==c){for(g=0;g<h.length-1;g++)if(h[g]==b.target){d=h[g+1];break}d||(d=h[0])}else if(38==c){for(g=1;g<h.length;g++)if(h[g]==b.target){d=h[g-1];break}d||(d=h[h.length-1])}else 36==c?d=h[0]:35==c&&(d=h[h.length-1]);d&&(b.preventDefault(),f(d))}}),a(".dropdown").on("hidden.bs.dropdown",function(b){var c=a(b.target).find('[data-toggle="dropdown"]');c&&f(c)}),window.addEventListener("load",function(){var a=document.querySelectorAll('[data-aria-autofocus="true"][role="alert"]');Array.prototype.forEach.call(a,function(a){a.innerHTML+=" ",a.removeAttribute("data-aria-autofocus")})})}}});
\ No newline at end of file
diff --git a/theme/boost/amd/build/form-display-errors.min.js b/theme/boost/amd/build/form-display-errors.min.js
index 105b7a20344bf..180db212c048d 100644
--- a/theme/boost/amd/build/form-display-errors.min.js
+++ b/theme/boost/amd/build/form-display-errors.min.js
@@ -1 +1 @@
-define(["jquery","core/event"],function(a,b){return{enhance:function(c){var d=document.getElementById(c);a(d).on(b.Events.FORM_FIELD_VALIDATION,function(b,c){b.preventDefault();var e=a(d).closest(".form-group"),f=e.find(".form-control-feedback");"TEXTAREA"==a(d).prop("tagName")&&e.find("[contenteditable]")&&(d=e.find("[contenteditable]")),""!==c?(e.addClass("has-danger"),e.data("client-validation-error",!0),a(d).addClass("is-invalid"),a(d).attr("aria-describedby",f.attr("id")),a(d).attr("aria-invalid",!0),f.attr("tabindex",0),f.html(c),f.is(":visible")||(f.show(),f.focus())):e.data("client-validation-error")===!0&&(e.removeClass("has-danger"),e.data("client-validation-error",!1),a(d).removeClass("is-invalid"),a(d).removeAttr("aria-describedby"),a(d).attr("aria-invalid",!1),f.hide())})}}});
\ No newline at end of file
+define(["jquery","core/event"],function(a,b){return{enhance:function(c){var d=document.getElementById(c);if(d){a(d).on(b.Events.FORM_FIELD_VALIDATION,function(b,c){b.preventDefault();var e=a(d).closest(".form-group"),f=e.find(".form-control-feedback");"TEXTAREA"==a(d).prop("tagName")&&e.find("[contenteditable]")&&(d=e.find("[contenteditable]")),""!==c?(e.addClass("has-danger"),e.data("client-validation-error",!0),a(d).addClass("is-invalid"),a(d).attr("aria-describedby",f.attr("id")),a(d).attr("aria-invalid",!0),f.attr("tabindex",0),f.html(c),f.is(":visible")||(f.show(),f.focus())):e.data("client-validation-error")===!0&&(e.removeClass("has-danger"),e.data("client-validation-error",!1),a(d).removeClass("is-invalid"),a(d).removeAttr("aria-describedby"),a(d).attr("aria-invalid",!1),f.hide())});var e=d.closest("form");"boostFormErrorsEnhanced"in e.dataset||(e.addEventListener("submit",function(){var b=a(".form-control-feedback:visible");b.length&&b[0].focus()}),e.dataset.boostFormErrorsEnhanced=1)}}}});
\ No newline at end of file
diff --git a/theme/boost/amd/build/loader.min.js b/theme/boost/amd/build/loader.min.js
index 2e45ad47da4ef..371698d94b76a 100644
--- a/theme/boost/amd/build/loader.min.js
+++ b/theme/boost/amd/build/loader.min.js
@@ -1 +1 @@
-define(["jquery","./tether","core/event"],function(a,b,c){return window.jQuery=a,window.Tether=b,require(["theme_boost/aria","theme_boost/pending","theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(b){a("body").popover({trigger:"focus",selector:"[data-toggle=popover][data-trigger!=hover]"}),a("html").popover({container:"body",selector:"[data-toggle=popover][data-trigger=hover]",trigger:"hover",delay:{hide:500}}),c.getLegacyEvents().done(function(b){a(document).on(b.FILTER_CONTENT_UPDATED,function(){a("body").popover({selector:'[data-toggle="popover"]',trigger:"focus"})})}),b.init()}),{}});
\ No newline at end of file
+define(["jquery","./tether","core/event","core/custom_interaction_events"],function(a,b,c,d){return window.jQuery=a,window.Tether=b,M.util.js_pending("theme_boost/loader:children"),require(["theme_boost/aria","theme_boost/pending","theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(b){a("body").popover({trigger:"focus",selector:"[data-toggle=popover][data-trigger!=hover]",placement:"auto"}),d.define(a("body"),[d.events.escape]),a("body").on(d.events.escape,"[data-toggle=popover]",function(){a(this).trigger("blur")}),a("html").popover({container:"body",selector:"[data-toggle=popover][data-trigger=hover]",trigger:"hover",delay:{hide:500}}),c.getLegacyEvents().done(function(b){a(document).on(b.FILTER_CONTENT_UPDATED,function(){a("body").popover({selector:'[data-toggle="popover"]',trigger:"focus"})})}),b.init(),M.util.js_complete("theme_boost/loader:children")}),{}});
\ No newline at end of file
diff --git a/theme/boost/amd/src/aria.js b/theme/boost/amd/src/aria.js
index 3bcff10b91016..7a72756e0a7ef 100644
--- a/theme/boost/amd/src/aria.js
+++ b/theme/boost/amd/src/aria.js
@@ -186,15 +186,14 @@ define(['jquery', 'core/pending'], function($, Pending) {
             });
 
             // After page load, focus on any element with special autofocus attribute.
-            $(function() {
-                window.setTimeout(function(pendingPromise) {
-                    var alerts = $('[role="alert"][data-aria-autofocus="true"]');
-                    if (alerts.length > 0) {
-                        $(alerts[0]).attr('tabindex', '0');
-                        $(alerts[0]).focus();
-                    }
-                    pendingPromise.resolve();
-                }, 300, new Pending('core/aria:delayed-focus'));
+            window.addEventListener("load", function() {
+                var alerts = document.querySelectorAll('[data-aria-autofocus="true"][role="alert"]');
+                Array.prototype.forEach.call(alerts, function(autofocusElement) {
+                    // According to the specification an role="alert" region is only read out on change to the content
+                    // of that region.
+                    autofocusElement.innerHTML += ' ';
+                    autofocusElement.removeAttribute('data-aria-autofocus');
+                });
             });
         }
     };
diff --git a/theme/boost/amd/src/form-display-errors.js b/theme/boost/amd/src/form-display-errors.js
index 1adda2d672e50..230cbc59f4087 100644
--- a/theme/boost/amd/src/form-display-errors.js
+++ b/theme/boost/amd/src/form-display-errors.js
@@ -25,6 +25,12 @@ define(['jquery', 'core/event'], function($, Event) {
     return {
         enhance: function(elementid) {
             var element = document.getElementById(elementid);
+            if (!element) {
+                // Some elements (e.g. static) don't have a form field.
+                // Hence there is no validation. So, no setup required here.
+                return;
+            }
+
             $(element).on(Event.Events.FORM_FIELD_VALIDATION, function(event, msg) {
                 event.preventDefault();
                 var parent = $(element).closest('.form-group');
@@ -44,6 +50,7 @@ define(['jquery', 'core/event'], function($, Event) {
                     feedback.html(msg);
 
                     // Only display and focus when the error was not already visible.
+                    // This is so that, when tabbing around the form, you don't get stuck.
                     if (!feedback.is(':visible')) {
                         feedback.show();
                         feedback.focus();
@@ -60,6 +67,17 @@ define(['jquery', 'core/event'], function($, Event) {
                     }
                 }
             });
+
+            var form = element.closest('form');
+            if (!('boostFormErrorsEnhanced' in form.dataset)) {
+                form.addEventListener('submit', function() {
+                    var visibleError = $('.form-control-feedback:visible');
+                    if (visibleError.length) {
+                        visibleError[0].focus();
+                    }
+                });
+                form.dataset.boostFormErrorsEnhanced = 1;
+            }
         }
     };
 });
diff --git a/theme/boost/amd/src/loader.js b/theme/boost/amd/src/loader.js
index dc37f3cfdda91..a1c3d9107fcc2 100644
--- a/theme/boost/amd/src/loader.js
+++ b/theme/boost/amd/src/loader.js
@@ -23,10 +23,11 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      2.9
  */
-define(['jquery', './tether', 'core/event'], function(jQuery, Tether, Event) {
+define(['jquery', './tether', 'core/event', 'core/custom_interaction_events'], function(jQuery, Tether, Event, customEvents) {
 
     window.jQuery = jQuery;
     window.Tether = Tether;
+    M.util.js_pending('theme_boost/loader:children');
 
     require(['theme_boost/aria',
             'theme_boost/pending',
@@ -46,7 +47,17 @@ define(['jquery', './tether', 'core/event'], function(jQuery, Tether, Event) {
         // We do twice because: https://github.com/twbs/bootstrap/issues/10547
         jQuery('body').popover({
             trigger: 'focus',
-            selector: "[data-toggle=popover][data-trigger!=hover]"
+            selector: "[data-toggle=popover][data-trigger!=hover]",
+            placement: 'auto'
+        });
+
+        // Popovers must close on Escape for accessibility reasons.
+        customEvents.define(jQuery('body'), [
+            customEvents.events.escape,
+        ]);
+        jQuery('body').on(customEvents.events.escape, '[data-toggle=popover]', function() {
+            // Use "blur" instead of "popover('hide')" to prevent issue that the same tooltip can't be opened again.
+            jQuery(this).trigger('blur');
         });
 
         jQuery("html").popover({
@@ -70,6 +81,7 @@ define(['jquery', './tether', 'core/event'], function(jQuery, Tether, Event) {
         });
 
         Aria.init();
+        M.util.js_complete('theme_boost/loader:children');
     });
 
 
diff --git a/theme/boost/lang/en/theme_boost.php b/theme/boost/lang/en/theme_boost.php
index b262721f52e0d..1133f7bf9968f 100644
--- a/theme/boost/lang/en/theme_boost.php
+++ b/theme/boost/lang/en/theme_boost.php
@@ -40,7 +40,7 @@
 $string['nobootswatch'] = 'None';
 $string['pluginname'] = 'Boost';
 $string['presetfiles'] = 'Additional theme preset files';
-$string['presetfiles_desc'] = 'Preset files can be used to dramatically alter the appearance of the theme. See <a href="https://docs.moodle.org/dev/Boost_Presets">Boost presets</a> for information on creating and sharing your own preset files, and see the <a href="http://moodle.net/boost">Presets repository</a> for presets that others have shared.';
+$string['presetfiles_desc'] = 'Preset files can be used to dramatically alter the appearance of the theme. See <a href="https://docs.moodle.org/dev/Boost_Presets">Boost presets</a> for information on creating and sharing your own preset files, and see the <a href="https://archive.moodle.net/boost">Presets repository</a> for presets that others have shared.';
 $string['preset'] = 'Theme preset';
 $string['preset_desc'] = 'Pick a preset to broadly change the look of the theme.';
 $string['privacy:metadata'] = 'The Boost theme does not store any personal data about any user.';
diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss
index 178e38e3b90de..b147dc4cc99db 100644
--- a/theme/boost/scss/moodle/blocks.scss
+++ b/theme/boost/scss/moodle/blocks.scss
@@ -49,7 +49,7 @@ $blocks-plus-gutter: $blocks-column-width + ( $grid-gutter-width / 2 );
 .region_main_settings_menu_proxy {
     width: 4rem;
     height: 2rem;
-    background-color: $card-bg;
+    background-color: $body-bg;
     margin-left: $card-spacer-x / 2;
     margin-bottom: $card-spacer-x / 2;
     border-bottom-left-radius: 0.5rem;
@@ -300,17 +300,17 @@ body.drawer-open-left #region-main.has-blocks {
 .block_navigation .block_tree [aria-expanded="true"]:before {
     content: $fa-var-angle-down;
     margin-right: 0;
+    @include fa-icon();
     font-size: 16px;
-    @extend .fa;
     width: 16px;
 }
 
 .block_settings .block_tree [aria-expanded="false"]:before,
 .block_navigation .block_tree [aria-expanded="false"]:before {
     content: $fa-var-angle-right;
-    font-size: 16px;
     margin-right: 0;
-    @extend .fa;
+    @include fa-icon();
+    font-size: 16px;
     width: 16px;
 }
 .dir-rtl {
diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
index e1c8960c1a0e2..50b2eefc3840e 100644
--- a/theme/boost/scss/moodle/course.scss
+++ b/theme/boost/scss/moodle/course.scss
@@ -555,23 +555,6 @@ span.editinstructions {
     padding: .3em;
 }
 
-.dndupload-progress-outer {
-    background-color: $progress-bg;
-    @include border-radius($progress-border-radius);
-    @include box-shadow($progress-box-shadow);
-    display: block;
-    width: 100%;
-    height: $spacer-y;
-    margin-bottom: $spacer-y;
-}
-
-.dndupload-progress-inner {
-    background-color: $progress-bar-color;
-    @include border-left-radius($progress-border-radius);
-    display: inline-block;
-    height: $spacer-y;
-}
-
 .dndupload-hidden {
     display: none;
 }
@@ -653,7 +636,8 @@ span.editinstructions {
     margin: 0;
 }
 
-.coursebox .moreinfo {
+.coursebox .moreinfo,
+.coursebox .enrolmenticons {
     padding: 3px 0;
     float: right;
 }
@@ -1200,3 +1184,13 @@ span.editinstructions {
     height: 32px;
     font-size: 32px;
 }
+
+.activity-navigation {
+    .row {
+        align-items: center;
+    }
+    #prev-activity-link,
+    #next-activity-link {
+        white-space: pre-wrap;
+    }
+}
diff --git a/theme/boost/scss/moodle/drawer.scss b/theme/boost/scss/moodle/drawer.scss
index 90030e216ad6c..cb1b9007c309b 100644
--- a/theme/boost/scss/moodle/drawer.scss
+++ b/theme/boost/scss/moodle/drawer.scss
@@ -23,12 +23,9 @@ $drawer-offscreen-gutter: 20px !default;
 #nav-drawer.closed {
     left: -($drawer-width + $drawer-offscreen-gutter);
 }
-#page {
-    margin-top: $navbar-height;
-}
 
 /* Use a variable for the drawer background colors. */
-$drawer-bg: $gray-lighter !default;
+$drawer-bg: darken($body-bg, 5%) !default;
 
 [data-region="drawer"] {
     position: fixed;
@@ -39,7 +36,7 @@ $drawer-bg: $gray-lighter !default;
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
     z-index: $zindex-dropdown - 1;
-    background-color: darken($body-bg, 5%);
+    background-color: $drawer-bg;
     -webkit-transition: right 0.5s ease, left 0.5s ease;
     -moz-transition: right 0.5s ease, left 0.5s ease;
     transition: right 0.5s ease, left 0.5s ease;
@@ -47,6 +44,17 @@ $drawer-bg: $gray-lighter !default;
 #nav-drawer {
     right: auto;
     left: 0;
+
+    /* Override the z-indexes defined in bootstrap/_list-group.scss that
+       lead to side effects on the user tours positioning. */
+    .list-group-item-action.active,
+    .list-group-item.active {
+        z-index: inherit;
+    }
+    .list-group-item-action.active + .list-group-item,
+    .list-group-item.active + .list-group-item {
+        border-top: none;
+    }
 }
 #page {
     margin-top: $fixed-header-y;
diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index 55c3995c6761d..7d63513541826 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -285,8 +285,12 @@ fieldset.coursesearchbox label {
     min-height: 2 * $input-padding-y-sm + 2 * $font-size-base;
 }
 
-.form-autocomplete-multiple [role=listitem] {
+.form-autocomplete-selection [role=listitem] {
     cursor: pointer;
+    white-space: inherit;
+    word-break: break-word;
+    line-height: 1.4;
+    text-align: left;
 }
 
 .form-autocomplete-suggestions {
@@ -323,11 +327,9 @@ fieldset.coursesearchbox label {
 
 .form-autocomplete-downarrow {
     color: $body-color;
-    position: relative;
-    top: 0.2em;
-    left: -1.5em;
+    top: 0.2rem;
+    right: 0.5rem;
     cursor: pointer;
-
     .loading-icon {
         position: absolute;
         top: 0;
@@ -461,4 +463,14 @@ textarea[data-auto-rows] {
         /*rtl:remove*/
         background-image: url([[pix:t/collapsed]]);
     }
+
+    .mform {
+        .form-inline {
+            .fdefaultcustom {
+                label {
+                    justify-content: initial;
+                }
+            }
+        }
+    }
 }
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index e0e162e199aca..24746220cb663 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -547,10 +547,6 @@ $popout-header-height: 4rem;
     margin: 0;
 }
 
-.path-mod-assign [data-region="grade-panel"] .fitem > .col-md-3 > .pull-xs-right {
-    float: none !important; /* stylelint-disable-line declaration-no-important */
-}
-
 .path-mod-assign [data-region="grade-panel"] .mform .fitem.has-popout .felement {
     width: 100%;
 }
diff --git a/theme/boost/scss/moodle/popover-region.scss b/theme/boost/scss/moodle/popover-region.scss
index 56f83c880f2da..2acb9c67933e3 100644
--- a/theme/boost/scss/moodle/popover-region.scss
+++ b/theme/boost/scss/moodle/popover-region.scss
@@ -22,7 +22,6 @@ $content-header-footer-height: $region-header-height + $region-footer-height;
 }
 
 .popover-region {
-    float: right;
     position: relative;
 
     &.collapsed {
@@ -177,7 +176,7 @@ $content-header-footer-height: $region-header-height + $region-footer-height;
 
 .navbar {
     .popover-region {
-        float: right;
+        float: left;
         margin-right: 10px;
 
         &.collapsed {
diff --git a/theme/boost/scss/moodle/question.scss b/theme/boost/scss/moodle/question.scss
index 7ece8bb13e996..bbcf32e0eb4b1 100644
--- a/theme/boost/scss/moodle/question.scss
+++ b/theme/boost/scss/moodle/question.scss
@@ -414,7 +414,11 @@ body.path-question-type {
     vertical-align: text-bottom;
 }
 
-.que input.questionflagimage {
+body.jsenabled .questionflag input[type=checkbox] {
+    display: none;
+}
+
+.que .questionflagimage {
     padding-right: 3px;
     height: 16px;
     width: 16px;
@@ -443,6 +447,15 @@ body.path-question-type {
     }
     img.activityicon {
         margin-left: 0;
+        width: 16px;
+        height: 16px;
+        padding-right: 4px;
+    }
+}
+
+#page-mod-quiz-edit .activity {
+    img.activityicon {
+        vertical-align: text-top;
     }
 }
 
@@ -610,6 +623,10 @@ body.path-question-type {
     width: auto;
 }
 
+.questionbankwindow .form-autocomplete-selection {
+    margin-left: 0;
+}
+
 #page-mod-quiz-edit div.editq div.question div.content {
     background-color: $body-bg;
     border: 1px solid #ddd;
@@ -620,6 +637,7 @@ body.path-question-type {
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
     margin-top: 0;
+    padding-right: 4px;
 }
 
 .path-mod-quiz .statedetails {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 9d351158aa3b3..cdb56b470df7f 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10,9 +10,7 @@
  *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
-.fa, .block_settings .block_tree [aria-expanded="true"]:before,
-.block_navigation .block_tree [aria-expanded="true"]:before, .block_settings .block_tree [aria-expanded="false"]:before,
-.block_navigation .block_tree [aria-expanded="false"]:before {
+.fa {
   display: inline-block;
   font: normal normal normal 14px/1 FontAwesome;
   font-size: inherit;
@@ -69,14 +67,10 @@
 .fa-pull-right {
   float: right; }
 
-.fa.fa-pull-left, .block_settings .block_tree .fa-pull-left[aria-expanded="true"]:before,
-.block_navigation .block_tree .fa-pull-left[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-left[aria-expanded="false"]:before,
-.block_navigation .block_tree .fa-pull-left[aria-expanded="false"]:before {
+.fa.fa-pull-left {
   margin-right: .3em; }
 
-.fa.fa-pull-right, .block_settings .block_tree .fa-pull-right[aria-expanded="true"]:before,
-.block_navigation .block_tree .fa-pull-right[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-right[aria-expanded="false"]:before,
-.block_navigation .block_tree .fa-pull-right[aria-expanded="false"]:before {
+.fa.fa-pull-right {
   margin-left: .3em; }
 
 /* Deprecated as of 4.4.0 */
@@ -86,14 +80,10 @@
 .pull-left {
   float: left; }
 
-.fa.pull-left, .block_settings .block_tree .pull-left[aria-expanded="true"]:before,
-.block_navigation .block_tree .pull-left[aria-expanded="true"]:before, .block_settings .block_tree .pull-left[aria-expanded="false"]:before,
-.block_navigation .block_tree .pull-left[aria-expanded="false"]:before {
+.fa.pull-left {
   margin-right: .3em; }
 
-.fa.pull-right, .block_settings .block_tree .pull-right[aria-expanded="true"]:before,
-.block_navigation .block_tree .pull-right[aria-expanded="true"]:before, .block_settings .block_tree .pull-right[aria-expanded="false"]:before,
-.block_navigation .block_tree .pull-right[aria-expanded="false"]:before {
+.fa.pull-right {
   margin-left: .3em; }
 
 .fa-spin {
@@ -11396,14 +11386,26 @@ div.editor_atto_toolbar button .icon {
 .block_navigation .block_tree [aria-expanded="true"]:before {
   content: "";
   margin-right: 0;
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
   font-size: 16px;
   width: 16px; }
 
 .block_settings .block_tree [aria-expanded="false"]:before,
 .block_navigation .block_tree [aria-expanded="false"]:before {
   content: "";
-  font-size: 16px;
   margin-right: 0;
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-size: 16px;
   width: 16px; }
 
 .dir-rtl .block_settings .block_tree [aria-expanded="false"]:before,
@@ -12085,18 +12087,6 @@ span.editinstructions {
   margin-top: .2em;
   padding: .3em; }
 
-.dndupload-progress-outer {
-  background-color: #e9ecef;
-  display: block;
-  width: 100%;
-  height: 1rem;
-  margin-bottom: 1rem; }
-
-.dndupload-progress-inner {
-  background-color: #fff;
-  display: inline-block;
-  height: 1rem; }
-
 .dndupload-hidden {
   display: none; }
 
@@ -12163,7 +12153,8 @@ span.editinstructions {
   padding: 0;
   margin: 0; }
 
-.coursebox .moreinfo {
+.coursebox .moreinfo,
+.coursebox .enrolmenticons {
   padding: 3px 0;
   float: right; }
 
@@ -12564,6 +12555,13 @@ span.editinstructions {
   height: 32px;
   font-size: 32px; }
 
+.activity-navigation .row {
+  align-items: center; }
+
+.activity-navigation #prev-activity-link,
+.activity-navigation #next-activity-link {
+  white-space: pre-wrap; }
+
 /* Anchor link offset fix. This makes hash links scroll 60px down to account for the fixed header. */
 :target::before {
   content: " ";
@@ -12582,9 +12580,6 @@ span.editinstructions {
 #nav-drawer.closed {
   left: -305px; }
 
-#page {
-  margin-top: 50px; }
-
 /* Use a variable for the drawer background colors. */
 [data-region="drawer"] {
   position: fixed;
@@ -12602,7 +12597,15 @@ span.editinstructions {
 
 #nav-drawer {
   right: auto;
-  left: 0; }
+  left: 0;
+  /* Override the z-indexes defined in bootstrap/_list-group.scss that
+       lead to side effects on the user tours positioning. */ }
+  #nav-drawer .list-group-item-action.active,
+  #nav-drawer .list-group-item.active {
+    z-index: inherit; }
+  #nav-drawer .list-group-item-action.active + .list-group-item,
+  #nav-drawer .list-group-item.active + .list-group-item {
+    border-top: none; }
 
 #page {
   margin-top: 50px; }
@@ -14112,7 +14115,10 @@ body.path-question-type {
 .que .questioncorrectnessicon {
   vertical-align: text-bottom; }
 
-.que input.questionflagimage {
+body.jsenabled .questionflag input[type=checkbox] {
+  display: none; }
+
+.que .questionflagimage {
   padding-right: 3px;
   height: 16px;
   width: 16px; }
@@ -14133,7 +14139,13 @@ body.path-question-type {
   padding-left: 0; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-left: 0; }
+  margin-left: 0;
+  width: 16px;
+  height: 16px;
+  padding-right: 4px; }
+
+#page-mod-quiz-edit .activity img.activityicon {
+  vertical-align: text-top; }
 
 #page-mod-quiz-edit .box.generalbox.questionbank {
   padding: 0.5em; }
@@ -14254,13 +14266,17 @@ body.path-question-type {
 .questionbankwindow .module {
   width: auto; }
 
+.questionbankwindow .form-autocomplete-selection {
+  margin-left: 0; }
+
 #page-mod-quiz-edit div.editq div.question div.content {
   background-color: #fff;
   border: 1px solid #ddd;
   overflow: hidden; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-top: 0; }
+  margin-top: 0;
+  padding-right: 4px; }
 
 .path-mod-quiz .statedetails {
   display: block;
@@ -14810,8 +14826,12 @@ fieldset.coursesearchbox label {
   margin: 0.25rem;
   min-height: 2.375rem; }
 
-.form-autocomplete-multiple [role=listitem] {
-  cursor: pointer; }
+.form-autocomplete-selection [role=listitem] {
+  cursor: pointer;
+  white-space: inherit;
+  word-break: break-word;
+  line-height: 1.4;
+  text-align: left; }
 
 .form-autocomplete-suggestions {
   position: absolute;
@@ -14843,9 +14863,8 @@ fieldset.coursesearchbox label {
 
 .form-autocomplete-downarrow {
   color: #373a3c;
-  position: relative;
-  top: 0.2em;
-  left: -1.5em;
+  top: 0.2rem;
+  right: 0.5rem;
   cursor: pointer; }
   .form-autocomplete-downarrow .loading-icon {
     position: absolute;
@@ -14997,7 +15016,9 @@ textarea[data-auto-rows] {
         background-image: url([[pix:t/collapsed_rtl]]);
         */
     /*rtl:remove*/
-    background-image: url([[pix:t/collapsed]]); } }
+    background-image: url([[pix:t/collapsed]]); }
+  .mform .form-inline .fdefaultcustom label {
+    justify-content: initial; } }
 
 .pagelayout-login .card-title h2 img {
   max-width: 100%;
@@ -15398,10 +15419,6 @@ div#dock {
 .path-mod-assign [data-region="grade-panel"] .fitem.row {
   margin: 0; }
 
-.path-mod-assign [data-region="grade-panel"] .fitem > .col-md-3 > .pull-xs-right {
-  float: none !important;
-  /* stylelint-disable-line declaration-no-important */ }
-
 .path-mod-assign [data-region="grade-panel"] .mform .fitem.has-popout .felement {
   width: 100%; }
 
@@ -16248,7 +16265,6 @@ body {
     flex-shrink: 0; }
 
 .popover-region {
-  float: right;
   position: relative; }
   .popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after {
     display: none; }
@@ -16363,7 +16379,7 @@ body {
     display: none; }
 
 .navbar .popover-region {
-  float: right;
+  float: left;
   margin-right: 10px; }
   .navbar .popover-region.collapsed .popover-region-container {
     opacity: 0;
diff --git a/theme/boost/templates/columns1.mustache b/theme/boost/templates/columns1.mustache
index 49ed3ba1e9c70..9b35fc3f7289b 100644
--- a/theme/boost/templates/columns1.mustache
+++ b/theme/boost/templates/columns1.mustache
@@ -40,12 +40,12 @@
 
 <body {{{ bodyattributes }}}>
 
-<div id="page-wrapper">
+<div id="page-wrapper" class="d-print-block">
 
     {{{ output.standard_top_of_body_html }}}
 
-    <div id="page" class="container-fluid">
-        <div id="page-content" class="row pb-3">
+    <div id="page" class="container-fluid d-print-block">
+        <div id="page-content" class="row pb-3 d-print-block">
             <div id="region-main-box" class="col-12">
                 <section id="region-main" aria-label="{{#str}}content{{/str}}">
                     {{{ output.course_content_header }}}
@@ -64,5 +64,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index d0425d3996506..7fcbfe4f1be04 100644
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -52,16 +52,16 @@
 
 <body {{{ bodyattributes }}}>
 
-<div id="page-wrapper">
+<div id="page-wrapper" class="d-print-block">
 
     {{{ output.standard_top_of_body_html }}}
 
     {{> theme_boost/navbar }}
 
-    <div id="page" class="container-fluid">
+    <div id="page" class="container-fluid d-print-block">
         {{{ output.full_header }}}
 
-        <div id="page-content" class="row pb-3">
+        <div id="page-content" class="row pb-3 d-print-block">
             <div id="region-main-box" class="col-12">
                 {{#hasregionmainsettingsmenu}}
                 <div id="region-main-settings-menu" class="d-print-none {{#hasblocks}}has-blocks{{/hasblocks}}">
@@ -95,8 +95,13 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
+M.util.js_pending('theme_boost/drawer');
 require(['theme_boost/drawer'], function(mod) {
     mod.init();
+  M.util.js_complete('theme_boost/drawer');
 });
 {{/js}}
diff --git a/theme/boost/templates/embedded.mustache b/theme/boost/templates/embedded.mustache
index e38dab69ffc74..dfceb0a693461 100644
--- a/theme/boost/templates/embedded.mustache
+++ b/theme/boost/templates/embedded.mustache
@@ -45,7 +45,7 @@
 
 {{{ output.standard_top_of_body_html }}}
 <div id="page">
-    <div id="page-content">
+    <div id="page-content" class="d-block">
         {{{ output.main_content }}}
     </div>
 </div>
@@ -53,5 +53,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
diff --git a/theme/boost/templates/login.mustache b/theme/boost/templates/login.mustache
index f44017ddb6c9b..554a5c0b234c1 100644
--- a/theme/boost/templates/login.mustache
+++ b/theme/boost/templates/login.mustache
@@ -67,5 +67,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
diff --git a/theme/boost/templates/maintenance.mustache b/theme/boost/templates/maintenance.mustache
index 0330892b03147..481314b2d2bcb 100644
--- a/theme/boost/templates/maintenance.mustache
+++ b/theme/boost/templates/maintenance.mustache
@@ -73,5 +73,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
diff --git a/theme/boost/templates/navbar-secure.mustache b/theme/boost/templates/navbar-secure.mustache
index 45f88be810331..7b0ae6db5b18e 100644
--- a/theme/boost/templates/navbar-secure.mustache
+++ b/theme/boost/templates/navbar-secure.mustache
@@ -28,7 +28,7 @@
 
         <ul class="nav navbar-nav ml-auto">
             <li class="nav-item">
-            {{{ output.secure_login_info }}}
+                {{{ output.secure_login_info }}}
             </li>
         </ul>
 </nav>
diff --git a/theme/boost/templates/navbar.mustache b/theme/boost/templates/navbar.mustache
index 491d350dd3277..e3067d9bc81d5 100644
--- a/theme/boost/templates/navbar.mustache
+++ b/theme/boost/templates/navbar.mustache
@@ -43,12 +43,12 @@
             {{{ output.page_heading_menu }}}
         </ul>
         <ul class="nav navbar-nav ml-auto">
-            <div class="d-none d-lg-block">
-            {{{ output.search_box }}}
-        </div>
+            <li class="d-none d-lg-block">
+                {{{ output.search_box }}}
+            </li>
             <!-- navbar_plugin_output -->
             <li class="nav-item">
-            {{{ output.navbar_plugin_output }}}
+                {{{ output.navbar_plugin_output }}}
             </li>
             <!-- user_menu -->
             <li class="nav-item d-flex align-items-center">
diff --git a/theme/boost/templates/secure.mustache b/theme/boost/templates/secure.mustache
index a6ceaba4c8dc2..a83cb82d1a1f2 100644
--- a/theme/boost/templates/secure.mustache
+++ b/theme/boost/templates/secure.mustache
@@ -87,5 +87,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
diff --git a/theme/classic/lang/en/theme_classic.php b/theme/classic/lang/en/theme_classic.php
index 8938fdf738570..e6f2da470cb85 100644
--- a/theme/classic/lang/en/theme_classic.php
+++ b/theme/classic/lang/en/theme_classic.php
@@ -32,7 +32,7 @@
 $string['navbardarkdesc'] = 'Swaps text and background colours for the navbar at the top of the page between dark and light.';
 $string['pluginname'] = 'Classic';
 $string['presetfiles'] = 'Additional theme preset files';
-$string['presetfiles_desc'] = 'Preset files can be used to dramatically alter the appearance of the theme. See <a href=https://docs.moodle.org/dev/Boost_Presets>Boost presets</a> for information on creating and sharing your own preset files, and see the <a href=http://moodle.net/boost>Presets repository</a> for presets that others have shared.';
+$string['presetfiles_desc'] = 'Preset files can be used to dramatically alter the appearance of the theme. See <a href="https://docs.moodle.org/dev/Boost_Presets">Boost presets</a> for information on creating and sharing your own preset files, and see the <a href="https://archive.moodle.net/boost">Presets repository</a> for presets that others have shared.';
 $string['preset'] = 'Theme preset';
 $string['preset_desc'] = 'Pick a preset to broadly change the look of the theme.';
 $string['region-side-post'] = 'Right';
diff --git a/theme/classic/scss/classic/navbar-dark.scss b/theme/classic/scss/classic/navbar-dark.scss
index 4f02406513c72..2cfb9798a0a9f 100644
--- a/theme/classic/scss/classic/navbar-dark.scss
+++ b/theme/classic/scss/classic/navbar-dark.scss
@@ -1,6 +1,8 @@
+$nabvar-bg-color: $dark !default;
+
 .navbar-bootswatch {
     @extend .navbar-dark;
-    background-color: $primary;
+    background-color: $nabvar-bg-color;
 
     .usermenu {
         color: $navbar-dark-color;
@@ -10,7 +12,7 @@
     }
     a.dropdown-toggle,
     a .usertext {
-        color: $navbar-dark-color;
+        color: $navbar-dark-active-color;
         @include hover-focus {
             color: $navbar-dark-hover-color;
         }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index c28589ff5c3e4..d78b2e0b9f245 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -10,9 +10,7 @@
  *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
-.fa, .block_settings .block_tree [aria-expanded="true"]:before,
-.block_navigation .block_tree [aria-expanded="true"]:before, .block_settings .block_tree [aria-expanded="false"]:before,
-.block_navigation .block_tree [aria-expanded="false"]:before {
+.fa {
   display: inline-block;
   font: normal normal normal 14px/1 FontAwesome;
   font-size: inherit;
@@ -69,14 +67,10 @@
 .fa-pull-right {
   float: right; }
 
-.fa.fa-pull-left, .block_settings .block_tree .fa-pull-left[aria-expanded="true"]:before,
-.block_navigation .block_tree .fa-pull-left[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-left[aria-expanded="false"]:before,
-.block_navigation .block_tree .fa-pull-left[aria-expanded="false"]:before {
+.fa.fa-pull-left {
   margin-right: .3em; }
 
-.fa.fa-pull-right, .block_settings .block_tree .fa-pull-right[aria-expanded="true"]:before,
-.block_navigation .block_tree .fa-pull-right[aria-expanded="true"]:before, .block_settings .block_tree .fa-pull-right[aria-expanded="false"]:before,
-.block_navigation .block_tree .fa-pull-right[aria-expanded="false"]:before {
+.fa.fa-pull-right {
   margin-left: .3em; }
 
 /* Deprecated as of 4.4.0 */
@@ -86,14 +80,10 @@
 .pull-left {
   float: left; }
 
-.fa.pull-left, .block_settings .block_tree .pull-left[aria-expanded="true"]:before,
-.block_navigation .block_tree .pull-left[aria-expanded="true"]:before, .block_settings .block_tree .pull-left[aria-expanded="false"]:before,
-.block_navigation .block_tree .pull-left[aria-expanded="false"]:before {
+.fa.pull-left {
   margin-right: .3em; }
 
-.fa.pull-right, .block_settings .block_tree .pull-right[aria-expanded="true"]:before,
-.block_navigation .block_tree .pull-right[aria-expanded="true"]:before, .block_settings .block_tree .pull-right[aria-expanded="false"]:before,
-.block_navigation .block_tree .pull-right[aria-expanded="false"]:before {
+.fa.pull-right {
   margin-left: .3em; }
 
 .fa-spin {
@@ -11638,14 +11628,26 @@ div.editor_atto_toolbar button .icon {
 .block_navigation .block_tree [aria-expanded="true"]:before {
   content: "";
   margin-right: 0;
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
   font-size: 16px;
   width: 16px; }
 
 .block_settings .block_tree [aria-expanded="false"]:before,
 .block_navigation .block_tree [aria-expanded="false"]:before {
   content: "";
-  font-size: 16px;
   margin-right: 0;
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-size: 16px;
   width: 16px; }
 
 .dir-rtl .block_settings .block_tree [aria-expanded="false"]:before,
@@ -12328,21 +12330,6 @@ span.editinstructions {
   margin-top: .2em;
   padding: .3em; }
 
-.dndupload-progress-outer {
-  background-color: #e9ecef;
-  border-radius: 0.25rem;
-  display: block;
-  width: 100%;
-  height: 1rem;
-  margin-bottom: 1rem; }
-
-.dndupload-progress-inner {
-  background-color: #fff;
-  border-top-left-radius: 0.25rem;
-  border-bottom-left-radius: 0.25rem;
-  display: inline-block;
-  height: 1rem; }
-
 .dndupload-hidden {
   display: none; }
 
@@ -12409,7 +12396,8 @@ span.editinstructions {
   padding: 0;
   margin: 0; }
 
-.coursebox .moreinfo {
+.coursebox .moreinfo,
+.coursebox .enrolmenticons {
   padding: 3px 0;
   float: right; }
 
@@ -12811,6 +12799,13 @@ span.editinstructions {
   height: 32px;
   font-size: 32px; }
 
+.activity-navigation .row {
+  align-items: center; }
+
+.activity-navigation #prev-activity-link,
+.activity-navigation #next-activity-link {
+  white-space: pre-wrap; }
+
 /* Anchor link offset fix. This makes hash links scroll 60px down to account for the fixed header. */
 :target::before {
   content: " ";
@@ -12829,9 +12824,6 @@ span.editinstructions {
 #nav-drawer.closed {
   left: -305px; }
 
-#page {
-  margin-top: 50px; }
-
 /* Use a variable for the drawer background colors. */
 [data-region="drawer"] {
   position: fixed;
@@ -12849,7 +12841,15 @@ span.editinstructions {
 
 #nav-drawer {
   right: auto;
-  left: 0; }
+  left: 0;
+  /* Override the z-indexes defined in bootstrap/_list-group.scss that
+       lead to side effects on the user tours positioning. */ }
+  #nav-drawer .list-group-item-action.active,
+  #nav-drawer .list-group-item.active {
+    z-index: inherit; }
+  #nav-drawer .list-group-item-action.active + .list-group-item,
+  #nav-drawer .list-group-item.active + .list-group-item {
+    border-top: none; }
 
 #page {
   margin-top: 50px; }
@@ -14364,7 +14364,10 @@ body.path-question-type {
 .que .questioncorrectnessicon {
   vertical-align: text-bottom; }
 
-.que input.questionflagimage {
+body.jsenabled .questionflag input[type=checkbox] {
+  display: none; }
+
+.que .questionflagimage {
   padding-right: 3px;
   height: 16px;
   width: 16px; }
@@ -14385,7 +14388,13 @@ body.path-question-type {
   padding-left: 0; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-left: 0; }
+  margin-left: 0;
+  width: 16px;
+  height: 16px;
+  padding-right: 4px; }
+
+#page-mod-quiz-edit .activity img.activityicon {
+  vertical-align: text-top; }
 
 #page-mod-quiz-edit .box.generalbox.questionbank {
   padding: 0.5em; }
@@ -14509,6 +14518,9 @@ body.path-question-type {
 .questionbankwindow .module {
   width: auto; }
 
+.questionbankwindow .form-autocomplete-selection {
+  margin-left: 0; }
+
 #page-mod-quiz-edit div.editq div.question div.content {
   background-color: #fff;
   border: 1px solid #ddd;
@@ -14516,7 +14528,8 @@ body.path-question-type {
   overflow: hidden; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-top: 0; }
+  margin-top: 0;
+  padding-right: 4px; }
 
 .path-mod-quiz .statedetails {
   display: block;
@@ -15067,8 +15080,12 @@ fieldset.coursesearchbox label {
   margin: 0.25rem;
   min-height: 2.375rem; }
 
-.form-autocomplete-multiple [role=listitem] {
-  cursor: pointer; }
+.form-autocomplete-selection [role=listitem] {
+  cursor: pointer;
+  white-space: inherit;
+  word-break: break-word;
+  line-height: 1.4;
+  text-align: left; }
 
 .form-autocomplete-suggestions {
   position: absolute;
@@ -15100,9 +15117,8 @@ fieldset.coursesearchbox label {
 
 .form-autocomplete-downarrow {
   color: #373a3c;
-  position: relative;
-  top: 0.2em;
-  left: -1.5em;
+  top: 0.2rem;
+  right: 0.5rem;
   cursor: pointer; }
   .form-autocomplete-downarrow .loading-icon {
     position: absolute;
@@ -15255,7 +15271,9 @@ textarea[data-auto-rows] {
         background-image: url([[pix:t/collapsed_rtl]]);
         */
     /*rtl:remove*/
-    background-image: url([[pix:t/collapsed]]); } }
+    background-image: url([[pix:t/collapsed]]); }
+  .mform .form-inline .fdefaultcustom label {
+    justify-content: initial; } }
 
 .pagelayout-login .card-title h2 img {
   max-width: 100%;
@@ -15656,10 +15674,6 @@ div#dock {
 .path-mod-assign [data-region="grade-panel"] .fitem.row {
   margin: 0; }
 
-.path-mod-assign [data-region="grade-panel"] .fitem > .col-md-3 > .pull-xs-right {
-  float: none !important;
-  /* stylelint-disable-line declaration-no-important */ }
-
 .path-mod-assign [data-region="grade-panel"] .mform .fitem.has-popout .felement {
   width: 100%; }
 
@@ -16513,7 +16527,6 @@ body {
     flex-shrink: 0; }
 
 .popover-region {
-  float: right;
   position: relative; }
   .popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after {
     display: none; }
@@ -16628,7 +16641,7 @@ body {
     display: none; }
 
 .navbar .popover-region {
-  float: right;
+  float: left;
   margin-right: 10px; }
   .navbar .popover-region.collapsed .popover-region-container {
     opacity: 0;
diff --git a/theme/classic/templates/columns.mustache b/theme/classic/templates/columns.mustache
index 3d2f6b072a61d..06719025388b1 100644
--- a/theme/classic/templates/columns.mustache
+++ b/theme/classic/templates/columns.mustache
@@ -50,16 +50,16 @@
 
 <body {{{ bodyattributes }}}>
 
-<div id="page-wrapper">
+<div id="page-wrapper" class="d-print-block">
 
     {{{ output.standard_top_of_body_html }}}
 
     {{>theme_classic/navbar}}
 
-    <div id="page" class="container-fluid">
+    <div id="page" class="container-fluid d-print-block">
         {{{ output.full_header }}}
 
-        <div id="page-content" class="row {{#haspreblocks}} blocks-pre {{/haspreblocks}} {{#haspostblocks}} blocks-post {{/haspostblocks}}">
+        <div id="page-content" class="row {{#haspreblocks}} blocks-pre {{/haspreblocks}} {{#haspostblocks}} blocks-post {{/haspostblocks}} d-print-block">
             <div id="region-main-box" class="region-main">
                 {{#hasregionmainsettingsmenu}}
                 <div id="region-main-settings-menu" class="d-print-none {{#hasblocks}}has-blocks{{/hasblocks}}">
@@ -96,6 +96,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
-
diff --git a/theme/classic/templates/contentonly.mustache b/theme/classic/templates/contentonly.mustache
index 1d1ce7ac6b54f..2ba1a959c185c 100644
--- a/theme/classic/templates/contentonly.mustache
+++ b/theme/classic/templates/contentonly.mustache
@@ -68,5 +68,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
diff --git a/theme/classic/templates/navbar-secure.mustache b/theme/classic/templates/navbar-secure.mustache
index 55dd58a3a70bd..3dc50c4098f3b 100644
--- a/theme/classic/templates/navbar-secure.mustache
+++ b/theme/classic/templates/navbar-secure.mustache
@@ -39,7 +39,7 @@
 
     <ul class="nav navbar-nav ml-auto">
         <li class="nav-item">
-        {{{ output.secure_login_info }}}
+            {{{ output.secure_login_info }}}
         </li>
     </ul>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/theme/classic/templates/navbar.mustache b/theme/classic/templates/navbar.mustache
index 41e011ed550e1..c5cd4ab07f776 100644
--- a/theme/classic/templates/navbar.mustache
+++ b/theme/classic/templates/navbar.mustache
@@ -58,12 +58,12 @@
             {{{ output.page_heading_menu }}}
         </ul>
         <ul class="nav navbar-nav ml-auto">
-            <div class="d-none d-lg-block">
-            {{{ output.search_box }}}
-        </div>
+            <li class="d-none d-lg-block">
+                {{{ output.search_box }}}
+            </li>
             <!-- navbar_plugin_output -->
             <li class="nav-item">
-            {{{ output.navbar_plugin_output }}}
+                {{{ output.navbar_plugin_output }}}
             </li>
             <!-- user_menu -->
             <li class="nav-item d-flex align-items-center">
diff --git a/theme/classic/templates/secure.mustache b/theme/classic/templates/secure.mustache
index 8c5dc54333aa0..bbcc07bce7e00 100644
--- a/theme/classic/templates/secure.mustache
+++ b/theme/classic/templates/secure.mustache
@@ -70,7 +70,7 @@
         </div>
 
         <div id="page-content" class="row {{#haspreblocks}} blocks-pre {{/haspreblocks}} {{#haspostblocks}} blocks-post {{/haspostblocks}}">
-            <div id="region-main-box" class="region-main col-12">
+            <div id="region-main-box" class="region-main">
                 <section id="region-main" aria-label="{{#str}}content{{/str}}">
                     <div class="card">
                         <div class="card-body">
@@ -80,17 +80,17 @@
                         </div>
                     </div>
                 </section>
-                <div class="columnleft {{#haspreblocks}} has-blocks {{/haspreblocks}}">
-                    <section data-region="blocks-column" class="hidden-print" aria-label="{{#str}}blocks{{/str}}">
-                        {{{ sidepreblocks }}}
-                    </section>
-                </div>
+            </div>
+            <div class="columnleft {{#haspreblocks}} has-blocks {{/haspreblocks}}">
+                <section data-region="blocks-column" class="hidden-print" aria-label="{{#str}}blocks{{/str}}">
+                    {{{ sidepreblocks }}}
+                </section>
+            </div>
 
-                <div class="columnright {{#haspostblocks}} has-blocks {{/haspostblocks}}">
-                    <section data-region="blocks-column" class="hidden-print" aria-label="{{#str}}blocks{{/str}}">
-                        {{{ sidepostblocks }}}
-                    </section>
-                </div>
+            <div class="columnright {{#haspostblocks}} has-blocks {{/haspostblocks}}">
+                <section data-region="blocks-column" class="hidden-print" aria-label="{{#str}}blocks{{/str}}">
+                    {{{ sidepostblocks }}}
+                </section>
             </div>
         </div>
     </div>
@@ -106,5 +106,8 @@
 </body>
 </html>
 {{#js}}
-require(['theme_boost/loader']);
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader'], function() {
+  M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
diff --git a/theme/classic/tests/behat/behat_theme_classic_behat_admin.php b/theme/classic/tests/behat/behat_theme_classic_behat_admin.php
index 94b81f2bd003f..e424776ed4c5f 100644
--- a/theme/classic/tests/behat/behat_theme_classic_behat_admin.php
+++ b/theme/classic/tests/behat/behat_theme_classic_behat_admin.php
@@ -56,17 +56,12 @@ public function i_set_the_following_administration_settings_values(TableNode $ta
 
             // We expect admin block to be visible, otherwise go to homepage.
             if (!$this->getSession()->getPage()->find('css', '.block_settings')) {
-                $this->getSession()->visit($this->locate_path('/'));
-                $this->wait(self::TIMEOUT * 1000, self::PAGE_READY_JS);
+                $this->execute('behat_forms::i_am_on_homepage');
             }
 
             // Search by label.
-            $searchbox = $this->find_field(get_string('searchinsettings', 'admin'));
-            $searchbox->setValue($label);
-            $submitsearch = $this->find('css', 'form.adminsearchform input[type=submit]');
-            $submitsearch->press();
-
-            $this->wait(self::TIMEOUT * 1000, self::PAGE_READY_JS);
+            $this->execute('behat_forms::i_set_the_field_to', [get_string('searchinsettings', 'admin'), $label]);
+            $this->execute("behat_general::i_click_on_in_the", [get_string('search', 'admin'), 'button', '.block_settings', 'css_element']);
 
             // Admin settings does not use the same DOM structure than other moodle forms
             // but we also need to use lib/behat/form_field/* to deal with the different moodle form elements.
@@ -82,11 +77,6 @@ public function i_set_the_following_administration_settings_values(TableNode $ta
                         "[@id=//label[contains(normalize-space(.), $label)]/@for or " .
                         "@id=//span[contains(normalize-space(.), $label)]/preceding-sibling::label[1]/@for]";
                 $fieldnode = $this->find('xpath', $fieldxpath, $exception);
-
-                $formfieldtypenode = $this->find('xpath', $fieldxpath .
-                        "/ancestor::div[contains(concat(' ', @class, ' '), ' form-setting ')]" .
-                        "/child::div[contains(concat(' ', @class, ' '),  ' form-')]/child::*/parent::div");
-
             } catch (ElementNotFoundException $e) {
 
                 // Multi element settings, interacting only the first one.
@@ -96,25 +86,11 @@ public function i_set_the_following_administration_settings_values(TableNode $ta
                         "/descendant::*[self::input | self::textarea | self::select]" .
                         "[not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]";
                 $fieldnode = $this->find('xpath', $fieldxpath);
-
-                // It is the same one that contains the type.
-                $formfieldtypenode = $fieldnode;
-            }
-
-            // Getting the class which contains the field type.
-            $classes = explode(' ', $formfieldtypenode->getAttribute('class'));
-            $type = false;
-            foreach ($classes as $class) {
-                if (substr($class, 0, 5) == 'form-') {
-                    $type = substr($class, 5);
-                }
             }
 
-            // Instantiating the appropiate field type.
-            $field = behat_field_manager::get_field_instance($type, $fieldnode, $this->getSession());
-            $field->set_value($value);
+            $this->execute('behat_forms::i_set_the_field_with_xpath_to', [$fieldxpath, $value]);
 
-            $this->find_button(get_string('savechanges'))->press();
+            $this->execute("behat_general::i_click_on", [get_string('savechanges'), 'button']);
         }
     }
 }
diff --git a/tokenpluginfile.php b/tokenpluginfile.php
index 156d4126f8039..22449ad414d5f 100644
--- a/tokenpluginfile.php
+++ b/tokenpluginfile.php
@@ -37,6 +37,7 @@
     $relativepath = ltrim($relativepath, '/');
     $pathparts = explode('/', $relativepath, 2);
     $token = $pathparts[0];
+    $token = clean_param($token, PARAM_ALPHANUM);
     $relativepath = "/{$pathparts[1]}";
 }
 
diff --git a/user/amd/build/status_field.min.js b/user/amd/build/status_field.min.js
index a26e99fbe9d3b..8d8d633fb1823 100644
--- a/user/amd/build/status_field.min.js
+++ b/user/amd/build/status_field.min.js
@@ -1 +1 @@
-define(["core/templates","jquery","core/str","core/config","core/notification","core/modal_factory","core/modal_events","core/fragment","core/ajax"],function(a,b,c,d,e,f,g,h,i){var j={EDIT_ENROLMENT:'[data-action="editenrolment"]',SHOW_DETAILS:'[data-action="showdetails"]',UNENROL:'[data-action="unenrol"]'},k=function(a){this.contextid=a.contextid,this.courseid=a.courseid,this.bindEditEnrol(),this.bindUnenrol(),this.bindStatusDetails()};return k.prototype.courseid=0,k.prototype.bindEditEnrol=function(){var a=this;b(j.EDIT_ENROLMENT).click(function(d){d.preventDefault();var h=b(this),i=h.parent(),j=i.data("fullname"),k=h.attr("rel");b.when(c.get_string("edituserenrolment","enrol",j)).then(function(a){return f.create({large:!0,title:a,type:f.types.SAVE_CANCEL})}).done(function(b){b.getRoot().on(g.save,function(c){c.preventDefault(),a.submitEditFormAjax(b)}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.setBody(a.getBody(k)),b.show()}).fail(e.exception)})},k.prototype.bindUnenrol=function(){var a=this;b(j.UNENROL).click(function(d){d.preventDefault();var h=b(this),i=h.parent(),j=[{key:"unenrol",component:"enrol"},{key:"unenrolconfirm",component:"enrol",param:{user:i.data("fullname"),course:i.data("coursename"),enrolinstancename:i.data("enrolinstancename")}}],k=f.create({type:f.types.SAVE_CANCEL});b.when(c.get_strings(j),k).done(function(c,e){var f=c[0],i=c[1];e.setTitle(f),e.setBody(i),e.setSaveButtonText(f),e.getRoot().on(g.save,function(){var c={ueid:b(h).attr("rel")};d.preventDefault(),a.submitUnenrolFormAjax(e,c)}),e.getRoot().on(g.hidden,function(){e.destroy()}),e.show()}).fail(e.exception)})},k.prototype.bindStatusDetails=function(){b(j.SHOW_DETAILS).click(function(d){d.preventDefault();var h=b(this),i=h.parent(),k={fullname:i.data("fullname"),coursename:i.data("coursename"),enrolinstancename:i.data("enrolinstancename"),status:i.data("status"),statusclass:i.find("span").attr("class"),timestart:i.data("timestart"),timeend:i.data("timeend"),timeenrolled:i.data("timeenrolled")},l=[{key:"enroldetails",component:"enrol"}],m=h.next(j.EDIT_ENROLMENT);m.length&&(k.editenrollink=b("<div>").append(m.clone()).html());var n=c.get_strings(l),o=f.create({large:!0,type:f.types.CANCEL});b.when(n,o).done(function(c,d){var e=a.render("core_user/status_details",k);d.setTitle(c[0]),d.setBody(e),m.length&&d.getRoot().on("click",j.EDIT_ENROLMENT,function(a){a.preventDefault(),d.hide(),b(m).trigger("click")}),d.show(),d.getRoot().on(g.hidden,function(){d.destroy()})}).fail(e.exception)})},k.prototype.submitEditFormAjax=function(a){var c=this,d=a.getRoot().find("form"),f=b(d).find('[name="ue"]').val(),g=b(d).find('[name="status"]').val(),h={courseid:this.courseid,ueid:f,status:g},j=b(d).find('[name="timestart[enabled]"]');if(j.is(":checked")){var k=b(d).find('[name="timestart[year]"]').val(),l=b(d).find('[name="timestart[month]"]').val()-1,m=b(d).find('[name="timestart[day]"]').val(),n=b(d).find('[name="timestart[hour]"]').val(),o=b(d).find('[name="timestart[minute]"]').val(),p=new Date(k,l,m,n,o);h.timestart=p.getTime()/1e3}var q=b(d).find('[name="timeend[enabled]"]');if(q.is(":checked")){var r=b(d).find('[name="timeend[year]"]').val(),s=b(d).find('[name="timeend[month]"]').val()-1,t=b(d).find('[name="timeend[day]"]').val(),u=b(d).find('[name="timeend[hour]"]').val(),v=b(d).find('[name="timeend[minute]"]').val(),w=new Date(r,s,t,u,v);h.timeend=w.getTime()/1e3}var x={methodname:"core_enrol_edit_user_enrolment",args:h};i.call([x])[0].done(function(b){if(b.result)a.hide(),"undefined"!=typeof window.M.core_formchangechecker&&window.M.core_formchangechecker.reset_form_dirty_state(),window.location.reload();else{var e=JSON.stringify(d.serialize());a.setBody(c.getBody(f,e))}}).fail(e.exception)},k.prototype.submitUnenrolFormAjax=function(a,b){var c={methodname:"core_enrol_unenrol_user_enrolment",args:b};i.call([c])[0].done(function(b){b.result?(a.hide(),"undefined"!=typeof window.M.core_formchangechecker&&window.M.core_formchangechecker.reset_form_dirty_state(),window.location.reload()):e.alert(b.errors[0].key,b.errors[0].message)}).fail(e.exception)},k.prototype.getBody=function(a,b){var c={ueid:a};return"undefined"!=typeof b&&(c.formdata=b),h.loadFragment("enrol","user_enrolment_form",this.contextid,c).fail(e.exception)},{init:function(a){new k(a)}}});
\ No newline at end of file
+define(["core/templates","jquery","core/str","core/config","core/notification","core/modal_factory","core/modal_events","core/fragment","core/ajax"],function(a,b,c,d,e,f,g,h,i){var j={EDIT_ENROLMENT:'[data-action="editenrolment"]',SHOW_DETAILS:'[data-action="showdetails"]',UNENROL:'[data-action="unenrol"]'},k=function(a){this.contextid=a.contextid,this.courseid=a.courseid,this.bindEditEnrol(),this.bindUnenrol(),this.bindStatusDetails()};return k.prototype.courseid=0,k.prototype.bindEditEnrol=function(){var a=this;b(j.EDIT_ENROLMENT).click(function(d){d.preventDefault();var h=b(this),i=h.parent(),j=i.data("fullname"),k=h.attr("rel");b.when(c.get_string("edituserenrolment","enrol",j)).then(function(a){return f.create({large:!0,title:a,type:f.types.SAVE_CANCEL})}).done(function(b){b.getRoot().on(g.save,function(c){c.preventDefault(),a.submitEditFormAjax(b)}),b.getRoot().on(g.hidden,function(){b.destroy()}),b.setBody(a.getBody(k)),b.show()}).fail(e.exception)})},k.prototype.bindUnenrol=function(){var a=this;b(j.UNENROL).click(function(d){d.preventDefault();var h=b(this),i=h.parent(),j=[{key:"unenrol",component:"enrol"},{key:"unenrolconfirm",component:"enrol",param:{user:i.data("fullname"),course:i.data("coursename"),enrolinstancename:i.data("enrolinstancename")}}],k=f.create({type:f.types.SAVE_CANCEL});b.when(c.get_strings(j),k).done(function(c,e){var f=c[0],i=c[1];e.setTitle(f),e.setBody(i),e.setSaveButtonText(f),e.getRoot().on(g.save,function(){var c={ueid:b(h).attr("rel")};d.preventDefault(),a.submitUnenrolFormAjax(e,c)}),e.getRoot().on(g.hidden,function(){e.destroy()}),e.show()}).fail(e.exception)})},k.prototype.bindStatusDetails=function(){b(j.SHOW_DETAILS).click(function(d){d.preventDefault();var h=b(this),i=h.parent(),k={fullname:i.data("fullname"),coursename:i.data("coursename"),enrolinstancename:i.data("enrolinstancename"),status:i.data("status"),statusclass:i.find("span").attr("class"),timestart:i.data("timestart"),timeend:i.data("timeend"),timeenrolled:i.data("timeenrolled")},l=[{key:"enroldetails",component:"enrol"}],m=h.next(j.EDIT_ENROLMENT);m.length&&(k.editenrollink=b("<div>").append(m.clone()).html());var n=c.get_strings(l),o=f.create({large:!0,type:f.types.CANCEL});b.when(n,o).done(function(c,d){var e=a.render("core_user/status_details",k);d.setTitle(c[0]),d.setBody(e),m.length&&d.getRoot().on("click",j.EDIT_ENROLMENT,function(a){a.preventDefault(),d.hide(),b(m).trigger("click")}),d.show(),d.getRoot().on(g.hidden,function(){d.destroy()})}).fail(e.exception)})},k.prototype.submitEditFormAjax=function(a){var c=this,d=a.getRoot().find("form"),f=b(d).find('[name="ue"]').val(),g={methodname:"core_enrol_submit_user_enrolment_form",args:{formdata:d.serialize()}};i.call([g])[0].done(function(b){if(b.result)a.hide(),"undefined"!=typeof window.M.core_formchangechecker&&window.M.core_formchangechecker.reset_form_dirty_state(),window.location.reload();else{var e=JSON.stringify(d.serialize());a.setBody(c.getBody(f,e))}}).fail(e.exception)},k.prototype.submitUnenrolFormAjax=function(a,b){var c={methodname:"core_enrol_unenrol_user_enrolment",args:b};i.call([c])[0].done(function(b){b.result?(a.hide(),"undefined"!=typeof window.M.core_formchangechecker&&window.M.core_formchangechecker.reset_form_dirty_state(),window.location.reload()):e.alert(b.errors[0].key,b.errors[0].message)}).fail(e.exception)},k.prototype.getBody=function(a,b){var c={ueid:a};return"undefined"!=typeof b&&(c.formdata=b),h.loadFragment("enrol","user_enrolment_form",this.contextid,c).fail(e.exception)},{init:function(a){new k(a)}}});
\ No newline at end of file
diff --git a/user/amd/src/status_field.js b/user/amd/src/status_field.js
index 865f33c977d90..452ec0dab6759 100644
--- a/user/amd/src/status_field.js
+++ b/user/amd/src/status_field.js
@@ -261,42 +261,12 @@ define(['core/templates',
 
             // User enrolment ID.
             var ueid = $(form).find('[name="ue"]').val();
-            // Status.
-            var status = $(form).find('[name="status"]').val();
-
-            var params = {
-                'courseid': this.courseid,
-                'ueid': ueid,
-                'status': status
-            };
-
-            // Enrol time start.
-            var timeStartEnabled = $(form).find('[name="timestart[enabled]"]');
-            if (timeStartEnabled.is(':checked')) {
-                var timeStartYear = $(form).find('[name="timestart[year]"]').val();
-                var timeStartMonth = $(form).find('[name="timestart[month]"]').val() - 1;
-                var timeStartDay = $(form).find('[name="timestart[day]"]').val();
-                var timeStartHour = $(form).find('[name="timestart[hour]"]').val();
-                var timeStartMinute = $(form).find('[name="timestart[minute]"]').val();
-                var timeStart = new Date(timeStartYear, timeStartMonth, timeStartDay, timeStartHour, timeStartMinute);
-                params.timestart = timeStart.getTime() / 1000;
-            }
-
-            // Enrol time end.
-            var timeEndEnabled = $(form).find('[name="timeend[enabled]"]');
-            if (timeEndEnabled.is(':checked')) {
-                var timeEndYear = $(form).find('[name="timeend[year]"]').val();
-                var timeEndMonth = $(form).find('[name="timeend[month]"]').val() - 1;
-                var timeEndDay = $(form).find('[name="timeend[day]"]').val();
-                var timeEndHour = $(form).find('[name="timeend[hour]"]').val();
-                var timeEndMinute = $(form).find('[name="timeend[minute]"]').val();
-                var timeEnd = new Date(timeEndYear, timeEndMonth, timeEndDay, timeEndHour, timeEndMinute);
-                params.timeend = timeEnd.getTime() / 1000;
-            }
 
             var request = {
-                methodname: 'core_enrol_edit_user_enrolment',
-                args: params
+                methodname: 'core_enrol_submit_user_enrolment_form',
+                args: {
+                    formdata: form.serialize()
+                }
             };
 
             Ajax.call([request])[0].done(function(data) {
diff --git a/user/classes/analytics/target/upcoming_activities_due.php b/user/classes/analytics/target/upcoming_activities_due.php
index e58b5c87bd143..7a796671647cb 100644
--- a/user/classes/analytics/target/upcoming_activities_due.php
+++ b/user/classes/analytics/target/upcoming_activities_due.php
@@ -150,6 +150,15 @@ protected function calculate_sample($sampleid, \core_analytics\analysable $analy
         return 0;
     }
 
+    /**
+     * No need to link to the insights report in this case.
+     *
+     * @return bool
+     */
+    public function link_insights_report(): bool {
+        return false;
+    }
+
     /**
      * Adds a view upcoming events action.
      *
@@ -170,9 +179,9 @@ public function prediction_actions(\core_analytics\prediction $prediction, $incl
 
         // We force a lookahead of 30 days so we are sure that the upcoming activities due are shown.
         $url = new \moodle_url('/calendar/view.php', ['view' => 'upcoming', 'lookahead' => '30']);
-        $pix = new \pix_icon('i/calendar', get_string('upcomingevents', 'calendar'));
+        $pix = new \pix_icon('i/calendar', get_string('viewupcomingactivitiesdue', 'calendar'));
         $action = new \core_analytics\prediction_action('viewupcoming', $prediction,
-            $url, $pix, get_string('upcomingevents', 'calendar'));
+            $url, $pix, get_string('viewupcomingactivitiesdue', 'calendar'));
 
         return array_merge([$action], $parentactions);
     }
diff --git a/user/classes/privacy/provider.php b/user/classes/privacy/provider.php
index b31b2e63f779a..839026e044ad4 100644
--- a/user/classes/privacy/provider.php
+++ b/user/classes/privacy/provider.php
@@ -385,10 +385,10 @@ protected static function export_user(\stdClass $user, \context $context) {
             'calendartype' => $user->calendartype,
             'theme' => $user->theme,
             'timezone' => $user->timezone,
-            'firstaccess' => transform::datetime($user->firstaccess),
-            'lastaccess' => transform::datetime($user->lastaccess),
-            'lastlogin' => transform::datetime($user->lastlogin),
-            'currentlogin' => $user->currentlogin,
+            'firstaccess' => $user->firstaccess ? transform::datetime($user->firstaccess) : null,
+            'lastaccess' => $user->lastaccess ? transform::datetime($user->lastaccess) : null,
+            'lastlogin' => $user->lastlogin ? transform::datetime($user->lastlogin) : null,
+            'currentlogin' => $user->currentlogin ? transform::datetime($user->currentlogin) : null,
             'lastip' => $user->lastip,
             'secret' => $user->secret,
             'picture' => $user->picture,
diff --git a/user/filters/date.php b/user/filters/date.php
index 8587ab902b94e..81ef76e5f9dd5 100644
--- a/user/filters/date.php
+++ b/user/filters/date.php
@@ -66,11 +66,18 @@ public function user_filter_date($name, $label, $advanced, $field) {
     public function setupForm(&$mform) {
         $objs = array();
 
-        $objs[] = $mform->createElement('static', $this->_name.'_sck', null, get_string('isafter', 'filters'));
+        $objs[] = $mform->createElement('static', $this->_name.'_s1', null,
+            html_writer::start_tag('div', array('class' => 'w-100 d-flex align-items-center')));
+        $objs[] = $mform->createElement('static', $this->_name.'_s2', null,
+            html_writer::tag('div', get_string('isafter', 'filters'), array('class' => 'mr-2')));
         $objs[] = $mform->createElement('date_selector', $this->_name.'_sdt', null, array('optional' => true));
-        $objs[] = $mform->createElement('static', $this->_name.'_break', null, '<br/>');
-        $objs[] = $mform->createElement('static', $this->_name.'_edk', null, get_string('isbefore', 'filters'));
+        $objs[] = $mform->createElement('static', $this->_name.'_s3', null, html_writer::end_tag('div'));
+        $objs[] = $mform->createElement('static', $this->_name.'_s4', null,
+            html_writer::start_tag('div', array('class' => 'w-100 d-flex align-items-center')));
+        $objs[] = $mform->createElement('static', $this->_name.'_s5', null,
+            html_writer::tag('div', get_string('isbefore', 'filters'), array('class' => 'mr-2')));
         $objs[] = $mform->createElement('date_selector', $this->_name.'_edt', null, array('optional' => true));
+        $objs[] = $mform->createElement('static', $this->_name.'_s6', null, html_writer::end_tag('div'));
 
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
 
diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
index 85ef374a17210..65723be4df3da 100644
--- a/user/filters/profilefield.php
+++ b/user/filters/profilefield.php
@@ -74,14 +74,13 @@ public function get_operators() {
      */
     public function get_profile_fields() {
         global $DB;
-        if (!$fields = $DB->get_records('user_info_field', null, 'shortname', 'id,shortname')) {
+        $order = $DB->sql_order_by_text('name');
+        if (!$fields = $DB->get_records_menu('user_info_field', null, $order, 'id, name')) {
             return null;
         }
         $res = array(0 => get_string('anyfield', 'filters'));
-        foreach ($fields as $k => $v) {
-            $res[$k] = $v->shortname;
-        }
-        return $res;
+
+        return $res + $fields;
     }
 
     /**
diff --git a/user/index.php b/user/index.php
index 3b6ac3494583b..b6f171d19ad14 100644
--- a/user/index.php
+++ b/user/index.php
@@ -292,7 +292,9 @@
         'value' => get_string('deselectall')));
     echo html_writer::end_tag('div');
     $displaylist = array();
-    $displaylist['#messageselect'] = get_string('messageselectadd');
+    if (!empty($CFG->messaging)) {
+        $displaylist['#messageselect'] = get_string('messageselectadd');
+    }
     if (!empty($CFG->enablenotes) && has_capability('moodle/notes:manage', $context) && $context->id != $frontpagectx->id) {
         $displaylist['#addgroupnote'] = get_string('addnewnote', 'notes');
     }
@@ -367,9 +369,8 @@
 
 if ($newcourse == 1) {
     $str = get_string('proceedtocourse', 'enrol');
-    // Floated left so it goes under the enrol users button on mobile.
     // The margin is to make it line up with the enrol users button when they are both on the same line.
-    $classes = 'my-1 pull-xs-left';
+    $classes = 'my-1';
     $url = course_get_url($course);
     echo $OUTPUT->single_button($url, $str, 'GET', array('class' => $classes));
 }
diff --git a/user/lib.php b/user/lib.php
index be2e21b4f4075..eccc7d2e490f0 100644
--- a/user/lib.php
+++ b/user/lib.php
@@ -1313,7 +1313,7 @@ function user_get_participants_sql($courseid, $groupid = 0, $accesssince = 0, $r
     // Default filter settings. We only show active by default, especially if the user has no capability to review enrolments.
     $onlyactive = true;
     $onlysuspended = false;
-    if (has_capability('moodle/course:enrolreview', $context)) {
+    if (has_capability('moodle/course:enrolreview', $context) && (has_capability('moodle/course:viewsuspendedusers', $context))) {
         switch ($statusid) {
             case ENROL_USER_ACTIVE:
                 // Nothing to do here.
diff --git a/user/selector/lib.php b/user/selector/lib.php
index 34a553a008dc2..7cf6c2b2f4545 100644
--- a/user/selector/lib.php
+++ b/user/selector/lib.php
@@ -581,7 +581,7 @@ public function output_user($user) {
         if ($this->extrafields) {
             $displayfields = array();
             foreach ($this->extrafields as $field) {
-                $displayfields[] = $user->{$field};
+                $displayfields[] = s($user->{$field});
             }
             $out .= ' (' . implode(', ', $displayfields) . ')';
         }
@@ -890,7 +890,15 @@ public function find_users($search) {
         list($searchcondition, $searchparams) = $this->search_sql($search, 'u');
 
         // Build the SQL.
-        list($enrolsql, $enrolparams) = get_enrolled_sql($context);
+        $enrolledjoin = get_enrolled_join($context, 'u.id');
+
+        $wheres = [];
+        $wheres[] = $enrolledjoin->wheres;
+        $wheres[] = 'u.deleted = 0';
+        $wheres[] = 'gm.id IS NULL';
+        $wheres = implode(' AND ', $wheres);
+        $wheres .= ' AND ' . $searchcondition;
+
         $fields = "SELECT r.id AS roleid, u.id AS userid,
                           " . $this->required_fields_sql('u') . ",
                           (SELECT count(igm.groupid)
@@ -898,18 +906,16 @@ public function find_users($search) {
                              JOIN {groups} ig ON igm.groupid = ig.id
                             WHERE igm.userid = u.id AND ig.courseid = :courseid) AS numgroups";
         $sql = "   FROM {user} u
-                   JOIN ($enrolsql) e ON e.id = u.id
+                   $enrolledjoin->joins
               LEFT JOIN {role_assignments} ra ON (ra.userid = u.id AND ra.contextid $relatedctxsql AND ra.roleid $roleids)
               LEFT JOIN {role} r ON r.id = ra.roleid
               LEFT JOIN {groups_members} gm ON (gm.userid = u.id AND gm.groupid = :groupid)
-                  WHERE u.deleted = 0
-                        AND gm.id IS NULL
-                        AND $searchcondition";
+                  WHERE $wheres";
 
         list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
         $orderby = ' ORDER BY ' . $sort;
 
-        $params = array_merge($searchparams, $roleparams, $enrolparams, $relatedctxparams);
+        $params = array_merge($searchparams, $roleparams, $relatedctxparams, $enrolledjoin->params);
         $params['courseid'] = $this->courseid;
         $params['groupid']  = $this->groupid;
 
diff --git a/user/selector/module.js b/user/selector/module.js
index 5b2cd7c3fb267..58a8575cb2670 100644
--- a/user/selector/module.js
+++ b/user/selector/module.js
@@ -244,17 +244,17 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc
          */
         output_group : function(groupname, users, selectedusers, processsingle) {
             var optgroup = Y.Node.create('<optgroup></optgroup>');
+            this.listbox.append(optgroup);
+
             var count = 0;
             for (var key in users) {
                 var user = users[key];
                 var option = Y.Node.create('<option value="' + user.id + '">' + user.name + '</option>');
                 if (user.disabled) {
-                    option.set('disabled', true);
+                    option.setAttribute('disabled', 'disabled');
                 } else if (selectedusers === true || selectedusers[user.id]) {
-                    option.set('selected', true);
+                    option.setAttribute('selected', 'selected');
                     delete selectedusers[user.id];
-                } else {
-                    option.set('selected', false);
                 }
                 optgroup.append(option);
                 if (user.infobelow) {
@@ -268,13 +268,12 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc
             if (count > 0) {
                 optgroup.set('label', groupname + ' (' + count + ')');
                 if (processsingle && count === 1 && this.get_option('autoselectunique') && option.get('disabled') == false) {
-                    option.set('selected', true);
+                    option.setAttribute('selected', 'selected');
                 }
             } else {
                 optgroup.set('label', groupname);
                 optgroup.append(Y.Node.create('<option disabled="disabled">\u00A0</option>'));
             }
-            this.listbox.append(optgroup);
         },
         /**
          * Replace
diff --git a/user/tests/behat/behat_user.php b/user/tests/behat/behat_user.php
index a3f4bbaf27b77..eff2a76640624 100644
--- a/user/tests/behat/behat_user.php
+++ b/user/tests/behat/behat_user.php
@@ -46,14 +46,10 @@ class behat_user extends behat_base {
      * @param string $nodetext The menu item to select.
      */
     public function i_choose_from_the_participants_page_bulk_action_menu($nodetext) {
-        $nodetext = behat_context_helper::escape($nodetext);
-
-        // Open the select.
-        $this->execute("behat_general::i_click_on", array("//select[@id='formactionid']", "xpath_element"));
-
-        // Click on the option.
-        $this->execute("behat_general::i_click_on", array("//select[@id='formactionid']" .
-                                                          "/option[contains(., " . $nodetext . ")]", "xpath_element"));
+        $this->execute("behat_forms::i_set_the_field_to", [
+            "With selected users...",
+            $this->escape($nodetext)
+        ]);
     }
 
     /**
diff --git a/user/tests/behat/set_default_homepage.feature b/user/tests/behat/set_default_homepage.feature
index 0497985483ba3..784ce20d33454 100644
--- a/user/tests/behat/set_default_homepage.feature
+++ b/user/tests/behat/set_default_homepage.feature
@@ -22,16 +22,16 @@ Feature: Set the site home page and dashboard as the default home page
   Scenario: Admin sets the site page and then the dashboard as the default home page
     Given I log in as "admin"
     And I navigate to "Appearance > Navigation" in site administration
-    And I set the field "Default home page for users" to "User preference"
+    And I set the field "Home page for users" to "User preference"
     And I press "Save changes"
     And I am on site homepage
-    And I follow "Make this my default home page"
-    And I should not see "Make this my default home page"
+    And I follow "Make this my home page"
+    And I should not see "Make this my home page"
     And I am on "Course 1" course homepage
     And "Home" "text" should exist in the ".breadcrumb" "css_element"
     And I am on site homepage
     And I follow "Dashboard"
-    And I follow "Make this my default home page"
-    And I should not see "Make this my default home page"
+    And I follow "Make this my home page"
+    And I should not see "Make this my home page"
     And I am on "Course 1" course homepage
     Then "Dashboard" "text" should exist in the ".breadcrumb" "css_element"
diff --git a/user/tests/group_non_members_selector_test.php b/user/tests/group_non_members_selector_test.php
new file mode 100644
index 0000000000000..a4837f88fa4dd
--- /dev/null
+++ b/user/tests/group_non_members_selector_test.php
@@ -0,0 +1,117 @@
+<?php
+// This file is part of Moodle - https://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for {@link group_non_members_selector} class.
+ *
+ * @package     core_user
+ * @category    test
+ * @copyright   2019 Huong Nguyen <huongnv13@gmail.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/user/selector/lib.php');
+
+/**
+ * Unit tests for {@link group_non_members_selector} class.
+ *
+ * @package     core_user
+ * @category    test
+ * @copyright   2019 Huong Nguyen <huongnv13@gmail.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_group_non_members_selector_testcase extends advanced_testcase {
+
+    /**
+     * Test find_users that only return group non members
+     *
+     * @throws coding_exception
+     */
+    public function test_find_users_only_return_group_non_member() {
+        $this->resetAfterTest();
+
+        // Create course.
+        $course = $this->getDataGenerator()->create_course();
+
+        // Create users.
+        $user1 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '1']);
+        $user2 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '2']);
+        $user3 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '3']);
+        $user4 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '4']);
+        $user5 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '5']);
+
+        // Create group.
+        $group = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
+
+        // Enroll users to course. Except User5.
+        $this->getDataGenerator()->enrol_user($user1->id, $course->id);
+        $this->getDataGenerator()->enrol_user($user2->id, $course->id);
+        $this->getDataGenerator()->enrol_user($user3->id, $course->id);
+        $this->getDataGenerator()->enrol_user($user4->id, $course->id);
+
+        // Assign User1 to Group.
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user1->id]);
+
+        // User1 and User5 will not exist in the result.
+        // User2, User3 and User4 will exist in the result.
+        $potentialmembersselector = new group_non_members_selector('addselect',
+                ['groupid' => $group->id, 'courseid' => $course->id]);
+        foreach ($potentialmembersselector->find_users('User') as $found) {
+            $this->assertCount(3, $found);
+            $this->assertArrayNotHasKey($user5->id, $found);
+            $this->assertArrayNotHasKey($user1->id, $found);
+            $this->assertArrayHasKey($user2->id, $found);
+            $this->assertArrayHasKey($user3->id, $found);
+            $this->assertArrayHasKey($user4->id, $found);
+        }
+
+        // Assign User2 to Group.
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user2->id]);
+
+        // User1, User2 and User5 will not exist in the result.
+        // User3 and User4 will exist in the result.
+        $potentialmembersselector = new group_non_members_selector('addselect',
+                ['groupid' => $group->id, 'courseid' => $course->id]);
+        foreach ($potentialmembersselector->find_users('User') as $found) {
+            $this->assertCount(2, $found);
+            $this->assertArrayNotHasKey($user5->id, $found);
+            $this->assertArrayNotHasKey($user1->id, $found);
+            $this->assertArrayNotHasKey($user2->id, $found);
+            $this->assertArrayHasKey($user3->id, $found);
+            $this->assertArrayHasKey($user4->id, $found);
+        }
+
+        // Assign User3 to Group.
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user3->id]);
+
+        // User1, User2, User3 and User5 will not exist in the result.
+        // Only User4 will exist in the result.
+        $potentialmembersselector = new group_non_members_selector('addselect',
+                ['groupid' => $group->id, 'courseid' => $course->id]);
+        foreach ($potentialmembersselector->find_users('User') as $found) {
+            $this->assertCount(1, $found);
+            $this->assertArrayNotHasKey($user5->id, $found);
+            $this->assertArrayNotHasKey($user1->id, $found);
+            $this->assertArrayNotHasKey($user2->id, $found);
+            $this->assertArrayNotHasKey($user3->id, $found);
+            $this->assertArrayHasKey($user4->id, $found);
+        }
+    }
+
+}
diff --git a/user/tests/privacy_test.php b/user/tests/privacy_test.php
index bd630f163ca7e..8a1a9f8b1f301 100644
--- a/user/tests/privacy_test.php
+++ b/user/tests/privacy_test.php
@@ -28,6 +28,7 @@
 use \core_privacy\tests\provider_testcase;
 use \core_user\privacy\provider;
 use \core_privacy\local\request\approved_userlist;
+use \core_privacy\local\request\transform;
 
 require_once($CFG->dirroot . "/user/lib.php");
 
@@ -59,7 +60,11 @@ public function test_get_contexts_for_userid() {
      */
     public function test_export_user_data() {
         $this->resetAfterTest();
-        $user = $this->getDataGenerator()->create_user();
+        $user = $this->getDataGenerator()->create_user([
+            'firstaccess' => 1535760000,
+            'lastaccess' => 1541030400,
+            'currentlogin' => 1541030400,
+        ]);
         $course = $this->getDataGenerator()->create_course();
         $context = \context_user::instance($user->id);
 
@@ -125,6 +130,11 @@ public function test_export_user_data() {
         $this->assertTrue(array_key_exists('firstname', $userdata));
         $this->assertTrue(array_key_exists('lastname', $userdata));
         $this->assertTrue(array_key_exists('email', $userdata));
+        // Check access times.
+        $this->assertEquals(transform::datetime($user->firstaccess), $userdata['firstaccess']);
+        $this->assertEquals(transform::datetime($user->lastaccess), $userdata['lastaccess']);
+        $this->assertNull($userdata['lastlogin']);
+        $this->assertEquals(transform::datetime($user->currentlogin), $userdata['currentlogin']);
     }
 
     /**
diff --git a/version.php b/version.php
index 82299ae4aae81..19db8494d2bd9 100644
--- a/version.php
+++ b/version.php
@@ -29,11 +29,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2019052000.00;              // 20190520      = branching date YYYYMMDD - do not modify!
+$version  = 2019052004.08;              // 20190520      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 
-$release  = '3.7 (Build: 20190520)'; // Human-friendly version name
+$release  = '3.7.4+ (Build: 20200221)'; // Human-friendly version name
 
 $branch   = '37';                       // This version's branch.
 $maturity = MATURITY_STABLE;             // This version's maturity level.
diff --git a/webservice/externallib.php b/webservice/externallib.php
index 8391df7b68f19..7167b3c72b9a1 100644
--- a/webservice/externallib.php
+++ b/webservice/externallib.php
@@ -77,6 +77,7 @@ public static function get_site_info($serviceshortnames = array()) {
                       array('serviceshortnames'=>$serviceshortnames));
 
         $context = context_user::instance($USER->id);
+        $systemcontext = context_system::instance();
 
         $userpicture = new user_picture($USER);
         $userpicture->size = 1; // Size f1.
@@ -84,7 +85,7 @@ public static function get_site_info($serviceshortnames = array()) {
 
         // Site information.
         $siteinfo =  array(
-            'sitename' => $SITE->fullname,
+            'sitename' => external_format_string($SITE->fullname, $systemcontext),
             'siteurl' => $CFG->wwwroot,
             'username' => $USER->username,
             'firstname' => $USER->firstname,
diff --git a/webservice/renderer.php b/webservice/renderer.php
index 6a751deb261d3..f97c03c866d04 100644
--- a/webservice/renderer.php
+++ b/webservice/renderer.php
@@ -109,7 +109,7 @@ public function admin_authorised_user_list($users, $serviceid) {
             $modifiedauthoriseduserurl = new moodle_url('/' . $CFG->admin . '/webservice/service_user_settings.php',
                             array('userid' => $user->id, 'serviceid' => $serviceid));
             $html .= html_writer::tag('a', $user->firstname . " "
-                            . $user->lastname . ", " . $user->email,
+                            . $user->lastname . ", " . s($user->email),
                             array('href' => $modifiedauthoriseduserurl));
             //add missing capabilities
             if (!empty($user->missingcapabilities)) {
diff --git a/webservice/wsdoc.php b/webservice/wsdoc.php
index f5bb7ab3cb507..b3ed68e93c526 100644
--- a/webservice/wsdoc.php
+++ b/webservice/wsdoc.php
@@ -35,17 +35,18 @@
 // PAGE settings
 $PAGE->set_context($usercontext);
 $PAGE->set_url('/user/wsdoc.php');
-$PAGE->set_title(get_string('documentation', 'webservice'));
-$PAGE->set_heading(get_string('documentation', 'webservice'));
+$PAGE->set_title(get_string('wsdocumentation', 'webservice'));
+$PAGE->set_heading(get_string('wsdocumentation', 'webservice'));
 $PAGE->set_pagelayout('standard');
 
 // nav bar
 $PAGE->navbar->ignore_active(true);
-$PAGE->navbar->add(get_string('usercurrentsettings'));
+$PAGE->navbar->add(get_string('preferences'), new moodle_url('/user/preferences.php'));
+$PAGE->navbar->add(get_string('useraccount'));
 $PAGE->navbar->add(get_string('securitykeys', 'webservice'),
         new moodle_url('/user/managetoken.php', 
                 array('id' => $tokenid, 'sesskey' => sesskey())));
-$PAGE->navbar->add(get_string('documentation', 'webservice'));
+$PAGE->navbar->add(get_string('wsdocumentation', 'webservice'));
 
 // check web service are enabled
 if (empty($CFG->enablewsdocumentation)) {