diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index bffc6a8a27..e4e18fc96e 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -104,7 +104,7 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [3.6]
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v4
diff --git a/AUTHORS.md b/AUTHORS.md
index c35fcbba7d..d8332e530b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -103,3 +103,4 @@ If you have contributed to Kolibri, feel free to add your name and Github accoun
 | Alex Vélez | AlexVelezLl |
 | Mazen Oweiss | moweiss |
 | Eshaan Aggarwal | EshaanAgg |
+| Nikhil Sharma | ThEditor |
diff --git a/kolibri/__init__.py b/kolibri/__init__.py
index ce4b84a853..4204b9e824 100755
--- a/kolibri/__init__.py
+++ b/kolibri/__init__.py
@@ -11,7 +11,7 @@
 
 #: This may not be the exact version as it's subject to modification with
 #: get_version() - use ``kolibri.__version__`` for the exact version string.
-VERSION = (0, 16, 0)
+VERSION = (0, 16, 1)
 
 __author__ = "Learning Equality"
 __email__ = "info@learningequality.org"
diff --git a/kolibri/core/assets/src/core-app/apiSpec.js b/kolibri/core/assets/src/core-app/apiSpec.js
index 207e8e3d9e..386e40db87 100644
--- a/kolibri/core/assets/src/core-app/apiSpec.js
+++ b/kolibri/core/assets/src/core-app/apiSpec.js
@@ -96,7 +96,6 @@ import LearnOnlyDeviceNotice from '../views/LearnOnlyDeviceNotice';
 import themeConfig from '../styles/themeConfig';
 import sortLanguages from '../utils/sortLanguages';
 import * as sync from '../views/sync/syncComponentSet';
-import PageRoot from '../views/PageRoot';
 import NotificationsRoot from '../views/NotificationsRoot';
 import useMinimumKolibriVersion from '../composables/useMinimumKolibriVersion';
 import useUserSyncStatus from '../composables/useUserSyncStatus';
@@ -203,7 +202,6 @@ export default {
       PrivacyLinkAndModal,
       LearnOnlyDeviceNotice,
       SuggestedTime,
-      PageRoot,
       MasteryModel,
       NotificationsRoot,
       KolibriLoadingSnippet,
diff --git a/kolibri/core/assets/src/kolibri_app.js b/kolibri/core/assets/src/kolibri_app.js
index b06390bc80..44f60b9bd9 100644
--- a/kolibri/core/assets/src/kolibri_app.js
+++ b/kolibri/core/assets/src/kolibri_app.js
@@ -27,7 +27,12 @@ export default class KolibriApp extends KolibriModule {
    * @return {Object} A component definition for the root component of this single page app.
    */
   get RootVue() {
-    return {};
+    // By default return the component that just renders router-view,
+    // which will render the component for the current route.
+    return {
+      functional: true,
+      render: createElement => createElement('router-view'),
+    };
   }
   /*
    * @return {Store} A convenience getter to return the vuex store.
diff --git a/kolibri/core/assets/src/logging.js b/kolibri/core/assets/src/logging.js
index 0656ee5aed..801a1bdc4f 100644
--- a/kolibri/core/assets/src/logging.js
+++ b/kolibri/core/assets/src/logging.js
@@ -5,23 +5,31 @@
 
 import loglevel from 'loglevel';
 
-const console = global.console;
-
 class Logger {
   constructor(loggerName) {
     this.loggerName = loggerName;
     this.logger = loglevel.getLogger(loggerName);
+    this.setMessagePrefix();
     Object.keys(loglevel.levels).forEach(methodName => {
       const name = methodName.toLowerCase();
       const logFunction = this.logger[name];
       if (logFunction) {
-        this[name] = logFunction.bind(console, this.messagePrefix(name));
+        this[name] = param => {
+          return this.logger[name](param);
+        };
       }
     });
   }
 
-  messagePrefix(type) {
-    return `[${type.toUpperCase()}: ${this.loggerName}]`;
+  setMessagePrefix() {
+    var originalFactory = this.logger.methodFactory;
+    this.logger.methodFactory = function(methodName, logLevel, loggerName) {
+      var rawMethod = originalFactory(methodName, logLevel, loggerName);
+      return function(message) {
+        rawMethod(`[${methodName.toUpperCase()}: ${loggerName}] ` + message);
+      };
+    };
+    this.logger.setLevel(this.logger.getLevel());
   }
 
   setLevel(level, persist) {
diff --git a/kolibri/core/assets/src/state/modules/core/actions.js b/kolibri/core/assets/src/state/modules/core/actions.js
index a9bad1fcab..3eaf813ae4 100644
--- a/kolibri/core/assets/src/state/modules/core/actions.js
+++ b/kolibri/core/assets/src/state/modules/core/actions.js
@@ -92,22 +92,6 @@ export function handleApiError(store, { error, reloadOnReconnect = false } = {})
   throw error;
 }
 
-/**
- * Used to prevent inadvertent actions if a user double-clicks to navigate
- *
- * Something of a hack. A better strategy would be to create a new
- * `setLoading` action which handles both `state.core.loading` and
- * `state.core.blockDoubleClicks` with a single function.
- */
-export function blockDoubleClicks(store) {
-  if (!store.state.blockDoubleClicks) {
-    store.commit('CORE_BLOCK_CLICKS', true);
-    setTimeout(() => {
-      store.commit('CORE_BLOCK_CLICKS', false);
-    }, 500);
-  }
-}
-
 export function setSession(store, { session, clientNow }) {
   const serverTime = session.server_time;
   if (clientNow) {
diff --git a/kolibri/core/assets/src/state/modules/core/index.js b/kolibri/core/assets/src/state/modules/core/index.js
index 59076b4ed2..f0e72c83ce 100644
--- a/kolibri/core/assets/src/state/modules/core/index.js
+++ b/kolibri/core/assets/src/state/modules/core/index.js
@@ -10,7 +10,6 @@ export default {
   state() {
     return {
       error: '',
-      blockDoubleClicks: false,
       loading: true,
       pageSessionId: 0,
       totalProgress: null,
diff --git a/kolibri/core/assets/src/state/modules/core/mutations.js b/kolibri/core/assets/src/state/modules/core/mutations.js
index ffeeb04c65..a02d320372 100644
--- a/kolibri/core/assets/src/state/modules/core/mutations.js
+++ b/kolibri/core/assets/src/state/modules/core/mutations.js
@@ -15,9 +15,6 @@ export default {
   CORE_SET_ERROR(state, error) {
     state.error = error;
   },
-  CORE_BLOCK_CLICKS(state, blocked) {
-    state.blockDoubleClicks = blocked;
-  },
   SET_TOTAL_PROGRESS(state, progress) {
     state.totalProgress = progress;
   },
diff --git a/kolibri/core/assets/src/views/PageRoot.vue b/kolibri/core/assets/src/views/PageRoot.vue
deleted file mode 100644
index 7b89f94169..0000000000
--- a/kolibri/core/assets/src/views/PageRoot.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-
-  <!-- populated by client-side router -->
-  <router-view />
-
-</template>
-
-
-<script>
-
-  export default {
-    name: 'PageRoot',
-  };
-
-</script>
-
-
-<style lang="scss"></style>
diff --git a/kolibri/core/assets/src/views/SyncStatusDisplay.vue b/kolibri/core/assets/src/views/SyncStatusDisplay.vue
index 31aa08fa84..364817fcf9 100644
--- a/kolibri/core/assets/src/views/SyncStatusDisplay.vue
+++ b/kolibri/core/assets/src/views/SyncStatusDisplay.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <span>
+  <span :style="{ display: 'flex', alignItems: 'center' }">
     <KCircularLoader
       v-if="syncInProgress"
       :size="20"
@@ -135,6 +135,7 @@
   .inline-loader {
     display: inline-block;
     margin-right: 8px;
+    margin-left: 0;
     vertical-align: bottom;
   }
 
@@ -146,6 +147,7 @@
   .small {
     display: inline-block;
     margin-top: 0;
+    margin-bottom: 0;
     font-size: 11px;
   }
 
diff --git a/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherList.vue b/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherList.vue
index e6c34efd78..eff759ab96 100644
--- a/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherList.vue
+++ b/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherList.vue
@@ -62,6 +62,12 @@
         windowBreakpoint,
       };
     },
+    props: {
+      parentBreakpoint: {
+        type: Number,
+        default: -1,
+      },
+    },
     data() {
       return {
         showLanguageModal: false,
@@ -75,8 +81,14 @@
         return availableLanguages[currentLanguage];
       },
       numVisibleLanguageBtns() {
-        // At windowBreakpoint = 0, only the "More languages" button will show
-        return Math.min(4, this.windowBreakpoint);
+        // At visibleBtns = 0, only the "More languages" button will show
+        let visibleBtns = 4;
+        if (this.parentBreakpoint < 0) {
+          visibleBtns = this.windowBreakpoint;
+        } else {
+          visibleBtns = this.parentBreakpoint;
+        }
+        return Math.min(4, visibleBtns);
       },
       numSelectableLanguages() {
         return this.selectableLanguages.length;
diff --git a/kolibri/core/auth/api.py b/kolibri/core/auth/api.py
index 858df94f8b..760eec6388 100644
--- a/kolibri/core/auth/api.py
+++ b/kolibri/core/auth/api.py
@@ -897,7 +897,23 @@ def create(self, request):
                 status=status.HTTP_401_UNAUTHORIZED,
             )
 
-        # Find the FacilityUser we're looking for use later on
+        user = None
+        if interface.enabled and valid_app_key_on_request(request):
+            # If we are in app context, then try to get the automatically created OS User
+            # if it matches the username, without needing a password.
+            user = self._check_os_user(request, username)
+        if user is None:
+            # Otherwise attempt full authentication
+            user = authenticate(
+                username=username, password=password, facility=facility_id
+            )
+        if user is not None and user.is_active:
+            # Correct password, and the user is marked "active"
+            login(request, user)
+            # Success!
+            return self.get_session_response(request)
+        # Otherwise, try to give a helpful error message
+        # Find the FacilityUser we're looking for
         try:
             unauthenticated_user = FacilityUser.objects.get(
                 username__iexact=username, facility=facility_id
@@ -917,24 +933,9 @@ def create(self, request):
             )
         except FacilityUser.MultipleObjectsReturned:
             # Handle case of multiple matching usernames
-            unauthenticated_user = FacilityUser.objects.get(
+            unauthenticated_user = FacilityUser.objects.filter(
                 username__exact=username, facility=facility_id
-            )
-        user = None
-        if interface.enabled and valid_app_key_on_request(request):
-            # If we are in app context, then try to get the automatically created OS User
-            # if it matches the username, without needing a password.
-            user = self._check_os_user(request, username)
-        if user is None:
-            # Otherwise attempt full authentication
-            user = authenticate(
-                username=username, password=password, facility=facility_id
-            )
-        if user is not None and user.is_active:
-            # Correct password, and the user is marked "active"
-            login(request, user)
-            # Success!
-            return self.get_session_response(request)
+            ).first()
         if unauthenticated_user.password == NOT_SPECIFIED:
             # Here - we have a Learner whose password is "NOT_SPECIFIED" because they were created
             # while the "Require learners to log in with password" setting was disabled - but now
diff --git a/kolibri/core/auth/management/commands/bulkimportusers.py b/kolibri/core/auth/management/commands/bulkimportusers.py
index 9004ce8454..5ec250962a 100644
--- a/kolibri/core/auth/management/commands/bulkimportusers.py
+++ b/kolibri/core/auth/management/commands/bulkimportusers.py
@@ -269,8 +269,20 @@ def add_check(self, header_name, check, message):
 
     def get_username(self, row):
         username = row.get(self.header_translation["USERNAME"])
-        if username in self.users.keys():
-            return None
+        uuid = row.get(self.header_translation["UUID"])
+        lowercase_username = username.lower()
+
+        # Check if a user with the provided username exists (case-insensitive)
+        existing_user = FacilityUser.objects.filter(
+            username__iexact=lowercase_username
+        ).first()
+        # Convert existing keys in self.users to lowercase
+        if existing_user and uuid == "":
+            return None  # Duplicate username
+        # Convert existing keys in self.users to lowercase
+        lowercase_users = {key.lower(): value for key, value in self.users.items()}
+        if lowercase_username in lowercase_users:
+            return None  # Duplicate username
 
         return username
 
@@ -533,7 +545,7 @@ def compare_fields(self, user_obj, values):
                     setattr(user_obj, field, values[field])
         return changed
 
-    def build_users_objects(self, users):
+    def build_users_objects(self, users):  # noqa C901
         new_users = []
         update_users = []
         keeping_users = []
@@ -563,7 +575,7 @@ def build_users_objects(self, users):
                 if user_obj.username != user:
                     # check for duplicated username in the facility
                     existing_user = FacilityUser.objects.get(
-                        username=user, facility=self.default_facility
+                        username__iexact=user, facility=self.default_facility
                     )
                     if existing_user:
                         error = {
@@ -578,6 +590,21 @@ def build_users_objects(self, users):
                 if self.compare_fields(user_obj, values):
                     update_users.append(user_obj)
             else:
+                # If UUID is not specified, check for a username clash
+                if values["uuid"] == "":
+                    existing_user = FacilityUser.objects.filter(
+                        username__iexact=user, facility=self.default_facility
+                    ).first()
+                    if existing_user:
+                        error = {
+                            "row": users[user]["position"],
+                            "username": user,
+                            "message": MESSAGES[DUPLICATED_USERNAME],
+                            "field": "USERNAME",
+                            "value": user,
+                        }
+                        per_line_errors.append(error)
+                        continue
                 if values["uuid"] != "":
                     error = {
                         "row": users[user]["position"],
diff --git a/kolibri/core/auth/test/test_api.py b/kolibri/core/auth/test/test_api.py
index 88299239a4..7fdd96962a 100644
--- a/kolibri/core/auth/test/test_api.py
+++ b/kolibri/core/auth/test/test_api.py
@@ -1240,9 +1240,34 @@ def test_case_insensitive_matching_usernames(self):
         # Assert the expected behavior for the second user
         self.assertEqual(response_user2.status_code, 200)
 
-        # Cleanup: Delete the created users
-        self.user1.delete()
-        self.user2.delete()
+    def test_case_sensitive_matching_usernames(self):
+        FacilityUserFactory.create(username="shared_username", facility=self.facility)
+
+        response_user2 = self.client.post(
+            reverse("kolibri:core:session-list"),
+            data={
+                "username": "shared_username",
+                "password": DUMMY_PASSWORD,
+                "facility": self.facility.id,
+            },
+            format="json",
+        )
+
+        # Assert the expected behavior for the second user
+        self.assertEqual(response_user2.status_code, 200)
+
+        # Test no error when authentication fails
+        response_user3 = self.client.post(
+            reverse("kolibri:core:session-list"),
+            data={
+                "username": "shared_username",
+                "password": "wrong_password",
+                "facility": self.facility.id,
+            },
+            format="json",
+        )
+
+        self.assertEqual(response_user3.status_code, 401)
 
 
 class SignUpBase(object):
diff --git a/kolibri/core/auth/test/test_bulk_import.py b/kolibri/core/auth/test/test_bulk_import.py
index 68f6c23167..a161d17513 100644
--- a/kolibri/core/auth/test/test_bulk_import.py
+++ b/kolibri/core/auth/test/test_bulk_import.py
@@ -248,6 +248,98 @@ def test_password_is_required(self):
         assert "new_coach" in result[1]
         assert "'row': 2" in result[1]
 
+    def test_case_insensitive_usernames(self):
+        _, first_filepath = tempfile.mkstemp(suffix=".csv")
+        rows = [
+            [
+                None,
+                "peter",
+                "password1",
+                None,
+                "LEARNER",
+                None,
+                "2001",
+                "FEMALE",
+                "new_class",
+                None,
+            ],
+            [
+                None,
+                "PETER",
+                "password2",
+                None,
+                "FACILITY_COACH",
+                None,
+                "1969",
+                "MALE",
+                None,
+                "new_class",
+            ],
+        ]
+        self.create_csv(first_filepath, rows)
+        call_command("bulkimportusers", first_filepath, facility=self.facility.id)
+
+        # Retrieve the user(s)
+        users = FacilityUser.objects.filter(username__iexact="peter")
+
+        # Ensure that only one user is created, and it has the latest password
+        assert users.count() == 1
+
+    def test_username_already_exists(self):
+        _, first_filepath = tempfile.mkstemp(suffix=".csv")
+        rows = [
+            [
+                None,
+                "peter",  # Adding the first user with the username "peter"
+                "passwd1",
+                None,
+                "LEARNER",
+                None,
+                "2001",
+                "FEMALE",
+                "new_class",
+                None,
+            ],
+        ]
+        self.create_csv(first_filepath, rows)
+
+        call_command("bulkimportusers", first_filepath, facility=self.facility.id)
+
+        # Get the initial count of users with the username "peter"
+        initial_peter_count = FacilityUser.objects.filter(username="peter").count()
+        peter1 = FacilityUser.objects.get(username="peter")
+        passwd1 = peter1.password
+        # Check that the count of users with the username "peter" is one
+        assert initial_peter_count == 1
+
+        # Attempt to add another user with the same username "peter"
+        _, second_filepath = tempfile.mkstemp(suffix=".csv")
+        rows = [
+            [
+                None,
+                "peter",  # Attempting to add another user with the same username "peter"
+                "another_password",
+                None,
+                "LEARNER",
+                None,
+                "2001",
+                "FEMALE",
+                "new_class",
+                None,
+            ],
+        ]
+        self.create_csv(second_filepath, rows)
+
+        # Check that the command raises an IntegrityError when trying to add a user with an existing username
+        call_command("bulkimportusers", second_filepath, facility=self.facility.id)
+
+        # Check that the count of users with the username "peter" is still one
+        assert FacilityUser.objects.filter(username="peter").count() == 1
+        peter2 = FacilityUser.objects.get(username="peter")
+        passwd2 = peter2.password
+        # Check that the password of the existing user remains unchanged
+        assert passwd2 == passwd1
+
     def test_asterisk_in_password(self):
         _, first_filepath = tempfile.mkstemp(suffix=".csv")
         rows = [
diff --git a/kolibri/core/bookmarks/migrations/0001_initial.py b/kolibri/core/bookmarks/migrations/0001_initial.py
index bf6e420161..161e23f206 100644
--- a/kolibri/core/bookmarks/migrations/0001_initial.py
+++ b/kolibri/core/bookmarks/migrations/0001_initial.py
@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("kolibriauth", "0019_collection_no_mptt"),
-        migrations.swappable_dependency("kolibriauth.FacilityUser"),
     ]
 
     operations = [
diff --git a/kolibri/core/content/api.py b/kolibri/core/content/api.py
index 54f6e6f2e0..7c08e8f653 100644
--- a/kolibri/core/content/api.py
+++ b/kolibri/core/content/api.py
@@ -40,6 +40,7 @@
 from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.generics import get_object_or_404
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from kolibri.core.api import BaseValuesViewset
@@ -1392,6 +1393,7 @@ class ContentRequestViewset(ReadOnlyValuesViewset, CreateModelMixin):
     filter_backends = (DjangoFilterBackend,)
     filter_class = ContentRequestFilter
     pagination_class = OptionalPageNumberPagination
+    permission_classes = [IsAuthenticated]
 
     values = (
         "id",
diff --git a/kolibri/core/decorators.py b/kolibri/core/decorators.py
index 111ba1dbec..13768233b7 100644
--- a/kolibri/core/decorators.py
+++ b/kolibri/core/decorators.py
@@ -330,12 +330,16 @@ def cache_no_user_data(view_func):
     _response = local()
 
     def render_and_cache(response, cache_key):
-        response.render()
-        etag = hashlib.md5(
-            kolibri_version.encode("utf-8") + str(response.content).encode("utf-8")
-        ).hexdigest()
-        cache.set(cache_key, etag, CACHE_TIMEOUT)
-        return etag
+        if hasattr(response, "render") and callable(response.render):
+            response.render()
+        if response.content:
+            etag = hashlib.md5(
+                kolibri_version.encode("utf-8") + str(response.content).encode("utf-8")
+            ).hexdigest()
+            cache.set(cache_key, etag, CACHE_TIMEOUT)
+            return etag
+        else:
+            return None
 
     def calculate_spa_etag(*args, **kwargs):
         # Clear the local thread 'response' property
diff --git a/kolibri/core/device/migrations/0012_syncqueue.py b/kolibri/core/device/migrations/0012_syncqueue.py
index f8db062edf..0762711f3d 100644
--- a/kolibri/core/device/migrations/0012_syncqueue.py
+++ b/kolibri/core/device/migrations/0012_syncqueue.py
@@ -15,7 +15,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency("kolibriauth.FacilityUser"),
+        ("kolibriauth", "0001_initial"),
         ("device", "0011_devicesettings_subset_of_users_device"),
     ]
 
diff --git a/kolibri/core/device/migrations/0013_usersyncstatus.py b/kolibri/core/device/migrations/0013_usersyncstatus.py
index 40dcd9c2b2..bf9ba804ee 100644
--- a/kolibri/core/device/migrations/0013_usersyncstatus.py
+++ b/kolibri/core/device/migrations/0013_usersyncstatus.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("morango", "0016_store_deserialization_error"),
-        migrations.swappable_dependency("kolibriauth.FacilityUser"),
+        ("kolibriauth", "0001_initial"),
         ("device", "0012_syncqueue"),
     ]
 
diff --git a/kolibri/core/device/migrations/0016_osuser.py b/kolibri/core/device/migrations/0016_osuser.py
index 851f25e674..f9fab0ff71 100644
--- a/kolibri/core/device/migrations/0016_osuser.py
+++ b/kolibri/core/device/migrations/0016_osuser.py
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
                         primary_key=True,
                         related_name="os_user",
                         serialize=False,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
                 ("os_username", models.CharField(db_index=True, max_length=64)),
diff --git a/kolibri/core/device/migrations/0018_add_learner_device_status.py b/kolibri/core/device/migrations/0018_add_learner_device_status.py
index 837e0787eb..efa11b74d9 100644
--- a/kolibri/core/device/migrations/0018_add_learner_device_status.py
+++ b/kolibri/core/device/migrations/0018_add_learner_device_status.py
@@ -13,7 +13,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("kolibriauth", "0020_facilitydataset_extra_fields"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("device", "0017_extra_settings"),
     ]
 
@@ -58,7 +57,7 @@ class Migration(migrations.Migration):
                     models.OneToOneField(
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="learner_device_status",
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],
diff --git a/kolibri/core/discovery/migrations/0007_device_pinning.py b/kolibri/core/discovery/migrations/0007_device_pinning.py
index 64c1f2c2bd..019730c56d 100644
--- a/kolibri/core/discovery/migrations/0007_device_pinning.py
+++ b/kolibri/core/discovery/migrations/0007_device_pinning.py
@@ -14,7 +14,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("kolibriauth", "0001_initial"),
         ("discovery", "0006_networklocation_min_content_schema_version"),
     ]
 
@@ -41,7 +41,7 @@ class Migration(migrations.Migration):
                     "user",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],
diff --git a/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py b/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py
index 2bcef95109..c4d87cf0b4 100644
--- a/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py
+++ b/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py
@@ -13,7 +13,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("kolibriauth", "0001_initial"),
         ("discovery", "0012_remove_pinned_device"),
     ]
 
@@ -41,7 +41,7 @@ class Migration(migrations.Migration):
                     "user",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],
diff --git a/kolibri/core/exams/migrations/0005_individualsyncableexam.py b/kolibri/core/exams/migrations/0005_individualsyncableexam.py
index 8c0c3b2d57..aba9b9b7a1 100644
--- a/kolibri/core/exams/migrations/0005_individualsyncableexam.py
+++ b/kolibri/core/exams/migrations/0005_individualsyncableexam.py
@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("kolibriauth", "0019_collection_no_mptt"),
-        migrations.swappable_dependency("kolibriauth.FacilityUser"),
         ("exams", "0004_exam_add_dates_opened_created_and_archived"),
     ]
 
diff --git a/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py b/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py
index 8816d38b7a..1b5deea5fd 100644
--- a/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py
+++ b/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py
@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("kolibriauth", "0019_collection_no_mptt"),
-        migrations.swappable_dependency("kolibriauth.FacilityUser"),
         ("lessons", "0002_auto_20180221_1115"),
     ]
 
diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index 564f0b8ebb..4e1a77e798 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -30,7 +30,7 @@
     "screenfull": "^5.2.0",
     "tinycolor2": "^1.6.0",
     "ua-parser-js": "^1.0.37",
-    "vue": "^2.6.14",
+    "vue": "2.6.14",
     "vue-intl": "3.1.0",
     "vue-meta": "^2.4.0",
     "vue-router": "^3.6.5",
diff --git a/kolibri/deployment/default/custom_django_cache.py b/kolibri/deployment/default/custom_django_cache.py
index ee7dc661c4..a81d95392f 100644
--- a/kolibri/deployment/default/custom_django_cache.py
+++ b/kolibri/deployment/default/custom_django_cache.py
@@ -13,6 +13,30 @@ class CustomDjangoCache(DjangoCache):
     https://github.com/grantjenks/python-diskcache/blob/v4.1.0/diskcache/djangocache.py
     """
 
+    ERRORS_TO_HANDLE = (sqlite3.OperationalError, AssertionError)
+
+    def try_execute(self, method_name, error_return_value, *args, **kwargs):
+        """
+        Safely executes a method with error handling.
+            :param method_name --> (str): name of method to execute
+            :param error_return_value --> (any): value to return if error occur
+            :param *args: positional arguments for method
+            :param *kwargs: keyword arguments for method
+            :return: The return value of the executed method if successful,
+                     otherwise returns error_return_value
+        """
+        try:
+            method = getattr(super(CustomDjangoCache, self), method_name)
+            if method is None:
+                raise ValueError(
+                    "{method_name} is not a valid method".format(
+                        method_name=method_name
+                    )
+                )
+            return method(*args, **kwargs)
+        except self.ERRORS_TO_HANDLE:
+            return error_return_value
+
     def add(
         self,
         key,
@@ -23,12 +47,17 @@ def add(
         tag=None,
         retry=True,
     ):
-        try:
-            return super(CustomDjangoCache, self).add(
-                key, value, timeout, version, read, tag, retry
-            )
-        except sqlite3.OperationalError:
-            return False
+        return self.try_execute(
+            "add",
+            False,
+            key=key,
+            value=value,
+            timeout=timeout,
+            version=version,
+            read=read,
+            tag=tag,
+            retry=retry,
+        )
 
     def has_key(self, key, version=None):
         """Returns True if the key is in the cache and has not expired.
@@ -38,12 +67,7 @@ def has_key(self, key, version=None):
         :return: True if key is found
 
         """
-        try:
-            return super(CustomDjangoCache, self).has_key(  # noqa: W601
-                key, version=version
-            )
-        except sqlite3.OperationalError:
-            return False
+        return self.try_execute("has_key", False, key=key, version=version)
 
     def get(
         self,
@@ -55,12 +79,17 @@ def get(
         tag=False,
         retry=False,
     ):
-        try:
-            return super(CustomDjangoCache, self).get(
-                key, default, version, read, expire_time, tag, retry
-            )
-        except sqlite3.OperationalError:
-            return None
+        return self.try_execute(
+            "get",
+            None,
+            key=key,
+            default=default,
+            version=version,
+            read=read,
+            expire_time=expire_time,
+            tag=tag,
+            retry=retry,
+        )
 
     def set(
         self,
@@ -72,95 +101,93 @@ def set(
         tag=None,
         retry=True,
     ):
-        try:
-            return super(CustomDjangoCache, self).set(
-                key, value, timeout, version, read, tag, retry
-            )
-        except sqlite3.OperationalError:
-            return False
+        return self.try_execute(
+            "set",
+            False,
+            key=key,
+            value=value,
+            timeout=timeout,
+            version=version,
+            read=read,
+            tag=tag,
+            retry=retry,
+        )
 
     def touch(self, key, timeout=DEFAULT_TIMEOUT, version=None, retry=True):
-        try:
-            return super(CustomDjangoCache, self).touch(key, timeout, version, retry)
-        except sqlite3.OperationalError:
-            return False
+        return self.try_execute(
+            "touch",
+            False,
+            key=key,
+            timeout=timeout,
+            version=version,
+            retry=retry,
+        )
 
     def pop(
         self, key, default=None, version=None, expire_time=False, tag=False, retry=True
     ):
-        try:
-            return super(CustomDjangoCache, self).pop(
-                key, default, version, expire_time, tag, retry
-            )
-        except sqlite3.OperationalError:
-            return None
+        return self.try_execute(
+            "pop",
+            None,
+            key=key,
+            default=default,
+            version=version,
+            expire_time=expire_time,
+            tag=tag,
+            retry=retry,
+        )
 
     def delete(self, key, version=None, retry=True):
-        try:
-            super(CustomDjangoCache, self).delete(key, version, retry)
-        except sqlite3.OperationalError:
-            pass
+        self.try_execute(
+            "delete",
+            None,
+            key=key,
+            version=version,
+            retry=retry,
+        )
 
     def incr(self, key, delta=1, version=None, default=None, retry=True):
-        try:
-            return super(CustomDjangoCache, self).incr(
-                key, delta, version, default, retry
-            )
-        except sqlite3.OperationalError:
-            return None
+        return self.try_execute(
+            "incr",
+            None,
+            key=key,
+            delta=delta,
+            version=version,
+            default=default,
+            retry=retry,
+        )
 
     def decr(self, key, delta=1, version=None, default=None, retry=True):
-        try:
-            return super(CustomDjangoCache, self).decr(
-                key, delta, version, default, retry
-            )
-        except sqlite3.OperationalError:
-            return None
+        return self.try_execute(
+            "decr",
+            None,
+            key=key,
+            delta=delta,
+            version=version,
+            default=default,
+            retry=retry,
+        )
 
     def expire(self, retry=False):
-        try:
-            return super(CustomDjangoCache, self).expire(retry)
-        except sqlite3.OperationalError:
-            return 0
+        return self.try_execute("expire", 0, retry=retry)
 
     def stats(self, enable=True, reset=False):
-        try:
-            return super(CustomDjangoCache, self).stats(enable, reset)
-        except sqlite3.OperationalError:
-            return 0, 0
+        return self.try_execute("stats", (0, 0), enable=enable, reset=reset)
 
     def create_tag_index(self):
-        try:
-            super(CustomDjangoCache, self).create_tag_index()
-        except sqlite3.OperationalError:
-            pass
+        return self.try_execute("create_tag_index", None)
 
     def drop_tag_index(self):
-        try:
-            super(CustomDjangoCache, self).drop_tag_index()
-        except sqlite3.OperationalError:
-            pass
+        return self.try_execute("drop_tag_index", None)
 
     def evict(self, tag):
-        try:
-            return super(CustomDjangoCache, self).evict(tag)
-        except sqlite3.OperationalError:
-            return 0
+        return self.try_execute("evict", 0, tag=tag)
 
     def cull(self):
-        try:
-            return super(CustomDjangoCache, self).cull()
-        except sqlite3.OperationalError:
-            return 0
+        return self.try_execute("cull", 0)
 
     def clear(self):
-        try:
-            return super(CustomDjangoCache, self).clear()
-        except sqlite3.OperationalError:
-            return 0
+        return self.try_execute("clear", 0)
 
     def close(self, **kwargs):
-        try:
-            super(CustomDjangoCache, self).close(**kwargs)
-        except sqlite3.OperationalError:
-            pass
+        return self.try_execute("close", None, **kwargs)
diff --git a/kolibri/plugins/coach/assets/src/app.js b/kolibri/plugins/coach/assets/src/app.js
index 8eaf764fbb..7fc73dbec7 100644
--- a/kolibri/plugins/coach/assets/src/app.js
+++ b/kolibri/plugins/coach/assets/src/app.js
@@ -3,7 +3,6 @@ import useUser from 'kolibri.coreVue.composables.useUser';
 import redirectBrowser from 'kolibri.utils.redirectBrowser';
 import { setChannelInfo } from 'kolibri.coreVue.vuex.actions';
 import router from 'kolibri.coreVue.router';
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import KolibriApp from 'kolibri_app';
 import { PageNames } from './constants';
 import routes from './routes';
@@ -21,9 +20,6 @@ class CoachToolsModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }
diff --git a/kolibri/plugins/learn/assets/src/app.js b/kolibri/plugins/learn/assets/src/app.js
index 4f11411117..0634d4314a 100644
--- a/kolibri/plugins/learn/assets/src/app.js
+++ b/kolibri/plugins/learn/assets/src/app.js
@@ -43,7 +43,6 @@ class LearnModule extends KolibriApp {
 
     // after every navigation, block double-clicks
     router.afterEach((toRoute, fromRoute) => {
-      this.store.dispatch('blockDoubleClicks');
       this.store.dispatch('resetModuleState', { toRoute, fromRoute });
     });
     super.ready();
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/app.js b/kolibri/plugins/learn/assets/src/my_downloads/app.js
index 49bae640f2..41d208ccf3 100644
--- a/kolibri/plugins/learn/assets/src/my_downloads/app.js
+++ b/kolibri/plugins/learn/assets/src/my_downloads/app.js
@@ -1,4 +1,3 @@
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import KolibriApp from 'kolibri_app';
 import routes from './routes';
 import pluginModule from './modules/pluginModule';
@@ -7,9 +6,6 @@ class MyDownloadsModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue b/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue
index 4bbfdb6e4b..6cf577e87e 100644
--- a/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue
+++ b/kolibri/plugins/learn/assets/src/my_downloads/views/DownloadsList/index.vue
@@ -63,10 +63,13 @@
                     :color="download.status === 'PENDING' ? $themeTokens.annotation : null"
                     class="icon"
                   />
-                  <KCircularLoader
-                    v-if="download.status === 'IN_PROGRESS'"
-                    class="icon"
-                  />
+                  <div v-if="download.status === 'IN_PROGRESS'" class="inline-loader">
+                    <KCircularLoader
+                      :size="20"
+                      :disableDefaultTransition="true"
+                      class="icon"
+                    />
+                  </div>
                   <span class="status-text">{{ formattedDownloadStatus(download) }} </span>
                 </div>
               </td>
@@ -83,10 +86,13 @@
                   :color="download.status === 'PENDING' ? $themeTokens.annotation : null"
                   class="icon"
                 />
-                <KCircularLoader
-                  v-if="download.status === 'IN_PROGRESS'"
-                  class="icon"
-                />
+                <div v-if="download.status === 'IN_PROGRESS'" class="inline-loader">
+                  <KCircularLoader
+                    :size="20"
+                    :disableDefaultTransition="true"
+                    class="icon"
+                  />
+                </div>
                 <span class="status-text">{{ formattedDownloadStatus(download) }} </span>
               </td>
               <td class="resource-action">
@@ -425,8 +431,14 @@
   }
 
   .small-screen-status {
-    margin: 0 48px;
+    margin: 0 0 0 48px;
     font-size: 12px;
   }
 
+  .inline-loader {
+    display: inline-block;
+    margin-left: 0;
+    vertical-align: bottom;
+  }
+
 </style>
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
index aacf98e5ba..f28bc48de0 100644
--- a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
@@ -458,11 +458,11 @@
         }
       },
       gridOffset() {
-        const marginTop =
+        const paddingTop =
           !this.windowIsLarge && (this.isLocalLibraryEmpty || this.deviceId) ? '140px' : '110px';
         return this.isRtl
-          ? { marginRight: `${this.sidePanelWidth + 24}px`, marginTop }
-          : { marginLeft: `${this.sidePanelWidth + 24}px`, marginTop };
+          ? { paddingRight: `${this.sidePanelWidth + 24}px`, paddingTop }
+          : { paddingLeft: `${this.sidePanelWidth + 24}px`, paddingTop };
       },
       sidePanelWidth() {
         if (
@@ -605,9 +605,9 @@
   }
 
   .main-grid {
-    margin-top: 110px;
-    margin-right: 24px;
-    margin-bottom: 96px;
+    padding-top: 110px;
+    padding-right: 24px;
+    padding-bottom: 96px;
   }
 
   .channels-label {
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
index b1a8e18001..875293ff54 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
@@ -5,8 +5,6 @@
     class="main-wrapper"
   >
 
-    <div v-if="blockDoubleClicks" class="click-mask"></div>
-
     <SkipNavigationLink />
     <LearningActivityBar
       ref="activityBar"
@@ -380,7 +378,6 @@
     computed: {
       ...mapState({
         error: state => state.core.error,
-        blockDoubleClicks: state => state.core.blockDoubleClicks,
       }),
       isCoachContent() {
         return this.content && this.content.coach_content ? 1 : 0;
@@ -734,15 +731,6 @@
     outline-style: none !important;
   }
 
-  .click-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 24;
-    width: 100%;
-    height: 100%;
-  }
-
   .loader {
     position: fixed;
     right: 0;
diff --git a/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue b/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue
index 1f3599e7da..07fdbc8dff 100644
--- a/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue
+++ b/kolibri/plugins/pdf_viewer/assets/src/views/PdfRendererIndex.vue
@@ -84,11 +84,11 @@
           :layout8="{ span: showSideBar ? 6 : 8 }"
           :layout12="{ span: showSideBar ? 9 : 12 }"
         >
-          <RecycleList
+          <RecyclableScroller
             id="pdf-container"
             ref="recycleList"
             :items="pdfPages"
-            :itemHeight="itemHeight"
+            :buffer="itemHeight * 2"
             :emitUpdate="true"
             class="pdf-container scroller-height"
             keyField="index"
@@ -107,7 +107,7 @@
                 :eventBus="eventBus"
               />
             </template>
-          </RecycleList>
+          </RecyclableScroller>
         </KGridItem>
       </KGrid>
     </template>
@@ -123,8 +123,6 @@
   import throttle from 'lodash/throttle';
   import debounce from 'lodash/debounce';
   import logger from 'kolibri.lib.logging';
-  import { RecycleList } from 'vue-virtual-scroller';
-  import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
   // polyfill necessary for recycle list
   import 'intersection-observer';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -132,6 +130,7 @@
   import CoreFullscreen from 'kolibri.coreVue.components.CoreFullscreen';
   import '../utils/domPolyfills';
   import { EventBus } from '../utils/event_utils';
+  import RecyclableScroller from './RecyclableScroller';
   import PdfPage from './PdfPage';
   import SideBar from './SideBar';
 
@@ -146,8 +145,8 @@
     components: {
       SideBar,
       PdfPage,
-      RecycleList,
       CoreFullscreen,
+      RecyclableScroller,
     },
     mixins: [commonCoreStrings],
     setup() {
@@ -296,42 +295,38 @@
       };
       this.eventBus = new EventBus();
       this.prepComponentData = loadingPdf.promise
-        .then(pdfDocument => {
+        .then(async pdfDocument => {
           // Get initial info from the loaded pdf document
           this.pdfDocument = pdfDocument;
           this.totalPages = this.pdfDocument.numPages;
+          // Is either the first page or the saved last page visited
+          const firstPageToRender = parseInt(this.getSavedPosition() * this.totalPages);
+
+          const firstPage = await this.getPage(firstPageToRender + 1);
+          const viewPort = firstPage.getViewport({ scale: 1 });
+          this.firstPageHeight = viewPort.height;
+          this.firstPageWidth = viewPort.width;
+          this.scale = this.$el.clientWidth / (this.firstPageWidth * this.screenSizeMultiplier);
+
           // init pdfPages array
+          // ensuring that firstPageToRender is resolved so that we do not refetch the page
           for (let i = 0; i < this.totalPages; i++) {
             this.pdfPages.push({
-              page: null,
-              resolved: false,
+              page: i == firstPageToRender ? firstPage : null,
+              resolved: i == firstPageToRender,
+              size: () => {
+                return this.firstPageHeight * this.scale + MARGIN;
+              },
               index: i,
             });
           }
-          // Is either the first page or the saved last page visited
-          const firstPageToRender = parseInt(this.getSavedPosition() * this.totalPages);
-          return this.getPage(firstPageToRender + 1).then(firstPage => {
-            const viewPort = firstPage.getViewport({ scale: 1 });
-            this.firstPageHeight = viewPort.height;
-            this.firstPageWidth = viewPort.width;
-            this.scale = this.$el.clientWidth / (this.firstPageWidth * this.screenSizeMultiplier);
-
-            // Set the firstPageToRender into the pdfPages object so that we do not refetch the page
-            // from PDFJS when we do our initial render
-            // splice so changes are detected
-            this.pdfPages.splice(firstPageToRender, 1, {
-              ...this.pdfPages[firstPageToRender],
-              page: firstPage,
-              resolved: true,
-            });
-            pdfDocument.getOutline().then(outline => {
-              this.outline = outline;
-              this.showSideBar = outline && outline.length > 0 && this.windowIsLarge; // Remove if other tabs are already implemented
-              // Reduce the scale slightly if we are showing the sidebar
-              // at first load.
-              this.scale = this.showSideBar ? 0.75 * this.scale : this.scale;
-            });
-          });
+
+          const outline = await pdfDocument.getOutline();
+          this.outline = outline;
+          this.showSideBar = outline && outline.length > 0 && this.windowIsLarge; // Remove if other tabs are already implemented
+          // Reduce the scale slightly if we are showing the sidebar
+          // at first load.
+          this.scale = this.showSideBar ? 0.75 * this.scale : this.scale;
         })
         .catch(error => {
           this.reportLoadingError(error);
@@ -379,11 +374,16 @@
         if (pageNum > 0 && pageNum <= this.totalPages && !this.pdfPages[pageNum - 1].resolved) {
           const pageIndex = pageNum - 1;
           this.getPage(pageNum).then(pdfPage => {
+            const { height } = pdfPage.getViewport({ scale: 1 });
+
             // splice so changes are detected
             this.pdfPages.splice(pageIndex, 1, {
               ...this.pdfPages[pageIndex],
               page: pdfPage,
               resolved: true,
+              size: () => {
+                return height * this.scale + MARGIN;
+              },
             });
           });
         }
@@ -703,8 +703,8 @@
     margin: 0 auto;
   }
   // enable horizontal scrolling
-  /deep/ .recycle-list {
-    .item-wrapper {
+  /deep/ .vue-recycle-scroller {
+    .vue-recycle-scroller-item-wrapper {
       overflow-x: auto;
     }
   }
@@ -748,4 +748,19 @@
     height: 100%;
   }
 
+  /deep/ .resize-observer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: -1;
+    display: block;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    pointer-events: none;
+    background-color: transparent;
+    border: 0;
+    opacity: 0;
+  }
+
 </style>
diff --git a/kolibri/plugins/pdf_viewer/assets/src/views/RecyclableScroller.vue b/kolibri/plugins/pdf_viewer/assets/src/views/RecyclableScroller.vue
new file mode 100644
index 0000000000..308e89a50a
--- /dev/null
+++ b/kolibri/plugins/pdf_viewer/assets/src/views/RecyclableScroller.vue
@@ -0,0 +1,887 @@
+<!--
+  This file has been modified to adapt the component to the needs of Kolibri
+  The original file is available at:
+  https://github.com/Akryum/vue-virtual-scroller/blob/master/packages/vue-virtual-scroller/src/components/RecycleScroller.vue
+
+  Modifications:
+    - file reformmatted
+    - class names with underscores (_) have been replaced by a hyphen (-)
+    - sizeField in variable height mode can now be a number
+      or a function returning a number (Line 264, Original 198)
+ -->
+
+
+<template>
+
+  <div
+    v-observe-visibility="handleVisibilityChange"
+    class="vue-recycle-scroller"
+    :class="{
+      ready,
+      'page-mode': pageMode,
+      [`direction-${direction}`]: true,
+    }"
+    @scroll.passive="handleScroll"
+  >
+    <div
+      v-if="$slots.before"
+      ref="before"
+      class="vue-recycle-scroller-slot"
+    >
+      <slot
+        name="before"
+      ></slot>
+    </div>
+
+    <component
+      :is="listTag"
+      ref="wrapper"
+      :style="{ [direction === 'vertical' ? 'minHeight' : 'minWidth']: totalSize + 'px' }"
+      class="vue-recycle-scroller-item-wrapper"
+      :class="listClass"
+    >
+      <component
+        :is="itemTag"
+        v-for="view of pool"
+        :key="view.nr.id"
+        :style="ready ? {
+          transform: `translate${direction === 'vertical' ? 'Y' : 'X'}(${view.position}px) `
+            + `translate${direction === 'vertical' ? 'X' : 'Y'}(${view.offset}px)`,
+          width: gridItems ? `${direction === 'vertical' ? itemSecondarySize ||
+            itemSize : itemSize}px` : undefined,
+          height: gridItems ? `${direction === 'horizontal' ? itemSecondarySize ||
+            itemSize : itemSize}px` : undefined,
+        } : null"
+        class="vue-recycle-scroller-item-view"
+        :class="[
+          itemClass,
+          {
+            hover: !skipHover && hoverKey === view.nr.key
+          },
+        ]"
+        v-on="skipHover ? {} : {
+          mouseenter: () => { hoverKey = view.nr.key },
+          mouseleave: () => { hoverKey = null },
+        }"
+      >
+        <slot
+          :item="view.item"
+          :index="view.nr.index"
+          :active="view.nr.used"
+        ></slot>
+      </component>
+
+      <slot
+        name="empty"
+      ></slot>
+    </component>
+
+    <div
+      v-if="$slots.after"
+      ref="after"
+      class="vue-recycle-scroller-slot"
+    >
+      <slot
+        name="after"
+      ></slot>
+    </div>
+
+    <ResizeObserver @notify="handleResize" />
+  </div>
+
+</template>
+
+
+<script>
+
+  import { ResizeObserver } from 'vue-resize';
+  import { ObserveVisibility } from 'vue-observe-visibility';
+  import ScrollParent from 'scrollparent';
+  import logger from 'kolibri.lib.logging';
+
+  const logging = logger.getLogger(__filename);
+
+  let uid = 0;
+
+  function simpleArray() {
+    return this.items.length && typeof this.items[0] !== 'object';
+  }
+
+  const props = {
+    items: {
+      type: Array,
+      required: true,
+    },
+
+    keyField: {
+      type: String,
+      default: 'id',
+    },
+
+    direction: {
+      type: String,
+      default: 'vertical',
+      validator: value => ['vertical', 'horizontal'].includes(value),
+    },
+
+    listTag: {
+      type: String,
+      default: 'div',
+    },
+
+    itemTag: {
+      type: String,
+      default: 'div',
+    },
+  };
+
+  const config = {
+    itemsLimit: 1000,
+  };
+  let supportsPassive = false;
+  if (typeof window !== 'undefined') {
+    supportsPassive = false;
+    try {
+      var opts = Object.defineProperty({}, 'passive', {
+        get() {
+          return (supportsPassive = true);
+        },
+      });
+      window.addEventListener('test', null, opts);
+    } catch (e) {
+      // pass
+    }
+  }
+
+  export default {
+    name: 'RecyclableScroller',
+
+    components: {
+      ResizeObserver,
+    },
+
+    directives: {
+      ObserveVisibility,
+    },
+
+    props: {
+      ...props,
+
+      itemSize: {
+        type: Number,
+        default: null,
+      },
+
+      gridItems: {
+        type: Number,
+        default: undefined,
+      },
+
+      itemSecondarySize: {
+        type: Number,
+        default: undefined,
+      },
+
+      minItemSize: {
+        type: [Number, String],
+        default: null,
+      },
+
+      sizeField: {
+        type: String,
+        default: 'size',
+      },
+
+      typeField: {
+        type: String,
+        default: 'type',
+      },
+
+      buffer: {
+        type: Number,
+        default: 200,
+      },
+
+      pageMode: {
+        type: Boolean,
+        default: false,
+      },
+
+      prerender: {
+        type: Number,
+        default: 0,
+      },
+
+      emitUpdate: {
+        type: Boolean,
+        default: false,
+      },
+
+      skipHover: {
+        type: Boolean,
+        default: false,
+      },
+
+      listTag: {
+        type: String,
+        default: 'div',
+      },
+
+      itemTag: {
+        type: String,
+        default: 'div',
+      },
+
+      listClass: {
+        type: [String, Object, Array],
+        default: '',
+      },
+
+      itemClass: {
+        type: [String, Object, Array],
+        default: '',
+      },
+    },
+
+    data() {
+      return {
+        pool: [],
+        totalSize: 0,
+        ready: false,
+        hoverKey: null,
+      };
+    },
+
+    computed: {
+      sizes() {
+        if (this.itemSize === null) {
+          const sizes = {
+            '-1': { accumulator: 0 },
+          };
+          const items = this.items;
+          const field = this.sizeField;
+          const minItemSize = this.minItemSize;
+          let computedMinSize = 10000;
+          let accumulator = 0;
+          let current;
+          for (let i = 0, l = items.length; i < l; i++) {
+            // sizeField can be a number or a function returning a number
+            current =
+              (typeof items[i][field] === 'function' ? items[i][field]() : items[i][field]) ||
+              minItemSize;
+
+            if (current < computedMinSize) {
+              computedMinSize = current;
+            }
+            accumulator += current;
+            sizes[i] = { accumulator, size: current };
+          }
+          // eslint-disable-next-line
+          this.$_computedMinItemSize = computedMinSize;
+          return sizes;
+        }
+        return [];
+      },
+
+      simpleArray,
+    },
+
+    watch: {
+      items() {
+        this.updateVisibleItems(true);
+      },
+
+      pageMode() {
+        this.applyPageMode();
+        this.updateVisibleItems(false);
+      },
+
+      sizes: {
+        handler() {
+          this.updateVisibleItems(false);
+        },
+        deep: true,
+      },
+
+      gridItems() {
+        this.updateVisibleItems(true);
+      },
+
+      itemSecondarySize() {
+        this.updateVisibleItems(true);
+      },
+    },
+
+    created() {
+      this.$_startIndex = 0;
+      this.$_endIndex = 0;
+      this.$_views = new Map();
+      this.$_unusedViews = new Map();
+      this.$_scrollDirty = false;
+      this.$_lastUpdateScrollPosition = 0;
+
+      // In SSR mode, we also prerender the same number of item for the first render
+      // to avoir mismatch between server and client templates
+      if (this.prerender) {
+        this.$_prerender = true;
+        this.updateVisibleItems(false);
+      }
+
+      if (this.gridItems && !this.itemSize) {
+        logging.error('[vue-recycle-scroller] You must provide an itemSize when using gridItems');
+      }
+    },
+
+    mounted() {
+      this.applyPageMode();
+      this.$nextTick(() => {
+        // In SSR mode, render the real number of visible items
+        this.$_prerender = false;
+        this.updateVisibleItems(true);
+        this.ready = true;
+      });
+    },
+
+    activated() {
+      const lastPosition = this.$_lastUpdateScrollPosition;
+      if (typeof lastPosition === 'number') {
+        this.$nextTick(() => {
+          this.scrollToPosition(lastPosition);
+        });
+      }
+    },
+
+    beforeDestroy() {
+      this.removeListeners();
+    },
+
+    methods: {
+      addView(pool, index, item, key, type) {
+        const view = {
+          item,
+          position: 0,
+        };
+        const nonReactive = {
+          id: uid++,
+          index,
+          used: true,
+          key,
+          type,
+        };
+        Object.defineProperty(view, 'nr', {
+          configurable: false,
+          value: nonReactive,
+        });
+        pool.push(view);
+        return view;
+      },
+
+      unuseView(view, fake = false) {
+        const unusedViews = this.$_unusedViews;
+        const type = view.nr.type;
+        let unusedPool = unusedViews.get(type);
+        if (!unusedPool) {
+          unusedPool = [];
+          unusedViews.set(type, unusedPool);
+        }
+        unusedPool.push(view);
+        if (!fake) {
+          view.nr.used = false;
+          view.position = -9999;
+          this.$_views.delete(view.nr.key);
+        }
+      },
+
+      handleResize() {
+        this.$emit('resize');
+        if (this.ready) this.updateVisibleItems(false);
+      },
+
+      handleScroll() {
+        if (!this.$_scrollDirty) {
+          this.$_scrollDirty = true;
+          requestAnimationFrame(() => {
+            this.$_scrollDirty = false;
+            const { continuous } = this.updateVisibleItems(false, true);
+
+            // It seems sometimes chrome doesn't fire scroll event :/
+            // When non continous scrolling is ending, we force a refresh
+            if (!continuous) {
+              clearTimeout(this.$_refreshTimout);
+              this.$_refreshTimout = setTimeout(this.handleScroll, 100);
+            }
+          });
+        }
+      },
+
+      handleVisibilityChange(isVisible, entry) {
+        if (this.ready) {
+          if (
+            isVisible ||
+            entry.boundingClientRect.width !== 0 ||
+            entry.boundingClientRect.height !== 0
+          ) {
+            this.$emit('visible');
+            requestAnimationFrame(() => {
+              this.updateVisibleItems(false);
+            });
+          } else {
+            this.$emit('hidden');
+          }
+        }
+      },
+
+      updateVisibleItems(checkItem, checkPositionDiff = false) {
+        const itemSize = this.itemSize;
+        const gridItems = this.gridItems || 1;
+        const itemSecondarySize = this.itemSecondarySize || itemSize;
+        const minItemSize = this.$_computedMinItemSize;
+        const typeField = this.typeField;
+        const keyField = this.simpleArray ? null : this.keyField;
+        const items = this.items;
+        const count = items.length;
+        const sizes = this.sizes;
+        const views = this.$_views;
+        const unusedViews = this.$_unusedViews;
+        const pool = this.pool;
+        let startIndex, endIndex;
+        let totalSize;
+        let visibleStartIndex, visibleEndIndex;
+
+        if (!count) {
+          startIndex = endIndex = visibleStartIndex = visibleEndIndex = totalSize = 0;
+        } else if (this.$_prerender) {
+          startIndex = visibleStartIndex = 0;
+          endIndex = visibleEndIndex = Math.min(this.prerender, items.length);
+          totalSize = null;
+        } else {
+          const scroll = this.getScroll();
+
+          // Skip update if use hasn't scrolled enough
+          if (checkPositionDiff) {
+            let positionDiff = scroll.start - this.$_lastUpdateScrollPosition;
+            if (positionDiff < 0) positionDiff = -positionDiff;
+            if ((itemSize === null && positionDiff < minItemSize) || positionDiff < itemSize) {
+              return {
+                continuous: true,
+              };
+            }
+          }
+          this.$_lastUpdateScrollPosition = scroll.start;
+
+          const buffer = this.buffer;
+          scroll.start -= buffer;
+          scroll.end += buffer;
+
+          // account for leading slot
+          let beforeSize = 0;
+          if (this.$refs.before) {
+            beforeSize = this.$refs.before.scrollHeight;
+            scroll.start -= beforeSize;
+          }
+
+          // account for trailing slot
+          if (this.$refs.after) {
+            const afterSize = this.$refs.after.scrollHeight;
+            scroll.end += afterSize;
+          }
+
+          // Variable size mode
+          if (itemSize === null) {
+            let h;
+            let a = 0;
+            let b = count - 1;
+            let i = ~~(count / 2);
+            let oldI;
+
+            // Searching for startIndex
+            do {
+              oldI = i;
+              h = sizes[i].accumulator;
+              if (h < scroll.start) {
+                a = i;
+              } else if (i < count - 1 && sizes[i + 1].accumulator > scroll.start) {
+                b = i;
+              }
+              i = ~~((a + b) / 2);
+            } while (i !== oldI);
+            i < 0 && (i = 0);
+            startIndex = i;
+
+            // For container style
+            totalSize = sizes[count - 1].accumulator;
+
+            // Searching for endIndex
+            for (
+              endIndex = i;
+              endIndex < count && sizes[endIndex].accumulator < scroll.end;
+              endIndex++
+            );
+            if (endIndex === -1) {
+              endIndex = items.length - 1;
+            } else {
+              endIndex++;
+              // Bounds
+              endIndex > count && (endIndex = count);
+            }
+
+            // search visible startIndex
+            for (
+              visibleStartIndex = startIndex;
+              visibleStartIndex < count &&
+              beforeSize + sizes[visibleStartIndex].accumulator < scroll.start;
+              visibleStartIndex++
+            );
+
+            // search visible endIndex
+            for (
+              visibleEndIndex = visibleStartIndex;
+              visibleEndIndex < count &&
+              beforeSize + sizes[visibleEndIndex].accumulator < scroll.end;
+              visibleEndIndex++
+            );
+          } else {
+            // Fixed size mode
+            startIndex = ~~((scroll.start / itemSize) * gridItems);
+            const remainer = startIndex % gridItems;
+            startIndex -= remainer;
+            endIndex = Math.ceil((scroll.end / itemSize) * gridItems);
+            visibleStartIndex = Math.max(
+              0,
+              Math.floor(((scroll.start - beforeSize) / itemSize) * gridItems)
+            );
+            visibleEndIndex = Math.floor(((scroll.end - beforeSize) / itemSize) * gridItems);
+
+            // Bounds
+            startIndex < 0 && (startIndex = 0);
+            endIndex > count && (endIndex = count);
+            visibleStartIndex < 0 && (visibleStartIndex = 0);
+            visibleEndIndex > count && (visibleEndIndex = count);
+
+            totalSize = Math.ceil(count / gridItems) * itemSize;
+          }
+        }
+
+        if (endIndex - startIndex > config.itemsLimit) {
+          this.itemsLimitError();
+        }
+
+        this.totalSize = totalSize;
+
+        let view;
+
+        const continuous = startIndex <= this.$_endIndex && endIndex >= this.$_startIndex;
+
+        if (this.$_continuous !== continuous) {
+          if (continuous) {
+            views.clear();
+            unusedViews.clear();
+            for (let i = 0, l = pool.length; i < l; i++) {
+              view = pool[i];
+              this.unuseView(view);
+            }
+          }
+          this.$_continuous = continuous;
+        } else if (continuous) {
+          for (let i = 0, l = pool.length; i < l; i++) {
+            view = pool[i];
+            if (view.nr.used) {
+              // Update view item index
+              if (checkItem) {
+                view.nr.index = items.indexOf(view.item);
+              }
+
+              // Check if index is still in visible range
+              if (view.nr.index === -1 || view.nr.index < startIndex || view.nr.index >= endIndex) {
+                this.unuseView(view);
+              }
+            }
+          }
+        }
+
+        const unusedIndex = continuous ? null : new Map();
+
+        let item, type, unusedPool;
+        let v;
+        for (let i = startIndex; i < endIndex; i++) {
+          item = items[i];
+          const key = keyField ? item[keyField] : item;
+          if (key == null) {
+            throw new Error(`Key is ${key} on item (keyField is '${keyField}')`);
+          }
+          view = views.get(key);
+
+          if (!itemSize && !sizes[i].size) {
+            if (view) this.unuseView(view);
+            continue;
+          }
+
+          // No view assigned to item
+          if (!view) {
+            if (i === items.length - 1) this.$emit('scroll-end');
+            if (i === 0) this.$emit('scroll-start');
+
+            type = item[typeField];
+            unusedPool = unusedViews.get(type);
+
+            if (continuous) {
+              // Reuse existing view
+              if (unusedPool && unusedPool.length) {
+                view = unusedPool.pop();
+                view.item = item;
+                view.nr.used = true;
+                view.nr.index = i;
+                view.nr.key = key;
+                view.nr.type = type;
+              } else {
+                view = this.addView(pool, i, item, key, type);
+              }
+            } else {
+              // Use existing view
+              // We don't care if they are already used
+              // because we are not in continous scrolling
+              v = unusedIndex.get(type) || 0;
+
+              if (!unusedPool || v >= unusedPool.length) {
+                view = this.addView(pool, i, item, key, type);
+                this.unuseView(view, true);
+                unusedPool = unusedViews.get(type);
+              }
+
+              view = unusedPool[v];
+              view.item = item;
+              view.nr.used = true;
+              view.nr.index = i;
+              view.nr.key = key;
+              view.nr.type = type;
+              unusedIndex.set(type, v + 1);
+              v++;
+            }
+            views.set(key, view);
+          } else {
+            view.nr.used = true;
+            view.item = item;
+          }
+
+          // Update position
+          if (itemSize === null) {
+            view.position = sizes[i - 1].accumulator;
+            view.offset = 0;
+          } else {
+            view.position = Math.floor(i / gridItems) * itemSize;
+            view.offset = (i % gridItems) * itemSecondarySize;
+          }
+        }
+
+        this.$_startIndex = startIndex;
+        this.$_endIndex = endIndex;
+
+        if (this.emitUpdate)
+          this.$emit('update', startIndex, endIndex, visibleStartIndex, visibleEndIndex);
+
+        // After the user has finished scrolling
+        // Sort views so text selection is correct
+        clearTimeout(this.$_sortTimer);
+        this.$_sortTimer = setTimeout(this.sortViews, 300);
+
+        return {
+          continuous,
+        };
+      },
+
+      getListenerTarget() {
+        let target = ScrollParent(this.$el);
+        // Fix global scroll target for Chrome and Safari
+        if (
+          window.document &&
+          (target === window.document.documentElement || target === window.document.body)
+        ) {
+          target = window;
+        }
+        return target;
+      },
+
+      getScroll() {
+        const { $el: el, direction } = this;
+        const isVertical = direction === 'vertical';
+        let scrollState;
+
+        if (this.pageMode) {
+          const bounds = el.getBoundingClientRect();
+          const boundsSize = isVertical ? bounds.height : bounds.width;
+          let start = -(isVertical ? bounds.top : bounds.left);
+          let size = isVertical ? window.innerHeight : window.innerWidth;
+          if (start < 0) {
+            size += start;
+            start = 0;
+          }
+          if (start + size > boundsSize) {
+            size = boundsSize - start;
+          }
+          scrollState = {
+            start,
+            end: start + size,
+          };
+        } else if (isVertical) {
+          scrollState = {
+            start: el.scrollTop,
+            end: el.scrollTop + el.clientHeight,
+          };
+        } else {
+          scrollState = {
+            start: el.scrollLeft,
+            end: el.scrollLeft + el.clientWidth,
+          };
+        }
+
+        return scrollState;
+      },
+
+      applyPageMode() {
+        if (this.pageMode) {
+          this.addListeners();
+        } else {
+          this.removeListeners();
+        }
+      },
+
+      addListeners() {
+        this.listenerTarget = this.getListenerTarget();
+        this.listenerTarget.addEventListener(
+          'scroll',
+          this.handleScroll,
+          supportsPassive
+            ? {
+                passive: true,
+              }
+            : false
+        );
+        this.listenerTarget.addEventListener('resize', this.handleResize);
+      },
+
+      removeListeners() {
+        if (!this.listenerTarget) {
+          return;
+        }
+
+        this.listenerTarget.removeEventListener('scroll', this.handleScroll);
+        this.listenerTarget.removeEventListener('resize', this.handleResize);
+
+        this.listenerTarget = null;
+      },
+
+      // scrollToItem (index) {
+      //   let scroll
+      //   if (this.itemSize === null) {
+      //     scroll = index > 0 ? this.sizes[index - 1].accumulator : 0
+      //   } else {
+      //     scroll = Math.floor(index / this.gridItems) * this.itemSize
+      //   }
+      //   this.scrollToPosition(scroll)
+      // },
+
+      scrollToPosition(position) {
+        const direction =
+          this.direction === 'vertical'
+            ? { scroll: 'scrollTop', start: 'top' }
+            : { scroll: 'scrollLeft', start: 'left' };
+
+        let viewport;
+        let scrollDirection;
+        let scrollDistance;
+
+        if (this.pageMode) {
+          const viewportEl = ScrollParent(this.$el);
+          // HTML doesn't overflow like other elements
+          const scrollTop = viewportEl.tagName === 'HTML' ? 0 : viewportEl[direction.scroll];
+          const bounds = viewportEl.getBoundingClientRect();
+
+          const scroller = this.$el.getBoundingClientRect();
+          const scrollerPosition = scroller[direction.start] - bounds[direction.start];
+
+          viewport = viewportEl;
+          scrollDirection = direction.scroll;
+          scrollDistance = position + scrollTop + scrollerPosition;
+        } else {
+          viewport = this.$el;
+          scrollDirection = direction.scroll;
+          scrollDistance = position;
+        }
+
+        viewport[scrollDirection] = scrollDistance;
+      },
+
+      itemsLimitError() {
+        setTimeout(() => {
+          logging.debug(
+            "It seems the scroller element isn't scrolling, so it tries to render all the items at once.",
+            'Scroller:',
+            this.$el
+          );
+          logging.debug(
+            "Make sure the scroller has a fixed height (or width) and 'overflow-y' (or 'overflow-x') set to 'auto' so it can scroll correctly and only render the items visible in the scroll viewport."
+          );
+        });
+        throw new Error('Rendered items limit reached');
+      },
+
+      sortViews() {
+        this.pool.sort((viewA, viewB) => viewA.nr.index - viewB.nr.index);
+      },
+    },
+  };
+
+</script>
+
+
+<style>
+  .vue-recycle-scroller {
+    position: relative;
+  }
+
+  .vue-recycle-scroller.direction-vertical:not(.page-mode) {
+    overflow-y: auto;
+  }
+
+  .vue-recycle-scroller.direction-horizontal:not(.page-mode) {
+    overflow-x: auto;
+  }
+
+  .vue-recycle-scroller.direction-horizontal {
+    display: flex;
+  }
+
+  .vue-recycle-scroller-slot {
+    flex: auto 0 0;
+  }
+
+  .vue-recycle-scroller-item-wrapper {
+    flex: 1;
+    box-sizing: border-box;
+    overflow: hidden;
+    position: relative;
+  }
+
+  .vue-recycle-scroller.ready .vue-recycle-scroller-item-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    will-change: transform;
+  }
+
+  .vue-recycle-scroller.direction-vertical .vue-recycle-scroller-item-wrapper {
+    width: 100%;
+  }
+
+  .vue-recycle-scroller.direction-horizontal .vue-recycle-scroller-item-wrapper {
+    height: 100%;
+  }
+
+  .vue-recycle-scroller.ready.direction-vertical .vue-recycle-scroller-item-view {
+    width: 100%;
+  }
+
+  .vue-recycle-scroller.ready.direction-horizontal .vue-recycle-scroller-item-view {
+    height: 100%;
+  }
+</style>
diff --git a/kolibri/plugins/pdf_viewer/package.json b/kolibri/plugins/pdf_viewer/package.json
index 14b2e9dc31..764765a6c1 100644
--- a/kolibri/plugins/pdf_viewer/package.json
+++ b/kolibri/plugins/pdf_viewer/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "intersection-observer": "0.12.2",
     "pdfjs-dist": "^2.16.105",
-    "vue-virtual-scroller": "0.12.0",
+    "vue-virtual-scroller": "1.1.2",
     "web-streams-polyfill": "^4.0.0"
   }
 }
diff --git a/kolibri/plugins/policies/assets/src/app.js b/kolibri/plugins/policies/assets/src/app.js
index b48824c7f2..08912ebb37 100644
--- a/kolibri/plugins/policies/assets/src/app.js
+++ b/kolibri/plugins/policies/assets/src/app.js
@@ -1,4 +1,3 @@
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import routes from './routes';
 import pluginModule from './modules/pluginModule';
 import KolibriApp from 'kolibri_app';
@@ -7,9 +6,6 @@ class PoliciesModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }
diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/DefaultLanguageForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/DefaultLanguageForm.vue
index ef1854ca6c..24cda2f506 100644
--- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/DefaultLanguageForm.vue
+++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/DefaultLanguageForm.vue
@@ -1,10 +1,12 @@
 <template>
 
   <OnboardingStepBase
+    ref="container"
     :title="$tr('languageFormHeader')"
     @continue="handleSubmit"
+    @resize="updateWidth"
   >
-    <LanguageSwitcherList />
+    <LanguageSwitcherList :parentBreakpoint="parentBreakpoint" />
   </OnboardingStepBase>
 
 </template>
@@ -21,11 +23,41 @@
       OnboardingStepBase,
       LanguageSwitcherList,
     },
+    data() {
+      return {
+        parentBreakpoint: 4,
+      };
+    },
+    mounted() {
+      this.updateWidth();
+      window.addEventListener('resize', this.updateWidth);
+    },
+    beforeDestroy() {
+      window.removeEventListener('resize', this.updateWidth);
+    },
     inject: ['wizardService'],
     methods: {
       handleSubmit() {
         this.wizardService.send('CONTINUE');
       },
+      updateWidth() {
+        const element = this.$refs.container.$el;
+        const width = element.offsetWidth;
+        let num = 4;
+
+        if (width < 440) {
+          num = 0;
+        } else if (width < 520) {
+          num = 1;
+        } else if (width < 600) {
+          num = 2;
+        } else if (width < 660) {
+          num = 3;
+        } else {
+          num = 4;
+        }
+        this.parentBreakpoint = num;
+      },
     },
     $trs: {
       languageFormHeader: {
diff --git a/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue b/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
index 0c3d19daf0..6c04e1511f 100644
--- a/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/SignInPage/index.vue
@@ -339,6 +339,7 @@
         // and forth
         this.usernameBlurred = false;
         this.passwordBlurred = false;
+        this.usernameSubmittedWithoutPassword = false;
         this.loginError = null;
       },
       // Sets the selected list user and/or logs them in
diff --git a/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue b/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue
index fbdb18373c..bac2199e5e 100644
--- a/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue
+++ b/kolibri/plugins/user_auth/assets/src/views/UserAuthLayout.vue
@@ -6,8 +6,6 @@
     :style="mainWrapperStyles"
   >
 
-    <div v-if="blockDoubleClicks" class="click-mask"></div>
-
     <div
       v-if="!loading"
       class="scrolling-pane"
@@ -89,7 +87,6 @@
       ...mapState({
         error: state => state.core.error,
         loading: state => state.core.loading,
-        blockDoubleClicks: state => state.core.blockDoubleClicks,
       }),
       isAuthorized() {
         return !(
@@ -168,15 +165,6 @@
     overflow-x: auto;
   }
 
-  .click-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 24;
-    width: 100%;
-    height: 100%;
-  }
-
   .debug {
     font-family: monospace;
     font-size: large;
diff --git a/kolibri/plugins/user_profile/assets/src/app.js b/kolibri/plugins/user_profile/assets/src/app.js
index 0fce9ef7fb..522dd1aa59 100644
--- a/kolibri/plugins/user_profile/assets/src/app.js
+++ b/kolibri/plugins/user_profile/assets/src/app.js
@@ -1,5 +1,4 @@
 import router from 'kolibri.coreVue.router';
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import routes from './routes';
 import pluginModule from './modules/pluginModule';
 import KolibriApp from 'kolibri_app';
@@ -8,9 +7,6 @@ class UserProfileModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }
diff --git a/kolibri/utils/conf.py b/kolibri/utils/conf.py
index 1b86834c21..e6eb04500c 100644
--- a/kolibri/utils/conf.py
+++ b/kolibri/utils/conf.py
@@ -25,6 +25,7 @@
 #: Absolute path of the main user data directory.
 #: Will be created automatically if it doesn't exist.
 KOLIBRI_HOME = os.path.abspath(os.path.expanduser(os.environ["KOLIBRI_HOME"]))
+NO_FILE_BASED_LOGGING = os.environ.get("KOLIBRI_NO_FILE_BASED_LOGGING", False)
 
 # Creating KOLIBRI_HOME atm. has to happen here as for instance utils.cli is not
 # called through py.test. This file is the first basic entry point of
@@ -39,7 +40,7 @@
 
 # Create a folder named logs inside KOLIBRI_HOME to store all the log files.
 LOG_ROOT = os.path.join(KOLIBRI_HOME, "logs")
-if not os.path.exists(LOG_ROOT):
+if not os.path.exists(LOG_ROOT) and not NO_FILE_BASED_LOGGING:
     os.mkdir(LOG_ROOT)
 
 
diff --git a/kolibri/utils/logger.py b/kolibri/utils/logger.py
index fcfa1688a5..d8c0ba68c9 100644
--- a/kolibri/utils/logger.py
+++ b/kolibri/utils/logger.py
@@ -205,6 +205,43 @@ def get_default_logging_config(LOG_ROOT, debug=False, debug_database=False):
     DEFAULT_LEVEL = "INFO" if not debug else "DEBUG"
     DATABASE_LEVEL = "INFO" if not debug_database else "DEBUG"
 
+    handlers = {
+        "console-error": {
+            "level": "ERROR",
+            "class": "kolibri.utils.logger.EncodingStreamHandler",
+            "formatter": "color",
+            "stream": "ext://sys.stderr",
+        },
+        "console": {
+            "level": DEFAULT_LEVEL,
+            "filters": ["no_exceptions"],
+            "class": "kolibri.utils.logger.EncodingStreamHandler",
+            "formatter": "color",
+            "stream": "ext://sys.stdout",
+        },
+    }
+
+    if not NO_FILE_BASED_LOGGING:
+        handlers["file"] = {
+            "level": "INFO",
+            "filters": [],
+            "class": "kolibri.utils.logger.KolibriTimedRotatingFileHandler",
+            "filename": os.path.join(LOG_ROOT, "kolibri.txt"),
+            "formatter": "simple_date",
+            "when": "midnight",
+            "backupCount": 30,
+            "encoding": "utf-8",
+        }
+
+        handlers["file_debug"] = {
+            "level": "DEBUG",
+            "filters": ["require_debug_true"],
+            "class": "logging.FileHandler",
+            "filename": os.path.join(LOG_ROOT, "debug.txt"),
+            "formatter": "simple_date",
+            "encoding": "utf-8",
+        }
+
     return {
         "version": 1,
         "disable_existing_loggers": False,
@@ -223,39 +260,7 @@ def get_default_logging_config(LOG_ROOT, debug=False, debug_database=False):
                 "log_colors": LOG_COLORS,
             },
         },
-        "handlers": {
-            "console-error": {
-                "level": "ERROR",
-                "class": "kolibri.utils.logger.EncodingStreamHandler",
-                "formatter": "color",
-                "stream": "ext://sys.stderr",
-            },
-            "console": {
-                "level": DEFAULT_LEVEL,
-                "filters": ["no_exceptions"],
-                "class": "kolibri.utils.logger.EncodingStreamHandler",
-                "formatter": "color",
-                "stream": "ext://sys.stdout",
-            },
-            "file": {
-                "level": "INFO",
-                "filters": [],
-                "class": "kolibri.utils.logger.KolibriTimedRotatingFileHandler",
-                "filename": os.path.join(LOG_ROOT, "kolibri.txt"),
-                "formatter": "simple_date",
-                "when": "midnight",
-                "backupCount": 30,
-                "encoding": "utf-8",
-            },
-            "file_debug": {
-                "level": "DEBUG",
-                "filters": ["require_debug_true"],
-                "class": "logging.FileHandler",
-                "filename": os.path.join(LOG_ROOT, "debug.txt"),
-                "formatter": "simple_date",
-                "encoding": "utf-8",
-            },
-        },
+        "handlers": handlers,
         "loggers": {
             "": {
                 "handlers": DEFAULT_HANDLERS,
diff --git a/packages/browserslist-config-kolibri/package.json b/packages/browserslist-config-kolibri/package.json
index 284b10b055..cdeeac9898 100644
--- a/packages/browserslist-config-kolibri/package.json
+++ b/packages/browserslist-config-kolibri/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browserslist-config-kolibri",
-  "version": "0.16.0-dev.7",
+  "version": "0.16.1-dev.1",
   "description": "Browsers list configuration for Kolibri",
   "main": "index.js",
   "repository": "github.com/learningequality/kolibri",
diff --git a/packages/eslint-plugin-kolibri/package.json b/packages/eslint-plugin-kolibri/package.json
index 97bd968e82..66a53df236 100644
--- a/packages/eslint-plugin-kolibri/package.json
+++ b/packages/eslint-plugin-kolibri/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-kolibri",
-  "version": "0.16.0-dev.7",
+  "version": "0.16.1-dev.1",
   "description": "Custom rules.",
   "author": "Learning Equality",
   "main": "lib/index.js",
diff --git a/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue b/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue
index e4d498d016..3943f77a03 100644
--- a/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue
+++ b/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue
@@ -90,8 +90,8 @@
           // if we only include one of the keys for the extra_settings object
           client({ method: 'GET', url: this.settingsUrl })
             .then(({ data }) => {
-              logging.log('mounted', isMetered);
-              logging.log(data);
+              logging.info('mounted', isMetered);
+              logging.info(data);
               this.extra_settings = data.extra_settings;
               this.selected = this.extra_settings.allow_download_on_metered_connection
                 ? Options.USE_METERED
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index fbb843b419..7836906168 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kolibri",
-  "version": "0.16.0-dev.7",
+  "version": "0.16.1-dev.1",
   "description": "The Kolibri core API",
   "repository": "github.com/learningequality/kolibri",
   "author": "Learning Equality",
@@ -33,7 +33,7 @@
     "screenfull": "^5.2.0",
     "tinycolor2": "^1.6.0",
     "ua-parser-js": "^1.0.37",
-    "vue": "^2.6.14",
+    "vue": "2.6.14",
     "vue-intl": "3.1.0",
     "vue-meta": "^2.4.0",
     "vue-router": "^3.6.5",
diff --git a/packages/kolibri-tools/lib/cli.js b/packages/kolibri-tools/lib/cli.js
index 67788c24eb..5a7b161a2d 100755
--- a/packages/kolibri-tools/lib/cli.js
+++ b/packages/kolibri-tools/lib/cli.js
@@ -287,6 +287,10 @@ program
     }
     if (options.watchonly.length) {
       const unwatchedBundles = [];
+      // Watch core for changes if KDS option is provided; all KDS components are linked to core.
+      if (options.requireKdsPath && !options.watchonly.includes('core')) {
+        options.watchonly.push('core');
+      }
       const findModuleName = bundleDatum => {
         return !options.watchonly.some(m => bundleDatum.module_path.includes(m));
       };
@@ -366,7 +370,7 @@ program
       const Minimatch = require('minimatch').Minimatch;
       patternCheck = new Minimatch(options.pattern, {});
     }
-    const glob = require('glob');
+    const glob = require('./glob');
     const { logging, lint, noChange } = require('./lint');
     const chokidar = require('chokidar');
     const watchMode = options.monitor;
@@ -457,7 +461,7 @@ program
     if (!files.length) {
       program.command('compress').help();
     } else {
-      const glob = require('glob');
+      const glob = require('./glob');
       const compressFile = require('./compress');
       Promise.all(
         files.map(file => {
diff --git a/packages/kolibri-tools/lib/glob.js b/packages/kolibri-tools/lib/glob.js
new file mode 100644
index 0000000000..671527aa65
--- /dev/null
+++ b/packages/kolibri-tools/lib/glob.js
@@ -0,0 +1,35 @@
+const fastGlob = require('fast-glob');
+
+const defaultOptions = {
+  ignore: [],
+  expandDirectories: true,
+  braceExpansion: true,
+  dot: false,
+  extglob: true,
+  globstar: true,
+  caseSensitiveMatch: true,
+};
+
+/**
+ * Small wrapper around glob dependency to make it easier to switch to a different library
+ */
+module.exports = {
+  /**
+   * Synchronously search for files that match a glob pattern
+   * @param {string|string[]} globPaths
+   * @param {object} options - see fast-glob options
+   * @returns {string[]}
+   */
+  sync(globPaths, options = {}) {
+    if (Array.isArray(globPaths)) {
+      globPaths = [...new Set(globPaths)];
+    } else {
+      globPaths = [globPaths];
+    }
+
+    return fastGlob.sync(globPaths, {
+      ...defaultOptions,
+      ...options,
+    });
+  },
+};
diff --git a/packages/kolibri-tools/lib/i18n/SyncContext.js b/packages/kolibri-tools/lib/i18n/SyncContext.js
index 527b571534..87014e84e9 100644
--- a/packages/kolibri-tools/lib/i18n/SyncContext.js
+++ b/packages/kolibri-tools/lib/i18n/SyncContext.js
@@ -1,10 +1,10 @@
 // Import packages
 const fs = require('fs');
 const path = require('path');
-const glob = require('glob');
 const traverse = require('ast-traverse');
 const get = require('lodash/get');
 const vueCompiler = require('vue-template-compiler');
+const glob = require('../glob');
 const logging = require('../logging');
 const { insertContent } = require('../vueTools');
 const {
diff --git a/packages/kolibri-tools/lib/i18n/astUtils.js b/packages/kolibri-tools/lib/i18n/astUtils.js
index 308e1d84c8..5a0540a262 100644
--- a/packages/kolibri-tools/lib/i18n/astUtils.js
+++ b/packages/kolibri-tools/lib/i18n/astUtils.js
@@ -8,7 +8,7 @@ const get = require('lodash/get');
 const isPlainObject = require('lodash/isPlainObject');
 const isString = require('lodash/isString');
 const isArray = require('lodash/isArray');
-const { glob } = require('glob');
+const glob = require('../glob');
 const logging = require('../logging');
 const { resolve } = require('../alias_import_resolver');
 const { CONTEXT_LINE } = require('./constants');
diff --git a/packages/kolibri-tools/lib/i18n/utils.js b/packages/kolibri-tools/lib/i18n/utils.js
index f82ef57b3c..912aea9c7e 100644
--- a/packages/kolibri-tools/lib/i18n/utils.js
+++ b/packages/kolibri-tools/lib/i18n/utils.js
@@ -1,10 +1,10 @@
 const fs = require('fs');
 const path = require('path');
-const glob = require('glob');
 const intersection = require('lodash/intersection');
 const { parse } = require('csv-parse/sync');
 const { lint } = require('kolibri-tools/lib/lint');
 const { addAliases, resetAliases } = require('kolibri-tools/lib/alias_import_resolver');
+const glob = require('../glob');
 const logging = require('../logging');
 
 /*
diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
index 984394b3e2..cdf9bbd226 100644
--- a/packages/kolibri-tools/package.json
+++ b/packages/kolibri-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kolibri-tools",
-  "version": "0.16.0-dev.7",
+  "version": "0.16.1-dev.1",
   "description": "Tools for building Kolibri frontend plugins",
   "main": "lib/cli.js",
   "repository": "github.com/learningequality/kolibri",
@@ -24,7 +24,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
-    "browserslist-config-kolibri": "0.16.0-dev.7",
+    "browserslist-config-kolibri": "0.16.1-dev.1",
     "chalk": "4.1.2",
     "check-node-version": "^4.2.1",
     "chokidar": "^3.6.0",
@@ -42,13 +42,13 @@
     "eslint-config-vue": "^2.0.2",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^23.3.0",
-    "eslint-plugin-kolibri": "0.16.0-dev.7",
+    "eslint-plugin-kolibri": "0.16.1-dev.1",
     "eslint-plugin-jest-dom": "^5.1.0",
     "eslint-plugin-vue": "^7.3.0",
     "espree": "10.0.1",
     "esquery": "^1.5.0",
     "express": "^4.18.3",
-    "glob": "^10.3.10",
+    "fast-glob": "^3.3.2",
     "htmlhint": "^1.1.4",
     "ini": "^4.1.2",
     "jest": "^29.7.0",
@@ -89,7 +89,7 @@
     "vue-jest": "^3.0.0",
     "vue-loader": "^15.11.1",
     "vue-style-loader": "^4.1.3",
-    "vue-template-compiler": "^2.6.11",
+    "vue-template-compiler": "2.6.14",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4",
diff --git a/yarn.lock b/yarn.lock
index 2086de5d3e..833adf2bfa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5550,7 +5550,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.12, fast-glob@^3.2.9:
+fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -5981,7 +5981,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.10, glob@^10.3.7:
+glob@^10.3.7:
   version "10.3.10"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
   integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
@@ -7139,9 +7139,9 @@ istanbul-reports@^3.1.3:
     istanbul-lib-report "^3.0.0"
 
 jackspeak@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.5.tgz#443f237f9eeeb0d7c6ec34835ef5289bb4acb068"
-  integrity sha512-Ratx+B8WeXLAtRJn26hrhY8S1+Jz6pxPMrkrdkgb/NstTNiqMhX0/oFVu5wX+g5n6JlEu2LPsDJmY8nRP4+alw==
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
   optionalDependencies:
@@ -8253,9 +8253,9 @@ minimatch@^5.0.1:
     brace-expansion "^2.0.1"
 
 minimatch@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
-  integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -8345,9 +8345,9 @@ minipass@^4.0.0:
     yallist "^4.0.0"
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.1.tgz#dff63464407cd8b83d7f008c0f116fa8c9b77ebf"
-  integrity sha512-NQ8MCKimInjVlaIqx51RKJJB7mINVkLTJbsZKmto4UAAOC/CWXES8PGaOgoBZyqoUsUA/U3DToGK7GJkkHbjJw==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
 minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -10186,9 +10186,9 @@ screenfull@^5.2.0:
   integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==
 
 scrollparent@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/scrollparent/-/scrollparent-2.0.1.tgz#715d5b9cc57760fb22bdccc3befb5bfe06b1a317"
-  integrity sha1-cV1bnMV3YPsivczDvvtb/gaxoxc=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/scrollparent/-/scrollparent-2.1.0.tgz#6cae915c953835886a6ba0d77fdc2bb1ed09076d"
+  integrity sha512-bnnvJL28/Rtz/kz2+4wpBjHzWoEzXhVg/TE8BeVGJHUqE8THNIRnDxDWMktwM+qahvlRdvlLdsQfYe+cuqfZeA==
 
 scss-parser@^1.0.6:
   version "1.0.6"
@@ -10395,9 +10395,9 @@ signal-exit@^3.0.7:
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 signal-exit@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.1.tgz#96a61033896120ec9335d96851d902cc98f0ba2a"
-  integrity sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 simple-markdown@^0.2.1:
   version "0.2.2"
@@ -10796,9 +10796,9 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0:
     ansi-regex "^4.1.0"
 
 strip-ansi@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
-  integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
     ansi-regex "^6.0.1"
 
@@ -11734,12 +11734,12 @@ vue-meta@^2.4.0:
   dependencies:
     deepmerge "^4.2.2"
 
-vue-observe-visibility@^0.4.1:
+vue-observe-visibility@^0.4.4:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz#878cb8ebcf3078e40807af29774e97105ebd519e"
   integrity sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q==
 
-vue-resize@^0.4.4:
+vue-resize@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-0.4.5.tgz#4777a23042e3c05620d9cbda01c0b3cc5e32dcea"
   integrity sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==
@@ -11757,7 +11757,7 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.3:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.6.11:
+vue-template-compiler@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
   integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
@@ -11770,21 +11770,21 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue-virtual-scroller@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-0.12.0.tgz#42f8fd7b299cd4d4fd1f5e14676792c229b890e2"
-  integrity sha512-01hKN99psA9Hq6zJajQc8H63sgqjpytHC8IyO+WKm6JzdVi8LeJQQqMrz5iUAFW6ZDGk+hvxaAqqcnJv+X8vYg==
+vue-virtual-scroller@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-1.1.2.tgz#b8a6362f177abf3f2149ce1eac18013c71fe353b"
+  integrity sha512-SkUyc7QHCJFB5h1Fya7LxVizlVzOZZuFVipBGHYoTK8dwLs08bIz/tclvRApYhksaJIm/nn51inzO2UjpGJPMQ==
   dependencies:
     scrollparent "^2.0.1"
-    vue-observe-visibility "^0.4.1"
-    vue-resize "^0.4.4"
+    vue-observe-visibility "^0.4.4"
+    vue-resize "^0.4.5"
 
 vue2-teleport@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vue2-teleport/-/vue2-teleport-1.0.1.tgz#1b7f9f69c1223f522cf6cd81c39b8d6019e1cf66"
   integrity sha512-hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw==
 
-vue@^2.6.14:
+vue@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
   integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==