diff --git a/.github/workflows/deploytest.yml b/.github/workflows/deploytest.yml
index d63794aaeb..8935b4f4c7 100644
--- a/.github/workflows/deploytest.yml
+++ b/.github/workflows/deploytest.yml
@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
@@ -51,7 +51,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
       uses: actions/setup-python@v4
       with:
diff --git a/.github/workflows/frontendlint.yml b/.github/workflows/frontendlint.yml
index d0a3e648f2..03bcc2f474 100644
--- a/.github/workflows/frontendlint.yml
+++ b/.github/workflows/frontendlint.yml
@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
diff --git a/.github/workflows/frontendtest.yml b/.github/workflows/frontendtest.yml
index 7489c2748a..fe5a2968a9 100644
--- a/.github/workflows/frontendtest.yml
+++ b/.github/workflows/frontendtest.yml
@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:
diff --git a/.github/workflows/pythontest.yml b/.github/workflows/pythontest.yml
index f015f7bc1e..5c7ca726ec 100644
--- a/.github/workflows/pythontest.yml
+++ b/.github/workflows/pythontest.yml
@@ -61,7 +61,7 @@ jobs:
           # Maps port 6379 on service container to the host
           - 6379:6379
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up minio
       run: |
         docker run -d -p 9000:9000 --name minio \
diff --git a/Makefile b/Makefile
index b7575fe74e..be4a0b7b51 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ migrate:
 # 4) Remove the management command from this `deploy-migrate` recipe
 # 5) Repeat!
 deploy-migrate:
-	python contentcuration/manage.py export_channels_to_kolibri_public
+	echo "Nothing to do here!"
 
 contentnodegc:
 	python contentcuration/manage.py garbage_collect
diff --git a/contentcuration/automation/__init__.py b/contentcuration/automation/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/contentcuration/automation/admin.py b/contentcuration/automation/admin.py
new file mode 100644
index 0000000000..4185d360e9
--- /dev/null
+++ b/contentcuration/automation/admin.py
@@ -0,0 +1,3 @@
+# from django.contrib import admin
+
+# Register your models here.
diff --git a/contentcuration/automation/apps.py b/contentcuration/automation/apps.py
new file mode 100644
index 0000000000..eaa1d3d4e1
--- /dev/null
+++ b/contentcuration/automation/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class AutomationConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'automation'
diff --git a/contentcuration/automation/migrations/__init__.py b/contentcuration/automation/migrations/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/contentcuration/automation/models.py b/contentcuration/automation/models.py
new file mode 100644
index 0000000000..0b4331b362
--- /dev/null
+++ b/contentcuration/automation/models.py
@@ -0,0 +1,3 @@
+# from django.db import models
+
+# Create your models here.
diff --git a/contentcuration/automation/tests.py b/contentcuration/automation/tests.py
new file mode 100644
index 0000000000..a79ca8be56
--- /dev/null
+++ b/contentcuration/automation/tests.py
@@ -0,0 +1,3 @@
+# from django.test import TestCase
+
+# Create your tests here.
diff --git a/contentcuration/automation/views.py b/contentcuration/automation/views.py
new file mode 100644
index 0000000000..fd0e044955
--- /dev/null
+++ b/contentcuration/automation/views.py
@@ -0,0 +1,3 @@
+# from django.shortcuts import render
+
+# Create your views here.
diff --git a/contentcuration/contentcuration/db/models/manager.py b/contentcuration/contentcuration/db/models/manager.py
index 4d833caf8f..db1e3a77bf 100644
--- a/contentcuration/contentcuration/db/models/manager.py
+++ b/contentcuration/contentcuration/db/models/manager.py
@@ -487,6 +487,7 @@ def _copy_tags(self, source_copy_id_map):
                 tag_id_map[tag.id] = new_tag.id
                 tags_to_create.append(new_tag)
 
+        # TODO: Can cleanup the above and change the below to use ignore_conflicts=True
         ContentTag.objects.bulk_create(tags_to_create)
 
         mappings_to_create = [
@@ -499,7 +500,10 @@ def _copy_tags(self, source_copy_id_map):
             for mapping in node_tags_mappings
         ]
 
-        self.model.tags.through.objects.bulk_create(mappings_to_create)
+        # In the case that we are copying a node that is in the weird state of having a tag
+        # that is duplicated (with a channel tag and a null channel tag) this can cause an error
+        # so we ignore conflicts here to ignore the duplicate tags.
+        self.model.tags.through.objects.bulk_create(mappings_to_create, ignore_conflicts=True)
 
     def _copy_assessment_items(self, source_copy_id_map):
         from contentcuration.models import File
diff --git a/contentcuration/contentcuration/dev_settings.py b/contentcuration/contentcuration/dev_settings.py
index d81d23a993..439bdef8af 100644
--- a/contentcuration/contentcuration/dev_settings.py
+++ b/contentcuration/contentcuration/dev_settings.py
@@ -5,4 +5,4 @@
 
 ROOT_URLCONF = "contentcuration.dev_urls"
 
-INSTALLED_APPS += ("drf_yasg",)
+INSTALLED_APPS += ("drf_yasg", "automation")
diff --git a/contentcuration/contentcuration/frontend/administration/mixins.js b/contentcuration/contentcuration/frontend/administration/mixins.js
index 262dbf3cc9..c27e933ed5 100644
--- a/contentcuration/contentcuration/frontend/administration/mixins.js
+++ b/contentcuration/contentcuration/frontend/administration/mixins.js
@@ -160,7 +160,7 @@ export const tableMixin = {
         ...this.$route.query,
       };
       if (params.sortBy) {
-        params.ordering = (params.descending ? '-' : '') + params.sortBy;
+        params.ordering = (String(params.descending) === 'true' ? '-' : '') + params.sortBy;
         delete params.sortBy;
         delete params.descending;
       }
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
index e243a8fd98..491706777c 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
@@ -146,6 +146,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      name() {
+        return this.channel.name;
+      },
       searchChannelEditorsLink() {
         return {
           name: RouteNames.USERS,
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
index a7029e2710..b867ee36e8 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
@@ -19,7 +19,7 @@
     </template>
     <LoadingText v-if="loading" absolute />
     <VCardText v-else>
-      <Banner error :value="channel.deleted" class="mb-4">
+      <Banner error :value="isDeleted" class="mb-4">
         This channel has been deleted
       </Banner>
       <VTabsItems v-model="tab">
@@ -102,6 +102,9 @@
       channel() {
         return this.getChannel(this.channelId);
       },
+      isDeleted() {
+        return this.channel && Boolean(this.channel?.deleted);
+      },
       channelWithDetails() {
         if (!this.channel || !this.details) {
           return {};
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
index 8e405ad9c8..5d9ff92c43 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
@@ -12,6 +12,7 @@
       <transition-group name="list-complete" tag="div">
         <VCard
           v-for="(item, idx) in sortedItems"
+          ref="questionCardRef"
           :key="`question-${item.assessment_id}`"
           pa-1
           class="elevation-4 list-complete-item"
@@ -333,6 +334,17 @@
         this.$analytics.trackAction('exercise_editor', 'Add', {
           eventLabel: 'Question',
         });
+        this.$nextTick(() => {
+          const questionCards = this.$refs['questionCardRef'];
+          if (questionCards?.length >= 1) {
+            const lastQuestionCard = questionCards[questionCards.length - 1].$el;
+            const editorDiv = document.getElementById('editViewId');
+            editorDiv.scrollTo({
+              top: lastQuestionCard.offsetTop,
+              behavior: 'smooth',
+            });
+          }
+        });
       },
       async deleteItem(itemToDelete) {
         if (this.isItemActive(itemToDelete)) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
index c31c922508..28290e82d6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
@@ -285,13 +285,6 @@
       if (!this.question) {
         this.openQuestion();
       }
-      // Assessments are nested inside of a scrolling panel.
-      // Instead of propagating an event all the way back to
-      // the scrolling panel, just use scrollIntoView
-      // (supported by most major browsers)
-      if (this.$el.scrollIntoView) {
-        this.$el.scrollIntoView({ behaviour: 'smooth' });
-      }
     },
     methods: {
       updateItem(payload) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
index 6c37c32c3b..cb04a42302 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
@@ -15,7 +15,7 @@
             v-on="on"
             @click="clickItem(action)"
           >
-            <Icon :color="iconColor(action)">
+            <Icon v-if="config[action] && config[action].icon" :color="iconColor(action)">
               {{ config[action].icon }}
             </Icon>
           </VBtn>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
index 3e57f48587..8ed1adce13 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue
@@ -64,6 +64,22 @@
           </VListTileAction>
         </template>
 
+        <template #copy-fail-retry-action>
+          <span v-if="hasCopyingErrored">
+            <ActionLink class="copy-retry-btn" :text="$tr('retryCopy')" @click="retryFailedCopy" />
+          </span>
+        </template>
+
+        <template #copy-fail-remove-action>
+          <IconButton
+            v-if="hasCopyingErrored"
+            icon="close"
+            :text="$tr('removeNode')"
+            size="small"
+            @click="removeFailedCopyNode"
+          />
+        </template>
+
         <template #context-menu="{ showContextMenu, positionX, positionY }">
           <ContentNodeContextMenu
             :show="showContextMenu"
@@ -81,7 +97,7 @@
 
 <script>
 
-  import { mapGetters } from 'vuex';
+  import { mapGetters, mapActions } from 'vuex';
 
   import ContentNodeListItem from './ContentNodeListItem';
   import ContentNodeOptions from './ContentNodeOptions';
@@ -89,9 +105,11 @@
   import Checkbox from 'shared/views/form/Checkbox';
   import IconButton from 'shared/views/IconButton';
   import DraggableItem from 'shared/views/draggable/DraggableItem';
-  import { COPYING_FLAG } from 'shared/data/constants';
+  import { ContentNode } from 'shared/data/resources';
   import { DragEffect, DropEffect, EffectAllowed } from 'shared/mixins/draggable/constants';
   import { DraggableRegions } from 'frontend/channelEdit/constants';
+  import { withChangeTracker } from 'shared/data/changes';
+  import { COPYING_STATUS, COPYING_STATUS_VALUES } from 'shared/data/constants';
 
   export default {
     name: 'ContentNodeEditListItem',
@@ -141,7 +159,11 @@
     },
     computed: {
       ...mapGetters('currentChannel', ['canEdit']),
-      ...mapGetters('contentNode', ['getContentNode']),
+      ...mapGetters('contentNode', [
+        'getContentNode',
+        'isNodeInCopyingState',
+        'hasNodeCopyingErrored',
+      ]),
       ...mapGetters('draggable', ['activeDraggableRegionId']),
       selected: {
         get() {
@@ -163,7 +185,10 @@
         return !this.copying;
       },
       copying() {
-        return this.contentNode[COPYING_FLAG];
+        return this.isNodeInCopyingState(this.nodeId);
+      },
+      hasCopyingErrored() {
+        return this.hasNodeCopyingErrored(this.nodeId);
       },
       dragEffect() {
         return DragEffect.SORT;
@@ -206,18 +231,57 @@
         this.selected = false;
       }
     },
+    methods: {
+      ...mapActions(['showSnackbar', 'clearSnackbar']),
+      ...mapActions('contentNode', [
+        'updateContentNode',
+        'waitForCopyingStatus',
+        'deleteContentNode',
+      ]),
+      retryFailedCopy: withChangeTracker(function(changeTracker) {
+        this.updateContentNode({
+          id: this.nodeId,
+          [COPYING_STATUS]: COPYING_STATUS_VALUES.COPYING,
+        });
+
+        this.showSnackbar({
+          duration: null,
+          text: this.$tr('creatingCopies'),
+          // TODO: determine how to cancel copying while it's in progress,
+          // TODO: if that's something we want
+          // actionText: this.$tr('cancel'),
+          // actionCallback: () => changeTracker.revert(),
+        });
+
+        ContentNode.retryCopyChange(this.nodeId);
+
+        return this.waitForCopyingStatus({
+          contentNodeId: this.nodeId,
+          startingRev: changeTracker._startingRev,
+        })
+          .then(() => {
+            this.showSnackbar({
+              text: this.$tr('copiedSnackbar'),
+              actionText: this.$tr('undo'),
+              actionCallback: () => changeTracker.revert(),
+            }).then(() => changeTracker.cleanUp());
+          })
+          .catch(() => {
+            this.clearSnackbar();
+            changeTracker.cleanUp();
+          });
+      }),
+      removeFailedCopyNode() {
+        return this.deleteContentNode(this.nodeId);
+      },
+    },
     $trs: {
       optionsTooltip: 'Options',
-      /* eslint-disable kolibri/vue-no-unused-translations */
-      /**
-       * Strings for handling copy failures
-       */
       removeNode: 'Remove',
       retryCopy: 'Retry',
       creatingCopies: 'Copying...',
       copiedSnackbar: 'Copy operation complete',
       undo: 'Undo',
-      /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };
 
@@ -298,4 +362,8 @@
     justify-content: center;
   }
 
+  .copy-retry-btn {
+    font-size: inherit;
+  }
+
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.spec.js
index 54e1547717..89c7f526fb 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.spec.js
@@ -30,7 +30,16 @@ const TOPIC_NODE = {
 
 function mountComponent(opts = {}) {
   return mount(ContentNodeListItem, {
-    store: createStore(),
+    store: createStore({
+      modules: {
+        contentNode: {
+          namespaced: true,
+          getters: {
+            isNodeInCopyingState: () => jest.fn(),
+          },
+        },
+      },
+    }),
     ...opts,
   });
 }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
index ba6d555b85..ef85e548b0 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeListItem/index.vue
@@ -167,10 +167,20 @@
                 </template>
                 <template v-else>
                   <div class="copying">
-                    <p class="caption grey--text pr-2 pt-1">
-                      {{ $tr("copyingTask") }}
+                    <p class="caption pr-3">
+                      <span
+                        class="grey--text"
+                        :style="{ 'cursor': hasCopyingErrored ? 'default' : 'progress' }"
+                      >
+                        {{ copyingMessage }}
+                      </span>
+                      <slot name="copy-fail-retry-action"></slot>
                     </p>
-                    <ContentNodeCopyTaskProgress :taskId="taskId" size="30" />
+                    <ContentNodeCopyTaskProgress
+                      :node="node"
+                      size="30"
+                    />
+                    <slot name="copy-fail-remove-action"></slot>
                   </div>
                   <div class="disabled-overlay"></div>
                 </template>
@@ -190,6 +200,7 @@
 
 <script>
 
+  import { mapGetters } from 'vuex';
   import camelCase from 'lodash/camelCase';
   import ContentNodeCopyTaskProgress from '../../views/progress/ContentNodeCopyTaskProgress';
   import ContentNodeChangedIcon from '../ContentNodeChangedIcon';
@@ -203,7 +214,6 @@
   import ContextMenuCloak from 'shared/views/ContextMenuCloak';
   import DraggableHandle from 'shared/views/draggable/DraggableHandle';
   import { titleMixin, metadataTranslationMixin } from 'shared/mixins';
-  import { COPYING_FLAG, TASK_ID } from 'shared/data/constants';
   import { EffectAllowed } from 'shared/mixins/draggable/constants';
   import ContentNodeLearningActivityIcon from 'shared/views/ContentNodeLearningActivityIcon';
 
@@ -256,6 +266,7 @@
       };
     },
     computed: {
+      ...mapGetters('contentNode', ['isNodeInCopyingState', 'hasNodeCopyingErrored']),
       isCompact() {
         return this.compact || !this.$vuetify.breakpoint.mdAndUp;
       },
@@ -290,10 +301,17 @@
         return !this.$scopedSlots['context-menu'] || this.copying;
       },
       copying() {
-        return this.node[COPYING_FLAG];
+        return this.isNodeInCopyingState(this.node.id);
       },
-      taskId() {
-        return this.node[TASK_ID];
+      hasCopyingErrored() {
+        return this.hasNodeCopyingErrored(this.node.id);
+      },
+      copyingMessage() {
+        if (this.hasCopyingErrored) {
+          return this.$tr('copyingError');
+        } else {
+          return this.$tr('copyingTask');
+        }
       },
     },
     watch: {
@@ -353,12 +371,7 @@
         '{value, number, integer} {value, plural, one {resource for coaches} other {resources for coaches}}',
       coachTooltip: 'Resource for coaches',
       copyingTask: 'Copying',
-      /* eslint-disable kolibri/vue-no-unused-translations */
-      /**
-       * String for handling copy failures
-       */
       copyingError: 'Copy failed.',
-      /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };
 
@@ -404,16 +417,15 @@
   .copying {
     z-index: 2;
     display: flex;
-    padding-top: 44px;
-    cursor: progress;
+    align-items: center;
+    align-self: center;
+    min-width: max-content;
+    pointer-events: auto;
+    cursor: default;
 
     p,
     div {
-      margin: 0 2px;
-    }
-
-    .compact & {
-      padding-top: 12px;
+      margin: 0;
     }
   }
 
@@ -466,6 +478,7 @@
   }
 
   .description-col {
+    flex-shrink: 1 !important;
     width: calc(100% - @thumbnail-width - 206px);
     word-break: break-word;
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
index 90f5c03828..32579e9f68 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
@@ -40,7 +40,6 @@
   import { mapActions, mapGetters } from 'vuex';
   import { RouteNames, TabNames } from '../constants';
   import MoveModal from './move/MoveModal';
-  import { ContentNode } from 'shared/data/resources';
   import { withChangeTracker } from 'shared/data/changes';
   import { RELATIVE_TREE_POSITIONS } from 'shared/data/constants';
 
@@ -104,8 +103,13 @@
       },
     },
     methods: {
-      ...mapActions(['showSnackbar']),
-      ...mapActions('contentNode', ['createContentNode', 'moveContentNodes', 'copyContentNode']),
+      ...mapActions(['showSnackbar', 'clearSnackbar']),
+      ...mapActions('contentNode', [
+        'createContentNode',
+        'moveContentNodes',
+        'copyContentNode',
+        'waitForCopyingStatus',
+      ]),
       ...mapActions('clipboard', ['copy']),
       newTopicNode() {
         this.trackAction('New topic');
@@ -177,7 +181,7 @@
           }
         );
       }),
-      duplicateNode: withChangeTracker(function(changeTracker) {
+      duplicateNode: withChangeTracker(async function(changeTracker) {
         this.trackAction('Copy');
         this.showSnackbar({
           duration: null,
@@ -187,19 +191,27 @@
           // actionText: this.$tr('cancel'),
           // actionCallback: () => changeTracker.revert(),
         });
-        return this.copyContentNode({
+        const copiedContentNode = await this.copyContentNode({
           id: this.nodeId,
           target: this.nodeId,
           position: RELATIVE_TREE_POSITIONS.RIGHT,
-        }).then(node => {
-          ContentNode.waitForCopying([node.id]).then(() => {
+        });
+
+        this.waitForCopyingStatus({
+          contentNodeId: copiedContentNode.id,
+          startingRev: changeTracker._startingRev,
+        })
+          .then(() => {
             this.showSnackbar({
               text: this.$tr('copiedSnackbar'),
               actionText: this.$tr('undo'),
               actionCallback: () => changeTracker.revert(),
             }).then(() => changeTracker.cleanUp());
+          })
+          .catch(() => {
+            this.clearSnackbar();
+            changeTracker.cleanUp();
           });
-        });
       }),
       trackAction(eventLabel) {
         this.$analytics.trackAction('channel_editor_node', 'Click', {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js
index 6f034cbeb1..c38a07bf02 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.spec.js
@@ -34,6 +34,7 @@ const initWrapper = ({ getters = {}, mutations = {}, actions = {}, propsData = {
           getContentNode: () => jest.fn(),
           getContentNodeChildren: () => jest.fn(),
           nodeExpanded: () => jest.fn(),
+          isNodeInCopyingState: () => jest.fn(),
           ...getters,
         },
         mutations: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
index 398d4bdc77..a4c08c1c0f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/StudioTree/StudioTree.vue
@@ -104,8 +104,9 @@
                     >
                       <ContentNodeCopyTaskProgress
                         class="progress-loader"
-                        :taskId="taskId"
+                        :node="node"
                         size="24"
+                        showTooltip
                       />
                     </VFlex>
                     <VFlex
@@ -194,7 +195,6 @@
   import DraggableItem from 'shared/views/draggable/DraggableItem';
   import DraggableHandle from 'shared/views/draggable/DraggableHandle';
   import { titleMixin } from 'shared/mixins';
-  import { COPYING_FLAG, TASK_ID } from 'shared/data/constants';
   import { DropEffect, EffectAllowed } from 'shared/mixins/draggable/constants';
   import { objectValuesValidator } from 'shared/mixins/draggable/utils';
 
@@ -263,7 +263,12 @@
       ...mapGetters('currentChannel', ['canEdit']),
       ...mapState('draggable', ['activeDraggableUniverse']),
       ...mapGetters('draggable', ['deepestActiveDraggable']),
-      ...mapGetters('contentNode', ['getContentNode', 'getContentNodeChildren', 'nodeExpanded']),
+      ...mapGetters('contentNode', [
+        'getContentNode',
+        'getContentNodeChildren',
+        'nodeExpanded',
+        'isNodeInCopyingState',
+      ]),
       node() {
         return this.getContentNode(this.nodeId);
       },
@@ -301,10 +306,7 @@
         return EffectAllowed.NONE;
       },
       copying() {
-        return this.node && this.node[COPYING_FLAG];
-      },
-      taskId() {
-        return this.node && this.node[TASK_ID];
+        return this.node && this.isNodeInCopyingState(this.node.id);
       },
       activeDropEffect() {
         // Don't allow dropping into itself
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index 526de211bd..2ea85d01b3 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -246,7 +246,7 @@
               ref="author"
               :items="authors"
               :label="$tr('authorLabel')"
-              :readonly="disableAuthEdits"
+              :disabled="disableSourceEdits"
               maxlength="200"
               counter
               autoSelectFirst
@@ -267,7 +267,7 @@
               ref="provider"
               :items="providers"
               :label="$tr('providerLabel')"
-              :readonly="disableAuthEdits"
+              :disabled="disableSourceEdits"
               maxlength="200"
               counter
               :placeholder="getPlaceholder('provider')"
@@ -288,7 +288,7 @@
               ref="aggregator"
               :items="aggregators"
               :label="$tr('aggregatorLabel')"
-              :readonly="disableAuthEdits"
+              :disabled="disableSourceEdits"
               maxlength="200"
               counter
               autoSelectFirst
@@ -309,7 +309,7 @@
               ref="license"
               v-model="licenseItem"
               :required="isUnique(license) && isUnique(license_description) && !disableAuthEdits"
-              :readonly="disableAuthEdits"
+              :disabled="disableSourceEdits"
               :placeholder="getPlaceholder('license')"
               :descriptionPlaceholder="getPlaceholder('license_description')"
               @focus="trackClick('License')"
@@ -328,7 +328,7 @@
               :rules="copyrightHolderRules"
               :placeholder="getPlaceholder('copyright_holder')"
               autoSelectFirst
-              :readonly="disableAuthEdits"
+              :disabled="disableSourceEdits"
               box
               :value="copyright_holder && copyright_holder.toString()"
               @input.native="(e) => (copyright_holder = e.srcElement.value)"
@@ -658,6 +658,9 @@
       disableAuthEdits() {
         return this.nodes.some(node => node.freeze_authoring_data);
       },
+      disableSourceEdits() {
+        return this.disableAuthEdits || this.isImported;
+      },
       detectedImportText() {
         const count = this.nodes.filter(node => node.freeze_authoring_data).length;
         return this.$tr('detectedImportText', { count });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index e3570dbc69..995072d190 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -489,13 +489,18 @@
       },
       createNodesFromUploads(fileUploads) {
         fileUploads.forEach((file, index) => {
-          const title = file.original_filename
-            .split('.')
-            .slice(0, -1)
-            .join('.');
+          let title;
+          if (file.metadata.title) {
+            title = file.metadata.title;
+          } else {
+            title = file.original_filename
+              .split('.')
+              .slice(0, -1)
+              .join('.');
+          }
           this.createNode(
             FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
-            { title }
+            { title, ...file.metadata }
           ).then(newNodeId => {
             if (index === 0) {
               this.selected = [newNodeId];
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
index f3ce855b2e..4a1e0cebb5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <VContainer ref="editview" fluid class="pa-0 wrapper" @scroll="scroll">
+  <VContainer id="editViewId" ref="editview" fluid class="pa-0 wrapper" @scroll="scroll">
     <VContainer v-if="!nodeIds.length" fluid>
       <VLayout justify-center align-center fill-height>
         <VFlex grow class="grey--text text-xs-center title">
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
index abfc2921a1..054fba2b6b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js
@@ -32,6 +32,7 @@ const GETTERS = {
     getContentNodeChildren: () => jest.fn(),
     getContentNodeAncestors: () => jest.fn(),
     getContentNode: () => jest.fn(),
+    isNodeInCopyingState: () => jest.fn(),
   },
 };
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index 15ae9413a5..5e7b868ca9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -6,6 +6,7 @@ import { metadataStrings, constantStrings } from 'shared/mixins';
 import {
   AssessmentItemTypes,
   CompletionCriteriaModels,
+  ContentModalities,
   SHORT_LONG_ACTIVITY_MIDPOINT,
   CompletionDropdownMap,
 } from 'shared/constants';
@@ -21,6 +22,7 @@ export const defaultCompletionCriteriaModels = {
   [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
   [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
   [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
+  [ContentKindsNames.ZIM]: CompletionCriteriaModels.APPROX_TIME,
   [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
 };
 
@@ -53,6 +55,11 @@ export const CompletionOptionsDropdownMap = {
     CompletionDropdownMap.determinedByResource,
     CompletionDropdownMap.reference,
   ],
+  [ContentKindsNames.ZIM]: [
+    CompletionDropdownMap.completeDuration,
+    CompletionDropdownMap.determinedByResource,
+    CompletionDropdownMap.reference,
+  ],
   [ContentKindsNames.H5P]: [
     CompletionDropdownMap.determinedByResource,
     CompletionDropdownMap.completeDuration,
@@ -274,18 +281,20 @@ export function getCompletionDataFromNode(node) {
     return;
   }
 
-  const completionCriteria = node.extra_fields?.options?.completion_criteria
-    ? JSON.parse(JSON.stringify(node.extra_fields?.options?.completion_criteria))
-    : null;
+  const extraFields = node?.extra_fields || {};
+  const options = extraFields?.options || {};
+  const completionCriteria = options?.completion_criteria || null;
   const threshold = completionCriteria?.threshold || generateDefaultThreshold(node);
   const model = completionCriteria?.model || defaultCompletionCriteriaModels[node.kind];
-  const suggestedDurationType = node.extra_fields?.suggested_duration_type;
+  const modality = options?.modality || null;
+  const suggestedDurationType = extraFields?.suggested_duration_type;
   const suggestedDuration = node.suggested_duration;
 
   return {
     completionModel: model,
     completionThreshold: threshold,
     masteryModel: threshold?.mastery_model,
+    modality,
     suggestedDurationType,
     suggestedDuration,
   };
@@ -317,11 +326,11 @@ export function getCompletionCriteriaLabels(node = {}, files = []) {
   if (!node && !files) {
     return;
   }
-
   const {
     completionModel,
     completionThreshold,
     masteryModel,
+    modality,
     suggestedDuration,
   } = getCompletionDataFromNode(node);
 
@@ -368,6 +377,11 @@ export function getCompletionCriteriaLabels(node = {}, files = []) {
           m: completionThreshold.m,
           n: completionThreshold.n,
         });
+      } else if (
+        masteryModel === MasteryModelsNames.DO_ALL &&
+        modality === ContentModalities.QUIZ
+      ) {
+        labels.completion = metadataStrings.$tr('practiceQuiz');
       } else {
         labels.completion = constantStrings.$tr(masteryModel);
       }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index 24505beedd..6ec4ffee47 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -246,11 +246,10 @@
     ContentKindLearningActivityDefaults,
   } from 'shared/leUtils/ContentKinds';
   import { titleMixin, routerMixin } from 'shared/mixins';
-  import { COPYING_FLAG, RELATIVE_TREE_POSITIONS } from 'shared/data/constants';
+  import { RELATIVE_TREE_POSITIONS } from 'shared/data/constants';
   import { DraggableTypes, DropEffect } from 'shared/mixins/draggable/constants';
   import { DraggableFlags } from 'shared/vuex/draggablePlugin/module/constants';
   import DraggableRegion from 'shared/views/draggable/DraggableRegion';
-  import { ContentNode } from 'shared/data/resources';
 
   export default {
     name: 'CurrentTopicView',
@@ -302,6 +301,7 @@
         'getContentNodeAncestors',
         'getTopicAndResourceCounts',
         'getContentNodeChildren',
+        'isNodeInCopyingState',
       ]),
       ...mapGetters('clipboard', ['getCopyTrees']),
       ...mapGetters('draggable', ['activeDraggableRegionId']),
@@ -323,7 +323,9 @@
         },
         set(value) {
           if (value) {
-            this.selected = this.children.filter(node => !node[COPYING_FLAG]).map(node => node.id);
+            this.selected = this.children
+              .filter(node => !this.isNodeInCopyingState(node.id))
+              .map(node => node.id);
             this.trackClickEvent('Select all');
           } else {
             this.selected = [];
@@ -420,13 +422,14 @@
       },
     },
     methods: {
-      ...mapActions(['showSnackbar']),
+      ...mapActions(['showSnackbar', 'clearSnackbar']),
       ...mapActions(['setViewMode', 'addViewModeOverride', 'removeViewModeOverride']),
       ...mapActions('contentNode', [
         'createContentNode',
         'loadAncestors',
         'moveContentNodes',
         'copyContentNode',
+        'waitForCopyingStatus',
       ]),
       ...mapActions('clipboard', ['copyAll']),
       clearSelections() {
@@ -538,44 +541,47 @@
         }
 
         // All sources should be from the same region
-        const sourceRegion = drop.sources[0].region;
+        const sources = drop.sources || [];
+        const sourceRegion = sources.length > 0 ? sources[0].region : null;
         const payload = {
           target: identity.metadata.id,
           position,
         };
 
-        // When the source region is the clipboard, we want to make sure we use
-        // `excluded_descendants` by accessing the copy trees through the clipboard node ID
-        if (sourceRegion && sourceRegion.id === DraggableRegions.CLIPBOARD) {
-          return Promise.all(
-            data.sources.map(source => {
-              // Using `getCopyTrees` we can access the `excluded_descendants` for the node, such
-              // that we make sure to skip copying nodes that aren't intended to be copied
-              const trees = this.getCopyTrees(source.metadata.clipboardNodeId, true);
+        if (payload.target) {
+          // When the source region is the clipboard, we want to make sure we use
+          // `excluded_descendants` by accessing the copy trees through the clipboard node ID
+          if (sourceRegion && sourceRegion.id === DraggableRegions.CLIPBOARD) {
+            return Promise.all(
+              data.sources.map(source => {
+                // Using `getCopyTrees` we can access the `excluded_descendants` for the node, such
+                // that we make sure to skip copying nodes that aren't intended to be copied
+                const trees = this.getCopyTrees(source.metadata.clipboardNodeId, true);
 
-              // Since we're using `ignoreSelection=true` for `getCopyTrees`, it should only
-              // return one tree at most
-              if (trees.length === 0) {
-                return Promise.resolve();
-              } else if (trees.length > 1) {
-                throw new Error(
-                  'Multiple copy trees are unexpected for drag and drop copy operation'
-                );
-              }
+                // Since we're using `ignoreSelection=true` for `getCopyTrees`, it should only
+                // return one tree at most
+                if (trees.length === 0) {
+                  return Promise.resolve();
+                } else if (trees.length > 1) {
+                  throw new Error(
+                    'Multiple copy trees are unexpected for drag and drop copy operation'
+                  );
+                }
 
-              return this.copyContentNode({
-                ...payload,
-                id: source.metadata.id,
-                excluded_descendants: get(trees, [0, 'extra_fields', 'excluded_descendants'], {}),
-              });
-            })
-          );
-        }
+                return this.copyContentNode({
+                  ...payload,
+                  id: source.metadata.id,
+                  excluded_descendants: get(trees, [0, 'extra_fields', 'excluded_descendants'], {}),
+                });
+              })
+            );
+          }
 
-        return this.moveContentNodes({
-          ...payload,
-          id__in: data.sources.map(s => s.metadata.id),
-        });
+          return this.moveContentNodes({
+            ...payload,
+            id__in: data.sources.map(s => s.metadata.id),
+          });
+        }
       },
       insertPosition(mask) {
         return mask & DraggableFlags.TOP
@@ -646,12 +652,30 @@
           )
         ).then(nodes => {
           this.clearSelections();
-          ContentNode.waitForCopying(nodes.map(n => n.id)).then(() => {
-            this.showSnackbar({
-              text: this.$tr('copiedItems'),
-              actionText: this.$tr('undo'),
-              actionCallback: () => changeTracker.revert(),
-            }).then(() => changeTracker.cleanUp());
+          Promise.allSettled(
+            nodes.map(n =>
+              this.waitForCopyingStatus({
+                contentNodeId: n.id,
+                startingRev: changeTracker._startingRev,
+              })
+            )
+          ).then(results => {
+            let isAllCopySuccess = true;
+            for (const result of results) {
+              if (result.status === 'rejected') {
+                isAllCopySuccess = false;
+              }
+            }
+            if (isAllCopySuccess) {
+              this.showSnackbar({
+                text: this.$tr('copiedItems'),
+                actionText: this.$tr('undo'),
+                actionCallback: () => changeTracker.revert(),
+              }).then(() => changeTracker.cleanUp());
+            } else {
+              this.clearSnackbar();
+              changeTracker.cleanUp();
+            }
           });
         });
       }),
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
index 0999b077f1..8e2f735484 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/ImportFromChannelsModal.vue
@@ -81,6 +81,7 @@
   import ResourceDrawer from '../../components/ResourceDrawer';
   import { routerMixin } from 'shared/mixins';
   import FullscreenModal from 'shared/views/FullscreenModal';
+  import { withChangeTracker } from 'shared/data/changes';
 
   const IMPORT_ROUTES = [
     RouteNames.IMPORT_FROM_CHANNELS,
@@ -181,7 +182,7 @@
       this.updateTitleForPage();
     },
     methods: {
-      ...mapActions('contentNode', ['copyContentNodes']),
+      ...mapActions('contentNode', ['copyContentNodes', 'waitForCopyingStatus']),
       ...mapMutations('importFromChannels', {
         selectNode: 'SELECT_NODE',
         deselectNode: 'DESELECT_NODE',
@@ -210,7 +211,7 @@
           },
         });
       },
-      handleClickImport() {
+      handleClickImport: withChangeTracker(function(changeTracker) {
         const nodeIds = this.selected.map(({ id }) => id);
         // Grab the source nodes from Vuex, since search should have loaded them into it
         const sourceNodes = nodeIds.map(id => this.getContentNode(id));
@@ -218,7 +219,7 @@
           id__in: nodeIds,
           target: this.$route.params.destNodeId,
           sourceNodes,
-        }).then(() => {
+        }).then(nodes => {
           // When exiting, do not show snackbar when clearing selections
           this.showSnackbar = false;
           this.$store.commit('importFromChannels/CLEAR_NODES');
@@ -228,8 +229,17 @@
               nodeId: this.$route.params.destNodeId,
             },
           });
+
+          return Promise.allSettled(
+            nodes.map(n =>
+              this.waitForCopyingStatus({
+                contentNodeId: n.id,
+                startingRev: changeTracker._startingRev,
+              })
+            )
+          );
         });
-      },
+      }),
       // Using a click method here instead of :to attribute because
       // it prevents the close button from getting clicked on the route change
       goBackToBrowse() {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
index 4f1d71203c..f7af5a8846 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
@@ -29,6 +29,7 @@
       item-value="id"
       :disabled="loadingChannels"
       notranslate
+      useEllipsis
     />
 
     <p class="font-weight-bold grey--text mb-1">
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
index 33e0be8221..aca3ee7e5e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/NodePanel.vue
@@ -56,7 +56,6 @@
   import { RouteNames } from '../constants';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
   import LoadingText from 'shared/views/LoadingText';
-  import { COPYING_FLAG } from 'shared/data/constants';
 
   export default {
     name: 'NodePanel',
@@ -84,7 +83,11 @@
     computed: {
       ...mapGetters(['isCompactViewMode', 'isComfortableViewMode']),
       ...mapGetters('currentChannel', ['rootId', 'canEdit']),
-      ...mapGetters('contentNode', ['getContentNode', 'getContentNodeChildren']),
+      ...mapGetters('contentNode', [
+        'getContentNode',
+        'getContentNodeChildren',
+        'isNodeInCopyingState',
+      ]),
       node() {
         return this.getContentNode(this.parentId);
       },
@@ -138,7 +141,7 @@
       },
       onNodeDoubleClick(node) {
         // Don't try to navigate to nodes that are still copying
-        if (!node[COPYING_FLAG]) {
+        if (!this.isNodeInCopyingState(node.id)) {
           if (node.kind === ContentKindsNames.TOPIC) {
             this.goToTopic(node.id);
           } else {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/progress/ContentNodeCopyTaskProgress.vue b/contentcuration/contentcuration/frontend/channelEdit/views/progress/ContentNodeCopyTaskProgress.vue
index ae169fadaf..6ed3b803e5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/progress/ContentNodeCopyTaskProgress.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/progress/ContentNodeCopyTaskProgress.vue
@@ -1,11 +1,31 @@
 <template>
 
-  <VProgressCircular
-    :indeterminate="!task || !progress"
-    :progress="progress"
-    :color="progressBarColor"
-    v-bind="$attrs"
-  />
+  <div :style="{ 'cursor': copying && !hasCopyingErrored ? 'progress' : 'default' }">
+    <VProgressCircular
+      v-if="copying && !hasCopyingErrored"
+      indeterminate
+      :color="progressBarColor"
+      v-bind="$attrs"
+    />
+    <VTooltip
+      v-else-if="hasCopyingErrored && showTooltip"
+      bottom
+      lazy
+    >
+      <template #activator="{ on }">
+        <Icon color="red" v-on="on">
+          error
+        </Icon>
+      </template>
+      <span>{{ $tr('copyErrorTopic') }}</span>
+    </VTooltip>
+    <Icon
+      v-else-if="hasCopyingErrored && !showTooltip"
+      color="red"
+    >
+      error
+    </Icon>
+  </div>
 
 </template>
 
@@ -13,47 +33,33 @@
 <script>
 
   import { mapGetters } from 'vuex';
-  import get from 'lodash/get';
 
   export default {
     name: 'ContentNodeCopyTaskProgress',
     props: {
-      taskId: {
-        type: String,
-        default: null,
+      node: {
+        type: Object,
+        required: true,
+      },
+      showTooltip: {
+        type: Boolean,
+        default: false,
       },
     },
     computed: {
-      ...mapGetters('task', ['getAsyncTask']),
-      task() {
-        return this.getAsyncTask(this.taskId);
-      },
-      progressBarColor() {
-        if (this.currentTaskError) {
-          return this.$themeTokens.error;
-        } else if (this.isDone) {
-          return this.$themeTokens.success;
-        } else {
-          return this.$themeTokens.loading;
-        }
+      ...mapGetters('contentNode', ['isNodeInCopyingState', 'hasNodeCopyingErrored']),
+      copying() {
+        return this.isNodeInCopyingState(this.node.id);
       },
-      isDone() {
-        return this.progress >= 100 && !this.currentTaskError;
+      hasCopyingErrored() {
+        return this.hasNodeCopyingErrored(this.node.id);
       },
-      currentTaskError() {
-        return this.task ? get(this.task, ['traceback']) : null;
-      },
-      progress() {
-        return this.task ? get(this.task, ['progress']) : 0;
+      progressBarColor() {
+        return this.$themeTokens.loading;
       },
     },
     $trs: {
-      /* eslint-disable kolibri/vue-no-unused-translations */
-      /**
-       * String for handling copy failures
-       */
       copyErrorTopic: 'Some resources failed to copy',
-      /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
index 6e8be7ce6f..6ceeeafcfc 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@@ -2,7 +2,13 @@ import flatMap from 'lodash/flatMap';
 import uniq from 'lodash/uniq';
 import { NEW_OBJECT, NOVALUE } from 'shared/constants';
 import client from 'shared/client';
-import { RELATIVE_TREE_POSITIONS, CHANGES_TABLE, TABLE_NAMES } from 'shared/data/constants';
+import {
+  RELATIVE_TREE_POSITIONS,
+  CHANGES_TABLE,
+  TABLE_NAMES,
+  COPYING_STATUS,
+  COPYING_STATUS_VALUES,
+} from 'shared/data/constants';
 import { ContentNode } from 'shared/data/resources';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { findLicense } from 'shared/utils/helpers';
@@ -241,8 +247,12 @@ function generateContentNodeData({
   learning_activities = NOVALUE,
   categories = NOVALUE,
   suggested_duration = NOVALUE,
+  [COPYING_STATUS]: copy_status_value = NOVALUE,
 } = {}) {
   const contentNodeData = {};
+  if (copy_status_value !== NOVALUE) {
+    contentNodeData[COPYING_STATUS] = copy_status_value;
+  }
   if (title !== NOVALUE) {
     contentNodeData.title = title;
   }
@@ -409,6 +419,16 @@ export function deleteContentNodes(context, contentNodeIds) {
   );
 }
 
+export function waitForCopyingStatus(context, { contentNodeId, startingRev }) {
+  return ContentNode.waitForCopying(contentNodeId, startingRev).catch(e => {
+    context.dispatch('updateContentNode', {
+      id: contentNodeId,
+      [COPYING_STATUS]: COPYING_STATUS_VALUES.FAILED,
+    });
+    return Promise.reject(e);
+  });
+}
+
 export function copyContentNode(
   context,
   {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
index e38a191164..ef5493c904 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
@@ -7,6 +7,7 @@ import { parseNode } from './utils';
 import { getNodeDetailsErrors, getNodeFilesErrors } from 'shared/utils/validation';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { NEW_OBJECT } from 'shared/constants';
+import { COPYING_STATUS, COPYING_STATUS_VALUES } from 'shared/data/constants';
 
 function sorted(nodes) {
   return sortBy(nodes, ['lft']);
@@ -48,6 +49,31 @@ export function hasChildren(state, getters) {
   };
 }
 
+/**
+ * Whether the contentnode's interactivity should be disabled or not while copying?
+ * When the contentnode is copying or the copying has failed, we need
+ * to keep interactivity disabled. Hence, the FAILED condition is also there.
+ */
+export function isNodeInCopyingState(state, getters) {
+  return function(contentNodeId) {
+    const contentNode = getters.getContentNode(contentNodeId);
+    return (
+      contentNode[COPYING_STATUS] === COPYING_STATUS_VALUES.COPYING ||
+      contentNode[COPYING_STATUS] === COPYING_STATUS_VALUES.FAILED
+    );
+  };
+}
+
+/**
+ * Whether the contentnode's copying has errored or not?
+ */
+export function hasNodeCopyingErrored(state, getters) {
+  return function(contentNodeId) {
+    const contentNode = getters.getContentNode(contentNodeId);
+    return contentNode[COPYING_STATUS] === COPYING_STATUS_VALUES.FAILED;
+  };
+}
+
 export function countContentNodeDescendants(state, getters) {
   return function(contentNodeId) {
     return getters.getContentNodeDescendants(contentNodeId).length;
diff --git a/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue b/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
index 20a4b8750d..c493429edd 100644
--- a/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
+++ b/contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
@@ -18,7 +18,7 @@
 
         <KFixedGridItem :key="`${kind}1`" span="3" class="row">
           <span class="mr-2 pa-2" :style="{ backgroundColor: theme[kind] }">
-            <KIcon :icon="kind" :color="$themeTokens.textInverted" />
+            <KIcon :icon="kindIcon(kind)" :color="$themeTokens.textInverted" />
           </span>
 
           <span>{{ translateConstant(kind) }}</span>
@@ -89,6 +89,15 @@
         const hiddenKinds = [ContentKindsNames.H5P, ContentKindsNames.TOPIC];
         return ContentKindsList.filter(k => !hiddenKinds.includes(k));
       },
+      kindIcon() {
+        return kind => {
+          // KIcon doesn't have an icon for ZIM, so we use the HTML5 icon instead
+          if (kind === ContentKindsNames.ZIM) {
+            return ContentKindsNames.HTML5;
+          }
+          return kind;
+        };
+      },
       storageUsagePercentage() {
         // Math.round to fix ParseInt issues for really small divisions to force the float to int
         return Math.round((this.usedSpace / this.totalSpace) * 100);
diff --git a/contentcuration/contentcuration/frontend/shared/constants.js b/contentcuration/contentcuration/frontend/shared/constants.js
index fb802c47b3..29449880ec 100644
--- a/contentcuration/contentcuration/frontend/shared/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/constants.js
@@ -58,11 +58,13 @@ export const kindToIconMap = {
   channel: 'apps',
   document: 'description',
   exercise: 'star',
+  h5p: 'widgets',
   html5: 'widgets',
   image: 'image',
   slideshow: 'photo_library',
   topic: 'folder',
   video: 'theaters',
+  zim: 'widgets',
 };
 
 export const SharingPermissions = {
@@ -204,6 +206,7 @@ export const AccessibilityCategoriesMap = {
   video: ['CAPTIONS_SUBTITLES', 'AUDIO_DESCRIPTION', 'SIGN_LANGUAGE'],
   exercise: ['ALT_TEXT'],
   html5: ['ALT_TEXT', 'HIGH_CONTRAST'],
+  h5p: ['ALT_TEXT', 'HIGH_CONTRAST'],
   audio: ['CAPTIONS_SUBTITLES'],
 };
 
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
index 514986558f..b8fc305e93 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/ContentNodeResource.spec.js
@@ -4,7 +4,8 @@ import find from 'lodash/find';
 import { Store } from 'vuex';
 import {
   RELATIVE_TREE_POSITIONS,
-  COPYING_FLAG,
+  COPYING_STATUS,
+  COPYING_STATUS_VALUES,
   TASK_ID,
   CHANGES_TABLE,
   CHANGE_TYPES,
@@ -666,7 +667,7 @@ describe('ContentNode methods', () => {
         source_node_id: node.node_id,
         channel_id: parent.channel_id,
         root_id: parent.root_id,
-        [COPYING_FLAG]: true,
+        [COPYING_STATUS]: COPYING_STATUS_VALUES.COPYING,
         [TASK_ID]: null,
       };
       await expect(ContentNode.tableCopy({ node, parent, payload })).resolves.toMatchObject(
diff --git a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
index 13c4759263..ca5e2181f9 100644
--- a/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/data/__tests__/changes.spec.js
@@ -16,7 +16,8 @@ import {
   TABLE_NAMES,
   RELATIVE_TREE_POSITIONS,
   LAST_FETCHED,
-  COPYING_FLAG,
+  COPYING_STATUS,
+  COPYING_STATUS_VALUES,
   TASK_ID,
 } from 'shared/data/constants';
 import db from 'shared/data/db';
@@ -124,7 +125,7 @@ describe('Change Types', () => {
       b: 3,
       [LAST_FETCHED]: new Date(),
       [TASK_ID]: '18292183921',
-      [COPYING_FLAG]: true,
+      [COPYING_STATUS]: COPYING_STATUS_VALUES.COPYING,
     };
     const change = new UpdatedChange({
       key: '1',
@@ -152,7 +153,7 @@ describe('Change Types', () => {
       b: 2,
       [LAST_FETCHED]: new Date(),
       [TASK_ID]: '18292183921',
-      [COPYING_FLAG]: true,
+      [COPYING_STATUS]: COPYING_STATUS_VALUES.COPYING,
     };
     const change = new UpdatedChange({
       key: '1',
diff --git a/contentcuration/contentcuration/frontend/shared/data/changes.js b/contentcuration/contentcuration/frontend/shared/data/changes.js
index f62a50a09e..f081a11678 100644
--- a/contentcuration/contentcuration/frontend/shared/data/changes.js
+++ b/contentcuration/contentcuration/frontend/shared/data/changes.js
@@ -18,7 +18,7 @@ import {
   RELATIVE_TREE_POSITIONS,
   RELATIVE_TREE_POSITIONS_LOOKUP,
   LAST_FETCHED,
-  COPYING_FLAG,
+  COPYING_STATUS,
   TASK_ID,
 } from 'shared/data/constants';
 import { INDEXEDDB_RESOURCES } from 'shared/data/registry';
@@ -160,12 +160,8 @@ export class ChangeTracker {
           change.type === CHANGE_TYPES.COPIED ||
           (change.type === CHANGE_TYPES.MOVED && !change.oldObj)
         ) {
-          // Get the primary key's field name off the table to make sure we delete by
-          // the change key
-          return resource.table
-            .where(resource.table.schema.primKey.keyPath)
-            .equals(change.key)
-            .delete();
+          // Use resource's delete method to propogate sync object to backend.
+          return resource.delete(change.key);
         } else if (change.type === CHANGE_TYPES.UPDATED || change.type === CHANGE_TYPES.DELETED) {
           // If we updated or deleted it, we just want the old stuff back
           return resource.table.put(change.oldObj);
@@ -200,7 +196,7 @@ export class ChangeTracker {
 // These fields should not be included in change objects that we
 // store in the changes table for syncing to the backend
 // as they are only used for tracking state locally
-const ignoredSubFields = [COPYING_FLAG, LAST_FETCHED, TASK_ID];
+const ignoredSubFields = [COPYING_STATUS, LAST_FETCHED, TASK_ID];
 
 function omitIgnoredSubFields(obj) {
   return omit(obj, ignoredSubFields);
diff --git a/contentcuration/contentcuration/frontend/shared/data/constants.js b/contentcuration/contentcuration/frontend/shared/data/constants.js
index 709b251d1f..6267f5d308 100644
--- a/contentcuration/contentcuration/frontend/shared/data/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/data/constants.js
@@ -64,8 +64,14 @@ export const RELATIVE_TREE_POSITIONS = {
 
 export const RELATIVE_TREE_POSITIONS_LOOKUP = invert(RELATIVE_TREE_POSITIONS);
 
+export const COPYING_STATUS_VALUES = {
+  COPYING: 'COPYING',
+  FAILED: 'FAILED',
+  SUCCESS: 'SUCCESS',
+};
+
 // Special fields used for frontend specific handling
-export const COPYING_FLAG = '__COPYING';
+export const COPYING_STATUS = '__COPYING_STATUS';
 export const TASK_ID = '__TASK_ID';
 export const LAST_FETCHED = '__last_fetch';
 
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 4a7101f307..89d99945f9 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -18,7 +18,8 @@ import {
   CHANGES_TABLE,
   RELATIVE_TREE_POSITIONS,
   TABLE_NAMES,
-  COPYING_FLAG,
+  COPYING_STATUS,
+  COPYING_STATUS_VALUES,
   TASK_ID,
   CURRENT_USER,
   MAX_REV_KEY,
@@ -299,12 +300,12 @@ class IndexedDBResource {
           .map(datum => {
             const id = this.getIdValue(datum);
             datum[LAST_FETCHED] = now;
-            // Persist TASK_ID and COPYING_FLAG attributes when directly fetching from the server
+            // Persist TASK_ID and COPYING_STATUS attributes when directly fetching from the server
             if (currentMap[id] && currentMap[id][TASK_ID]) {
               datum[TASK_ID] = currentMap[id][TASK_ID];
             }
-            if (currentMap[id] && currentMap[id][COPYING_FLAG]) {
-              datum[COPYING_FLAG] = currentMap[id][COPYING_FLAG];
+            if (currentMap[id] && currentMap[id][COPYING_STATUS]) {
+              datum[COPYING_STATUS] = currentMap[id][COPYING_STATUS];
             }
             // If we have an updated change, apply the modifications here
             if (
@@ -1507,6 +1508,53 @@ export const ContentNode = new TreeResource({
     });
   },
 
+  /**
+   * Figures out the new target and position for the failed copy node.
+   * And then queues a CopyChange object for syncing to the backend.
+   * @param {string} id
+   * @returns {Promise}
+   */
+  retryCopyChange(id) {
+    // Get the latest change for contentnode `id` that has an error and is of copy type.
+    const change = db[CHANGES_TABLE].orderBy('rev')
+      .filter(
+        change =>
+          change.key === id &&
+          change.table === this.tableName &&
+          (change.errors || change.errors === '') &&
+          change.type === CHANGE_TYPES.COPIED
+      )
+      .last();
+
+    // Figure out the new target and position.
+    return this.table.get(id).then(failedCopyNode => {
+      const target = this.table
+        .orderBy('lft')
+        .filter(
+          node =>
+            node.id !== id &&
+            node.parent === failedCopyNode.parent &&
+            node.lft <= failedCopyNode.lft &&
+            node[COPYING_STATUS] !== COPYING_STATUS_VALUES.FAILED &&
+            node[COPYING_STATUS] !== COPYING_STATUS_VALUES.COPYING
+        )
+        .last();
+
+      return Promise.all([change, target]).then(([change, target]) => {
+        if (target) {
+          change.target = target.id;
+          change.position = RELATIVE_TREE_POSITIONS.RIGHT;
+        } else {
+          change.target = failedCopyNode.parent;
+          change.position = RELATIVE_TREE_POSITIONS.FIRST_CHILD;
+        }
+
+        // Fire up the change object to sync.
+        this._saveAndQueueChange(new CopiedChange(change));
+      });
+    });
+  },
+
   async tableCopy({ node, parent, payload }) {
     payload = {
       ...node,
@@ -1522,7 +1570,7 @@ export const ContentNode = new TreeResource({
       root_id: parent.root_id,
       // Set this node as copying until we get confirmation from the
       // backend that it has finished copying
-      [COPYING_FLAG]: true,
+      [COPYING_STATUS]: COPYING_STATUS_VALUES.COPYING,
       // Set to null, but this should update to a task id to track the copy
       // task once it has been initiated
       [TASK_ID]: null,
@@ -1604,25 +1652,60 @@ export const ContentNode = new TreeResource({
   getChannelId: getChannelFromChannelScope,
 
   /**
-   * Waits for copying of content nodes to complete for all ids referenced in `ids` array
-   * @param {string[]} ids
+   * Waits for copying of contentnode to complete for id referenced in `id`.
+   * @param {string} id
+   * @param {Number} startingRev -- the revision from which we start looking for
+   *                                success or failure change objects.
    * @returns {Promise<void>}
    */
-  waitForCopying(ids) {
-    const observable = Dexie.liveQuery(() => {
-      return this.table
+  waitForCopying(id, startingRev) {
+    const observable = Dexie.liveQuery(async () => {
+      let copy_success_flag = 0;
+      let change_error_flag = 0;
+
+      copy_success_flag = await this.table
         .where('id')
-        .anyOf(ids)
-        .filter(node => !node[COPYING_FLAG])
-        .toArray();
+        .equals(id)
+        .filter(node => node[COPYING_STATUS] === COPYING_STATUS_VALUES.SUCCESS)
+        .count();
+
+      if (copy_success_flag === 1) {
+        return {
+          copy_success_flag,
+          change_error_flag,
+        };
+      }
+
+      change_error_flag = await db[CHANGES_TABLE].where('[table+key]')
+        .equals([this.tableName, id])
+        .filter(change => {
+          if (
+            (change['errors'] || change['errors'] === '') &&
+            change['type'] === CHANGE_TYPES.COPIED
+          ) {
+            if (!startingRev || change['rev'] > startingRev) {
+              return true;
+            }
+          }
+          return false;
+        })
+        .count();
+
+      return {
+        copy_success_flag,
+        change_error_flag,
+      };
     });
 
     return new Promise((resolve, reject) => {
       const subscription = observable.subscribe({
         next(result) {
-          if (result.length === ids.length) {
+          if (result.copy_success_flag) {
             subscription.unsubscribe();
             resolve();
+          } else if (result.change_error_flag) {
+            subscription.unsubscribe();
+            reject();
           }
         },
         error() {
diff --git a/contentcuration/contentcuration/frontend/shared/data/serverSync.js b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
index 0c4864df79..6cffeae584 100644
--- a/contentcuration/contentcuration/frontend/shared/data/serverSync.js
+++ b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
@@ -26,8 +26,8 @@ const commonFields = ['type', 'key', 'table', 'rev', 'channel_id', 'user_id'];
 const ChangeTypeMapFields = {
   [CHANGE_TYPES.CREATED]: commonFields.concat(['obj']),
   [CHANGE_TYPES.UPDATED]: commonFields.concat(['mods']),
-  [CHANGE_TYPES.DELETED]: commonFields,
-  [CHANGE_TYPES.MOVED]: commonFields.concat(['target', 'position']),
+  [CHANGE_TYPES.DELETED]: commonFields.concat(['oldObj']),
+  [CHANGE_TYPES.MOVED]: commonFields.concat(['target', 'position', 'oldObj', 'parent']),
   [CHANGE_TYPES.COPIED]: commonFields.concat([
     'from_key',
     'mods',
diff --git a/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js b/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js
index b7e165b0e2..4dc73e8fa4 100644
--- a/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js
+++ b/contentcuration/contentcuration/frontend/shared/leUtils/FormatPresets.js
@@ -185,7 +185,7 @@ const FormatPresetsMap = new Map([
       supplementary: false,
       thumbnail: false,
       subtitle: false,
-      display: false,
+      display: true,
       order: 1,
       kind_id: 'h5p',
       allowed_formats: ['h5p'],
diff --git a/contentcuration/contentcuration/frontend/shared/leUtils/Languages.js b/contentcuration/contentcuration/frontend/shared/leUtils/Languages.js
index b45b4f9594..a3b5373ea2 100644
--- a/contentcuration/contentcuration/frontend/shared/leUtils/Languages.js
+++ b/contentcuration/contentcuration/frontend/shared/leUtils/Languages.js
@@ -66,6 +66,17 @@ const LanguagesMap = new Map([
       lang_direction: 'ltr',
     },
   ],
+  [
+    'rsn',
+    {
+      id: 'rsn',
+      lang_code: 'rsn',
+      lang_subcode: null,
+      readable_name: 'Rwandan Sign Language',
+      native_name: "Amarenga y'Ikinyarwanda",
+      lang_direction: 'ltr',
+    },
+  ],
   [
     'an',
     {
@@ -198,6 +209,17 @@ const LanguagesMap = new Map([
       lang_direction: 'ltr',
     },
   ],
+  [
+    'csx',
+    {
+      id: 'csx',
+      lang_code: 'csx',
+      lang_subcode: null,
+      readable_name: 'Cambodian Sign Language',
+      native_name: 'Cambodian Sign Language',
+      lang_direction: 'ltr',
+    },
+  ],
   [
     'ca',
     {
@@ -1430,6 +1452,17 @@ const LanguagesMap = new Map([
       lang_direction: 'ltr',
     },
   ],
+  [
+    'xki',
+    {
+      id: 'xki',
+      lang_code: 'xki',
+      lang_subcode: null,
+      readable_name: 'Kenyan Sign Language',
+      native_name: 'Swahili Lugha ya ishara',
+      lang_direction: 'ltr',
+    },
+  ],
   [
     'be-tara',
     {
@@ -2564,6 +2597,18 @@ const LanguagesMap = new Map([
       lang_direction: 'ltr',
     },
   ],
+  [
+    'nsp',
+    {
+      id: 'nsp',
+      lang_code: 'nsp',
+      lang_subcode: null,
+      readable_name: 'Nepalese Sign Language',
+      native_name:
+        '\u0928\u0947\u092a\u093e\u0932\u0940 \u0938\u093e\u0902\u0915\u0947\u0924\u093f\u0915 \u092d\u093e\u0937\u093e',
+      lang_direction: 'ltr',
+    },
+  ],
   [
     'pi',
     {
@@ -3011,6 +3056,7 @@ export const LanguagesNames = {
   AF: 'af',
   AK: 'ak',
   AKA: 'aka',
+  RSN: 'rsn',
   AN: 'an',
   EN_PT: 'en-PT',
   IG: 'ig',
@@ -3023,6 +3069,7 @@ export const LanguagesNames = {
   EN_GB: 'en-GB',
   BUG: 'bug',
   BXK: 'bxk',
+  CSX: 'csx',
   CA: 'ca',
   CEB: 'ceb',
   CH: 'ch',
@@ -3135,6 +3182,7 @@ export const LanguagesNames = {
   PBT: 'pbt',
   SV_SE: 'sv-SE',
   SV_FI: 'sv-FI',
+  XKI: 'xki',
   BE_TARA: 'be-tara',
   VI: 'vi',
   TPI: 'tpi',
@@ -3237,6 +3285,7 @@ export const LanguagesNames = {
   NEW: 'new',
   NE: 'ne',
   NE_NP: 'ne-NP',
+  NSP: 'nsp',
   PI: 'pi',
   BH: 'bh',
   BHO: 'bho',
diff --git a/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue b/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue
index 874b084810..770c3225cf 100644
--- a/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/ContentNodeIcon.vue
@@ -84,6 +84,8 @@
             return this.$tr('exercise');
           case 'document':
             return this.$tr('document');
+          case 'h5p':
+            return this.$tr('html5');
           case 'html5':
             return this.$tr('html5');
           default:
diff --git a/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue b/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue
index c2af3b154e..daecdc4ec8 100644
--- a/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/LanguageDropdown.vue
@@ -29,7 +29,7 @@
         <template #item="{ item }">
           <VTooltip bottom lazy>
             <template #activator="{ on }">
-              <span class="text-truncate" v-on="on">{{ languageText(item) }}</span>
+              <span class="text-truncate" dir="auto" v-on="on">{{ languageText(item) }}</span>
             </template>
             <span>{{ languageText(item) }}</span>
           </VTooltip>
diff --git a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
index 2ac62e285d..7f1843ccc5 100644
--- a/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
@@ -42,7 +42,7 @@
             <VListTileTitle>{{ $tr('settingsLink') }}</VListTileTitle>
           </VListTileContent>
         </VListTile>
-        <VListTile @click="showLanguageModal = true">
+        <VListTile @click="openLanguageModal">
           <VListTileAction>
             <Icon>language</Icon>
           </VListTileAction>
@@ -51,8 +51,8 @@
           </VListTileContent>
         </VListTile>
         <VListTile
-          :href="helpLink" 
-          :tabindex="handleclickTab" 
+          :href="helpLink"
+          :tabindex="handleclickTab"
           target="_blank"
           @click="trackClick('Help')"
         >
@@ -163,6 +163,10 @@
       trackClick(label) {
         this.$analytics.trackClick('general', `User dropdown - ${label}`);
       },
+      openLanguageModal() {
+        this.drawer = false;
+        this.showLanguageModal = true;
+      },
     },
     $trs: {
       channelsLink: 'Channels',
diff --git a/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js b/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js
index d353221ec1..0c18f65fd4 100644
--- a/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/__tests__/contentNodeIcon.spec.js
@@ -24,6 +24,7 @@ describe('ContentNodeIcon', () => {
     { value: 'exercise', icon: 'assignment' },
     { value: 'document', icon: 'class' },
     { value: 'html5', icon: 'widgets' },
+    { value: 'zim', icon: 'widgets' },
   ];
   it.each(testIcons)('should display the correct icon $value', kind => {
     const wrapper = makeWrapper(kind.value);
diff --git a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue
index ce5397a624..b2f0d0bda3 100644
--- a/contentcuration/contentcuration/frontend/shared/views/details/Details.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/details/Details.vue
@@ -3,50 +3,50 @@
   <div :class="{ printing }">
     <div style="max-width: 300px">
       <Thumbnail
-        :src="isChannel ? details.thumbnail_url : details.thumbnail_src"
-        :encoding="isChannel ? details.thumbnail_encoding : null"
+        :src="isChannel ? _details.thumbnail_url : _details.thumbnail_src"
+        :encoding="isChannel ? _details.thumbnail_encoding : null"
       />
     </div>
     <br>
     <h1 class="notranslate" dir="auto">
-      {{ isChannel ? details.name : details.title }}
+      {{ isChannel ? _details.name : _details.title }}
     </h1>
     <p class="notranslate" dir="auto">
-      {{ details.description }}
+      {{ _details.description }}
     </p>
     <br>
 
     <template v-if="isChannel">
-      <DetailsRow v-if="details.published && details.primary_token" :label="$tr('tokenHeading')">
+      <DetailsRow v-if="_details.published && _details.primary_token" :label="$tr('tokenHeading')">
         <template #default>
           <CopyToken
             v-if="!printing"
-            :token="details.primary_token"
+            :token="_details.primary_token"
             style="max-width:max-content;"
           />
           <span v-else>
             {{
-              details.primary_token.slice(0, 5) + '-' + details.primary_token.slice(5)
+              _details.primary_token.slice(0, 5) + '-' + _details.primary_token.slice(5)
             }}
           </span>
         </template>
       </DetailsRow>
       <DetailsRow :label="$tr('publishedHeading')">
-        <span v-if="details.published">{{ publishedDate }}</span>
+        <span v-if="_details.published">{{ publishedDate }}</span>
         <em v-else>{{ $tr('unpublishedText') }}</em>
       </DetailsRow>
       <DetailsRow :label="$tr('currentVersionHeading')">
-        <template v-if="details.published">
-          {{ details.version }}
+        <template v-if="_details.published">
+          {{ _details.version }}
         </template>
         <template v-else>
           {{ defaultText }}
         </template>
       </DetailsRow>
       <DetailsRow
-        v-if="details.language"
+        v-if="_details.language"
         :label="$tr('primaryLanguageHeading')"
-        :text="translateLanguage(details.language)"
+        :text="translateLanguage(_details.language)"
       />
     </template>
 
@@ -62,7 +62,7 @@
       />
       <DetailsRow :label="$tr('resourceHeading')">
         <template #default>
-          <p>{{ $formatNumber(details.resource_count) }}</p>
+          <p>{{ $formatNumber(_details.resource_count) }}</p>
           <VDataTable
             :items="kindCount"
             hide-actions
@@ -121,13 +121,13 @@
       </DetailsRow>
       <DetailsRow :label="$tr('containsHeading')">
         <template v-if="!printing" #default>
-          <VChip v-if="details.includes.coach_content" class="tag">
+          <VChip v-if="_details.includes.coach_content" class="tag">
             {{ $tr('coachHeading') }}
           </VChip>
-          <VChip v-if="details.includes.exercises" class="tag">
+          <VChip v-if="_details.includes.exercises" class="tag">
             {{ $tr('assessmentsIncludedText') }}
           </VChip>
-          <div v-if="!details.includes.exercises && !details.includes.coach_content">
+          <div v-if="!_details.includes.exercises && !_details.includes.coach_content">
             {{ defaultText }}
           </div>
         </template>
@@ -137,7 +137,7 @@
       </DetailsRow>
       <DetailsRow
         :label="$tr('coachHeading')"
-        :text="$formatNumber(details.includes.coach_content || 0)"
+        :text="$formatNumber(_details.includes.coach_content)"
         :definition="!printing ? $tr('coachDescription') : ''"
       />
       <DetailsRow :label="$tr('tagsHeading')">
@@ -162,7 +162,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.languages"
+            :items="_details.languages"
             :printing="printing"
             inline
           />
@@ -172,7 +172,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.accessible_languages"
+            :items="_details.accessible_languages"
             :printing="printing"
             inline
           />
@@ -186,7 +186,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.authors"
+            :items="_details.authors"
             :printing="printing"
             inline
           />
@@ -199,7 +199,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.providers"
+            :items="_details.providers"
             :printing="printing"
             inline
           />
@@ -212,7 +212,7 @@
         <template #default>
           <ExpandableList
             :noItemsText="defaultText"
-            :items="details.aggregators"
+            :items="_details.aggregators"
             :printing="printing"
             inline
           />
@@ -222,7 +222,7 @@
       <DetailsRow :label="$tr('licensesLabel')">
         <template #default>
           <template v-if="!printing">
-            <VTooltip v-for="license in details.licenses" :key="license" top lazy>
+            <VTooltip v-for="license in _details.licenses" :key="license" top lazy>
               <template #activator="{ on }">
                 <VChip class="tag" v-on="on">
                   {{ translateConstant(license) }}
@@ -239,7 +239,7 @@
       <DetailsRow :label="$tr('copyrightHoldersLabel')">
         <template #default>
           <ExpandableList
-            :items="details.copyright_holders"
+            :items="_details.copyright_holders"
             :no-items-text="defaultText"
             :printing="printing"
             inline
@@ -248,12 +248,12 @@
       </DetailsRow>
 
       <DetailsRow
-        v-if="details.original_channels.length"
+        v-if="_details.original_channels.length"
         :label="$tr('containsContentHeading')"
       >
         <template #default>
           <VLayout
-            v-for="channel in details.original_channels"
+            v-for="channel in _details.original_channels"
             :key="channel.id"
             class="preview-row"
             align-center
@@ -279,7 +279,7 @@
       </DetailsRow>
 
       <label
-        v-if="details.sample_nodes.length"
+        v-if="_details.sample_nodes.length"
         class="body-1 font-weight-bold"
         :style="{ color: $vuetify.theme.darkGrey }"
       >
@@ -287,7 +287,7 @@
       </label>
       <VLayout row :wrap="!printing" class="my-4 pt-1 sample-nodes">
         <VFlex
-          v-for="node in details.sample_nodes"
+          v-for="node in _details.sample_nodes"
           :key="node.node_id"
           :xs12="!printing"
           :xs3="printing"
@@ -310,6 +310,8 @@
 
 <script>
 
+  import cloneDeep from 'lodash/cloneDeep';
+  import defaultsDeep from 'lodash/defaultsDeep';
   import camelCase from 'lodash/camelCase';
   import orderBy from 'lodash/orderBy';
   import { SCALE_TEXT, SCALE, CHANNEL_SIZE_DIVISOR } from './constants';
@@ -328,6 +330,39 @@
   import Thumbnail from 'shared/views/files/Thumbnail';
   import CopyToken from 'shared/views/CopyToken';
 
+  const DEFAULT_DETAILS = {
+    name: '',
+    title: '',
+    description: '',
+    thumbnail_url: null,
+    thumbnail_src: null,
+    thumbnail_encoding: null,
+    published: false,
+    version: null,
+    primary_token: null,
+    language: null,
+    last_update: null,
+    created: null,
+    last_published: null,
+    resource_count: 0,
+    resource_size: 0,
+    includes: { coach_content: 0, exercises: 0 },
+    kind_count: [],
+    languages: [],
+    accessible_languages: [],
+    licenses: [],
+    tags: [],
+    copyright_holders: [],
+    authors: [],
+    aggregators: [],
+    providers: [],
+    sample_pathway: [],
+    original_channels: [],
+    sample_nodes: [],
+    levels: [],
+    categories: [],
+  };
+
   export default {
     name: 'Details',
     components: {
@@ -364,13 +399,19 @@
       },
     },
     computed: {
+      _details() {
+        const details = cloneDeep(this.details);
+        defaultsDeep(details, DEFAULT_DETAILS);
+        details.published = Boolean(details.last_published);
+        return details;
+      },
       defaultText() {
         // Making this a computed property so it's easier to update
         return '---';
       },
       publishedDate() {
         if (this.isChannel) {
-          return this.$formatDate(this.details.last_published, {
+          return this.$formatDate(this._details.last_published, {
             year: 'numeric',
             month: 'long',
             day: 'numeric',
@@ -382,7 +423,7 @@
         return window.libraryMode;
       },
       sizeText() {
-        const size = (this.details && this.details.resource_size) || 0;
+        const size = this._details.resource_size;
         const sizeIndex = Math.max(
           1,
           Math.min(Math.ceil(Math.log(size / CHANNEL_SIZE_DIVISOR) / Math.log(2)), 10)
@@ -393,10 +434,10 @@
         });
       },
       kindCount() {
-        return orderBy(this.details.kind_count, ['count', 'kind_id'], ['desc', 'asc']);
+        return orderBy(this._details.kind_count, ['count', 'kind_id'], ['desc', 'asc']);
       },
       createdDate() {
-        return this.$formatDate(this.details.created, {
+        return this.$formatDate(this._details.created, {
           year: 'numeric',
           month: 'long',
           day: 'numeric',
@@ -406,28 +447,28 @@
         return Object.keys(this.details).length;
       },
       sortedTags() {
-        return orderBy(this.details.tags, ['count'], ['desc']);
+        return orderBy(this._details.tags, ['count'], ['desc']);
       },
       includesPrintable() {
         const includes = [];
-        if (this.details.includes.coach_content) {
+        if (this._details.includes.coach_content) {
           includes.push(this.$tr('coachHeading'));
         }
 
-        if (this.details.includes.exercises) {
+        if (this._details.includes.exercises) {
           includes.push(this.$tr('assessmentsIncludedText'));
         }
 
         return includes.length ? includes.join(', ') : this.defaultText;
       },
       licensesPrintable() {
-        return this.details.licenses.map(this.translateConstant).join(', ');
+        return this._details.licenses.map(this.translateConstant).join(', ');
       },
       tagPrintable() {
         return this.sortedTags.map(tag => tag.tag_name).join(', ');
       },
       levels() {
-        return this.details.levels.map(level => {
+        return this._details.levels.map(level => {
           level = LevelsLookup[level];
           let translationKey;
           if (level === 'PROFESSIONAL') {
@@ -446,7 +487,7 @@
         return this.levels.join(', ');
       },
       categories() {
-        return this.details.categories.map(category => {
+        return this._details.categories.map(category => {
           category = CategoriesLookup[category];
           return this.translateMetadataString(camelCase(category));
         });
diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
index ae6e13eb78..74ddb24152 100644
--- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
@@ -23,7 +23,9 @@
         <template #item="{ item, tile }">
           <Checkbox v-bind="tile.props" class="ma-0">
             <template #label>
-              <span :class="{ notranslate }">{{ getText(item) }}</span>
+              <span :class="{ notranslate }" :style="getEllipsisStyle()" dir="auto">
+                {{ getText(item) }}
+              </span>
             </template>
           </Checkbox>
         </template>
@@ -69,6 +71,14 @@
         type: Boolean,
         default: true,
       },
+      useEllipsis: {
+        type: Boolean,
+        default: false,
+      },
+      ellipsisMaxWidth: {
+        type: String,
+        default: '200px',
+      },
     },
     computed: {
       selections: {
@@ -81,6 +91,16 @@
       },
     },
     methods: {
+      getEllipsisStyle() {
+        return this.useEllipsis
+          ? {
+              maxWidth: this.ellipsisMaxWidth,
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap',
+            }
+          : {};
+      },
       getText(item) {
         if (typeof this.itemText === 'string') {
           return item[this.itemText];
@@ -112,6 +132,8 @@
   /deep/ .v-chip__content,
   .text-truncate {
     max-width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
   }
 
 </style>
diff --git a/contentcuration/contentcuration/frontend/shared/vuetify/icons.js b/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
index b119d983fa..fa0ce43e61 100644
--- a/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
+++ b/contentcuration/contentcuration/frontend/shared/vuetify/icons.js
@@ -20,6 +20,7 @@ export const CONTENT_KIND_ICONS = {
   [ContentKindsNames.EXERCISE]: 'assignment',
   [ContentKindsNames.DOCUMENT]: 'class',
   [ContentKindsNames.HTML5]: 'widgets',
+  [ContentKindsNames.ZIM]: 'widgets',
 };
 
 export function getContentKindIcon(kind, isEmpty = false) {
diff --git a/contentcuration/contentcuration/frontend/shared/vuetify/theme.js b/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
index 6ea2a7ca5c..add22c47ef 100644
--- a/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
+++ b/contentcuration/contentcuration/frontend/shared/vuetify/theme.js
@@ -20,7 +20,9 @@ export default function theme() {
       audio: '#f06292',
       document: '#ff3d00',
       exercise: '#4db6ac',
+      h5p: '#ff8f00',
       html5: '#ff8f00',
+      zim: '#ff8f00',
       slideshow: '#4ece90',
       channelHighlightDefault: colors.grey.lighten3,
       draggableDropZone: '#dddddd',
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js
index 9a43b87d33..3f38ceabd8 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js
@@ -1,3 +1,5 @@
+import JSZip from 'jszip';
+import { getH5PMetadata } from '../utils';
 import storeFactory from 'shared/vuex/baseStore';
 import { File, injectVuexStore } from 'shared/data/resources';
 import client from 'shared/client';
@@ -19,6 +21,27 @@ const testFile = {
 
 const userId = 'some user';
 
+function get_metadata_file(data) {
+  const manifest = {
+    h5p: '1.0',
+    mainLibrary: 'content',
+    libraries: [
+      {
+        machineName: 'content',
+        majorVersion: 1,
+        minorVersion: 0,
+      },
+    ],
+    content: {
+      library: 'content',
+    },
+    ...data,
+  };
+  const manifestBlob = new Blob([JSON.stringify(manifest, null, 2)], { type: 'application/json' });
+  const manifestFile = new global.File([manifestBlob], 'h5p.json', { type: 'application/json' });
+  return manifestFile;
+}
+
 describe('file store', () => {
   let store;
   let id;
@@ -122,5 +145,97 @@ describe('file store', () => {
         });
       });
     });
+    describe('H5P content file extract metadata', () => {
+      it('getH5PMetadata should check for h5p.json file', () => {
+        const zip = new JSZip();
+        return zip.generateAsync({ type: 'blob' }).then(async function(h5pBlob) {
+          await expect(getH5PMetadata(h5pBlob)).rejects.toThrow(
+            'h5p.json not found in the H5P file.'
+          );
+        });
+      });
+      it('getH5PMetadata should extract metadata from h5p.json', async () => {
+        const manifestFile = get_metadata_file({ title: 'Test file' });
+        const zip = new JSZip();
+        zip.file('h5p.json', manifestFile);
+        await zip.generateAsync({ type: 'blob' }).then(async function(h5pBlob) {
+          await expect(getH5PMetadata(h5pBlob)).resolves.toEqual({
+            title: 'Test file',
+          });
+        });
+      });
+      it('getH5PMetadata should not extract und language', async () => {
+        const manifestFile = get_metadata_file({ title: 'Test file', language: 'und' });
+        const zip = new JSZip();
+        zip.file('h5p.json', manifestFile);
+        await zip.generateAsync({ type: 'blob' }).then(async function(h5pBlob) {
+          await expect(getH5PMetadata(h5pBlob)).resolves.toEqual({
+            title: 'Test file',
+          });
+        });
+      });
+      it.each([
+        ['CC BY', 1],
+        ['CC BY-SA', 2],
+        ['CC BY-ND', 3],
+        ['CC BY-NC', 4],
+        ['CC BY-NC-SA', 5],
+        ['CC BY-NC-ND', 6],
+        ['CC0 1.0', 8],
+      ])('getH5PMetadata should parse CC license %s', async (licenseName, licenseId) => {
+        const manifestFile = get_metadata_file({ title: 'Test file', license: licenseName });
+        const zip = new JSZip();
+        zip.file('h5p.json', manifestFile);
+        await zip.generateAsync({ type: 'blob' }).then(async function(h5pBlob) {
+          await expect(getH5PMetadata(h5pBlob)).resolves.toEqual({
+            title: 'Test file',
+            license: licenseId,
+          });
+        });
+      });
+      it.each([
+        [{ role: 'Author', name: 'Testing' }, 'author'],
+        [{ role: 'Editor', name: 'Testing' }, 'aggregator'],
+        [{ role: 'Licensee', name: 'Testing' }, 'copyright_holder'],
+        [{ role: 'Originator', name: 'Testing' }, 'provider'],
+      ])('getH5PMetadata should parse CC license %s', async (authorObj, field) => {
+        const manifestFile = get_metadata_file({ title: 'Test file', authors: [authorObj] });
+        const zip = new JSZip();
+        zip.file('h5p.json', manifestFile);
+        await zip.generateAsync({ type: 'blob' }).then(async function(h5pBlob) {
+          await expect(getH5PMetadata(h5pBlob)).resolves.toEqual({
+            title: 'Test file',
+            [field]: authorObj.name,
+          });
+        });
+      });
+      it('getH5PMetadata should not extract Firstname Surname author', async () => {
+        const manifestFile = get_metadata_file({
+          title: 'Test file',
+          authors: [{ name: 'Firstname Surname', role: 'Author' }],
+        });
+        const zip = new JSZip();
+        zip.file('h5p.json', manifestFile);
+        await zip.generateAsync({ type: 'blob' }).then(async function(h5pBlob) {
+          await expect(getH5PMetadata(h5pBlob)).resolves.toEqual({
+            title: 'Test file',
+          });
+        });
+      });
+      it('getH5PMetadata should exract metadata from h5p.json', async () => {
+        const manifestFile = get_metadata_file({
+          title: 'Test file',
+          language: 'en',
+        });
+        const zip = new JSZip();
+        zip.file('h5p.json', manifestFile);
+        await zip.generateAsync({ type: 'blob' }).then(async function(h5pBlob) {
+          await expect(getH5PMetadata(h5pBlob)).resolves.toEqual({
+            title: 'Test file',
+            language: 'en',
+          });
+        });
+      });
+    });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js b/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js
index 3225e58099..778ebec9fa 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js
@@ -198,6 +198,7 @@ export function uploadFile(context, { file, preset = null } = {}) {
       }); // End get upload url
     })
     .then(data => {
+      data.file.metadata = metadata;
       const fileObject = {
         ...data.file,
         loaded: 0,
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
index 97970945e1..12e59b943c 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
@@ -1,5 +1,8 @@
 import SparkMD5 from 'spark-md5';
+import JSZip from 'jszip';
 import { FormatPresetsList, FormatPresetsNames } from 'shared/leUtils/FormatPresets';
+import { LicensesList } from 'shared/leUtils/Licenses';
+import LanguagesMap from 'shared/leUtils/Languages';
 
 const BLOB_SLICE = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
 const CHUNK_SIZE = 2097152;
@@ -7,8 +10,10 @@ const MEDIA_PRESETS = [
   FormatPresetsNames.AUDIO,
   FormatPresetsNames.HIGH_RES_VIDEO,
   FormatPresetsNames.LOW_RES_VIDEO,
+  FormatPresetsNames.H5P,
 ];
 const VIDEO_PRESETS = [FormatPresetsNames.HIGH_RES_VIDEO, FormatPresetsNames.LOW_RES_VIDEO];
+const H5P_PRESETS = [FormatPresetsNames.H5P];
 
 export function getHash(file) {
   return new Promise((resolve, reject) => {
@@ -61,6 +66,62 @@ export function storageUrl(checksum, file_format) {
   return `/content/storage/${checksum[0]}/${checksum[1]}/${checksum}.${file_format}`;
 }
 
+const AuthorFieldMappings = {
+  Author: 'author',
+  Editor: 'aggregator',
+  Licensee: 'copyright_holder',
+  Originator: 'provider',
+};
+
+export async function getH5PMetadata(fileInput) {
+  const zip = new JSZip();
+  const metadata = {};
+  return zip
+    .loadAsync(fileInput)
+    .then(function(zip) {
+      const h5pJson = zip.file('h5p.json');
+      if (h5pJson) {
+        return h5pJson.async('text');
+      } else {
+        throw new Error('h5p.json not found in the H5P file.');
+      }
+    })
+    .then(function(h5pContent) {
+      const data = JSON.parse(h5pContent);
+      if (Object.prototype.hasOwnProperty.call(data, 'title')) {
+        metadata.title = data['title'];
+      }
+      if (
+        Object.prototype.hasOwnProperty.call(data, 'language') &&
+        LanguagesMap.has(data['language']) &&
+        data['language'] !== 'und'
+      ) {
+        metadata.language = data['language'];
+      }
+      if (Object.prototype.hasOwnProperty.call(data, 'authors')) {
+        for (const author of data['authors']) {
+          // Ignore obvious placedholders created by online H5P editor tools
+          if (author.role && author.name !== 'Firstname Surname') {
+            if (AuthorFieldMappings[author.role]) {
+              metadata[AuthorFieldMappings[author.role]] = author.name;
+            }
+          }
+        }
+      }
+      if (Object.prototype.hasOwnProperty.call(data, 'license')) {
+        const license = LicensesList.find(license => license.license_name === data['license']);
+        if (license) {
+          metadata.license = license.id;
+        } else if (data['license'] == 'CC0 1.0') {
+          // Special case for CC0 1.0
+          // this is the hard coded license id for CC0 1.0
+          metadata.license = 8;
+        }
+      }
+      return metadata;
+    });
+}
+
 /**
  * @param {{name: String, preset: String}} file
  * @param {String|null} preset
@@ -85,24 +146,33 @@ export function extractMetadata(file, preset = null) {
     return Promise.resolve(metadata);
   }
 
+  const isH5P = H5P_PRESETS.includes(metadata.preset);
+
   // Extract additional media metadata
   const isVideo = VIDEO_PRESETS.includes(metadata.preset);
 
   return new Promise(resolve => {
-    const mediaElement = document.createElement(isVideo ? 'video' : 'audio');
-    // Add a listener to read the metadata once it has loaded.
-    mediaElement.addEventListener('loadedmetadata', () => {
-      metadata.duration = Math.floor(mediaElement.duration);
-      // Override preset based off video resolution
-      if (isVideo) {
-        metadata.preset =
-          mediaElement.videoHeight >= 720
-            ? FormatPresetsNames.HIGH_RES_VIDEO
-            : FormatPresetsNames.LOW_RES_VIDEO;
-      }
+    if (isH5P) {
+      getH5PMetadata(file).then(data => {
+        Object.assign(metadata, data);
+      });
       resolve(metadata);
-    });
-    // Set the src url on the media element
-    mediaElement.src = URL.createObjectURL(file);
+    } else {
+      const mediaElement = document.createElement(isVideo ? 'video' : 'audio');
+      // Add a listener to read the metadata once it has loaded.
+      mediaElement.addEventListener('loadedmetadata', () => {
+        metadata.duration = Math.floor(mediaElement.duration);
+        // Override preset based off video resolution
+        if (isVideo) {
+          metadata.preset =
+            mediaElement.videoHeight >= 720
+              ? FormatPresetsNames.HIGH_RES_VIDEO
+              : FormatPresetsNames.LOW_RES_VIDEO;
+        }
+        resolve(metadata);
+      });
+      // Set the src url on the media element
+      mediaElement.src = URL.createObjectURL(file);
+    }
   });
 }
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js b/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
index 9f4fddfb57..f8afa7445b 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/indexedDBPlugin/index.js
@@ -116,7 +116,7 @@ export default function IndexedDBPlugin(db, listeners = []) {
       }
       // omit the last fetched attribute used only in resource layer
       const mods = omit(obj, [LAST_FETCHED]);
-      if (Object.keys(mods).length === 0) {
+      if (Object.keys(mods).length === 0 && change.type === CHANGE_TYPES.UPDATED) {
         return;
       }
       events.emit(getEventName(change.table, change.type), {
diff --git a/contentcuration/contentcuration/middleware/locale.py b/contentcuration/contentcuration/middleware/locale.py
index 5d526f3b8b..965312c0fa 100644
--- a/contentcuration/contentcuration/middleware/locale.py
+++ b/contentcuration/contentcuration/middleware/locale.py
@@ -1,4 +1,6 @@
+from django.conf import settings
 from django.middleware.locale import LocaleMiddleware
+from django.utils import translation
 
 LOCALE_EXEMPT = "_locale_exempt"
 
@@ -15,6 +17,8 @@ def _is_exempt(self, obj):
     def process_view(self, request, callback, callback_args, callback_kwargs):
         if self._is_exempt(callback):
             setattr(request, LOCALE_EXEMPT, True)
+            translation.activate(settings.LANGUAGE_CODE)
+            request.LANGUAGE_CODE = translation.get_language()
         return None
 
     def process_response(self, request, response):
diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index 2a9f99633f..86a400931c 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -1971,6 +1971,9 @@ def copy_to(
     def copy(self):
         return self.copy_to()
 
+    def is_publishable(self):
+        return self.complete and self.get_descendants(include_self=True).exclude(kind_id=content_kinds.TOPIC).exists()
+
     class Meta:
         verbose_name = "Topic"
         verbose_name_plural = "Topics"
diff --git a/contentcuration/contentcuration/static/img/kolibri_placeholder.png b/contentcuration/contentcuration/static/img/kolibri_placeholder.png
new file mode 100644
index 0000000000..c12008541e
Binary files /dev/null and b/contentcuration/contentcuration/static/img/kolibri_placeholder.png differ
diff --git a/contentcuration/contentcuration/tests/test_contentnodes.py b/contentcuration/contentcuration/tests/test_contentnodes.py
index e2dfc0a846..57496362cf 100644
--- a/contentcuration/contentcuration/tests/test_contentnodes.py
+++ b/contentcuration/contentcuration/tests/test_contentnodes.py
@@ -78,7 +78,7 @@ def _check_files_for_object(source, copy):
 
 
 def _check_tags_for_node(source, copy):
-    source_tags = source.tags.all().order_by("tag_name")
+    source_tags = source.tags.all().order_by("tag_name").distinct("tag_name")
     copy_tags = copy.tags.all().order_by("tag_name")
     assert len(source_tags) == len(copy_tags)
     for source_tag, copy_tag in zip(source_tags, copy_tags):
@@ -415,6 +415,40 @@ def test_duplicate_nodes_with_tags(self):
             num_test_tags_before, ContentTag.objects.filter(tag_name="test").count()
         )
 
+    def test_duplicate_nodes_with_duplicate_tags(self):
+        """
+        Ensures that when we copy nodes with duplicated tags they get copied
+        """
+        new_channel = testdata.channel()
+
+        tree = TreeBuilder(tags=True)
+        self.channel.main_tree = tree.root
+        self.channel.save()
+
+        # Add a legacy tag with a set channel to test the tag copying behaviour.
+        legacy_tag = ContentTag.objects.create(tag_name="test", channel=self.channel)
+        # Add an identical tag without a set channel to make sure it gets reused.
+        identical_tag = ContentTag.objects.create(tag_name="test")
+
+        num_test_tags_before = ContentTag.objects.filter(tag_name="test").count()
+
+        # Add both the legacy and the new style tag and ensure that it doesn't break.
+        self.channel.main_tree.get_children().first().tags.add(legacy_tag)
+        self.channel.main_tree.get_children().first().tags.add(identical_tag)
+
+        self.channel.main_tree.copy_to(new_channel.main_tree, batch_size=1000)
+
+        _check_node_copy(
+            self.channel.main_tree,
+            new_channel.main_tree.get_children().last(),
+            original_channel_id=self.channel.id,
+            channel=new_channel,
+        )
+
+        self.assertEqual(
+            num_test_tags_before, ContentTag.objects.filter(tag_name="test").count()
+        )
+
     def test_duplicate_nodes_deep(self):
         """
         Ensures that when we copy nodes in a deep way, a full copy happens
@@ -533,8 +567,7 @@ def test_duplicate_nodes_freeze_authoring_data_no_edit(self):
 
     def test_duplicate_nodes_no_freeze_authoring_data_edit(self):
         """
-        Ensures that when we copy nodes, we can exclude nodes from the descendant
-        hierarchy
+        Ensures that when we copy nodes, we can modify fields if they are not frozen for editing
         """
         new_channel = testdata.channel()
 
@@ -553,8 +586,7 @@ def test_duplicate_nodes_no_freeze_authoring_data_edit(self):
 
     def test_duplicate_nodes_freeze_authoring_data_edit(self):
         """
-        Ensures that when we copy nodes, we can exclude nodes from the descendant
-        hierarchy
+        Ensures that when we copy nodes, we can't modify fields if they are frozen for editing
         """
         new_channel = testdata.channel()
 
diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 68e5c3c502..36e331c713 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -9,6 +9,7 @@
 from django.core.management import call_command
 from django.db import connections
 from kolibri_content import models as kolibri_models
+from kolibri_content.router import cleanup_content_database_connection
 from kolibri_content.router import get_active_content_database
 from kolibri_content.router import set_active_content_database
 from le_utils.constants import exercises
@@ -28,6 +29,7 @@
 from .testdata import slideshow
 from .testdata import thumbnail_bytes
 from contentcuration import models as cc
+from contentcuration.utils.publish import ChannelIncompleteError
 from contentcuration.utils.publish import convert_channel_thumbnail
 from contentcuration.utils.publish import create_content_database
 from contentcuration.utils.publish import create_slideshow_manifest
@@ -216,8 +218,7 @@ def setUp(self):
 
     def tearDown(self):
         # Clean up datbase connection after the test
-        connections[self.tempdb].close()
-        del connections.databases[self.tempdb]
+        cleanup_content_database_connection(self.tempdb)
         super(ExportChannelTestCase, self).tearDown()
         set_active_content_database(None)
         if os.path.exists(self.tempdb):
@@ -429,6 +430,29 @@ def test_publish_no_modify_legacy_exercise_extra_fields(self):
         })
 
 
+class EmptyChannelTestCase(StudioTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(EmptyChannelTestCase, cls).setUpClass()
+        cls.patch_copy_db = patch('contentcuration.utils.publish.save_export_database')
+        cls.patch_copy_db.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(EmptyChannelTestCase, cls).tearDownClass()
+        cls.patch_copy_db.stop()
+
+    def test_publish_empty_channel(self):
+        content_channel = channel()
+        set_channel_icon_encoding(content_channel)
+        content_channel.main_tree.complete = True
+        content_channel.main_tree.save()
+        content_channel.main_tree.get_descendants().exclude(kind_id="topic").delete()
+        with self.assertRaises(ChannelIncompleteError):
+            create_content_database(content_channel, True, self.admin_user.id, True)
+
+
 class ChannelExportUtilityFunctionTestCase(StudioTestCase):
     @classmethod
     def setUpClass(cls):
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index 90d3ef3ccc..5bfddf4b7b 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -74,6 +74,10 @@ class NoNodesChangedError(Exception):
     pass
 
 
+class ChannelIncompleteError(Exception):
+    pass
+
+
 class SlowPublishError(Exception):
     """
     Used to track slow Publishing operations. We don't raise this error,
@@ -195,8 +199,8 @@ def __init__(
         force_exercises=False,
         progress_tracker=None,
     ):
-        if not root_node.complete:
-            raise ValueError("Attempted to publish a channel with an incomplete root node")
+        if not root_node.is_publishable():
+            raise ChannelIncompleteError("Attempted to publish a channel with an incomplete root node or no resources")
 
         self.root_node = root_node
         task_percent_total = 80.0
@@ -220,7 +224,7 @@ def recurse_nodes(self, node, inherited_fields):  # noqa C901
         logging.debug("Mapping node with id {id}".format(id=node.pk))
 
         # Only process nodes that are either non-topics or have non-topic descendants
-        if node.get_descendants(include_self=True).exclude(kind_id=content_kinds.TOPIC).exists() and node.complete:
+        if node.is_publishable():
             # early validation to make sure we don't have any exercises without mastery models
             # which should be unlikely when the node is complete, but just in case
             if node.kind_id == content_kinds.EXERCISE:
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index 737269acf1..6715cfd3e4 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -40,6 +40,7 @@
 from contentcuration.utils.garbage_collect import get_deleted_chefs_root
 from contentcuration.utils.pagination import CachedListPagination
 from contentcuration.utils.pagination import ValuesViewsetPageNumberPagination
+from contentcuration.utils.publish import ChannelIncompleteError
 from contentcuration.utils.publish import publish_channel
 from contentcuration.utils.sync import sync_channel
 from contentcuration.viewsets.base import BulkListSerializer
@@ -503,6 +504,13 @@ def publish(self, pk, version_notes="", language=None):
                         }, channel_id=channel.id
                     ),
                 ], applied=True)
+            except ChannelIncompleteError:
+                Change.create_changes([
+                    generate_update_event(
+                        channel.id, CHANNEL, {"publishing": False}, channel_id=channel.id
+                    ),
+                ], applied=True)
+                raise ValidationError("Channel is not ready to be published")
             except Exception:
                 Change.create_changes([
                     generate_update_event(
diff --git a/contentcuration/contentcuration/viewsets/contentnode.py b/contentcuration/contentcuration/viewsets/contentnode.py
index 7366d5f28a..49a81b84b4 100644
--- a/contentcuration/contentcuration/viewsets/contentnode.py
+++ b/contentcuration/contentcuration/viewsets/contentnode.py
@@ -67,7 +67,8 @@
 from contentcuration.viewsets.common import UserFilteredPrimaryKeyRelatedField
 from contentcuration.viewsets.common import UUIDInFilter
 from contentcuration.viewsets.sync.constants import CONTENTNODE
-from contentcuration.viewsets.sync.constants import COPYING_FLAG
+from contentcuration.viewsets.sync.constants import COPYING_STATUS
+from contentcuration.viewsets.sync.constants import COPYING_STATUS_VALUES
 from contentcuration.viewsets.sync.constants import CREATED
 from contentcuration.viewsets.sync.constants import DELETED
 from contentcuration.viewsets.sync.utils import generate_update_event
@@ -914,6 +915,9 @@ def copy_from_changes(self, changes):
                 log_sync_exception(e, user=self.request.user, change=copy)
                 copy["errors"] = [str(e)]
                 errors.append(copy)
+                failed_copy_node = self.get_queryset().filter(pk=copy["key"]).first()
+                if failed_copy_node is not None:
+                    failed_copy_node.delete()
         return errors
 
     def copy(
@@ -944,7 +948,6 @@ def copy(
         ).exists()
 
         with create_change_tracker(pk, CONTENTNODE, channel_id, self.request.user, "copy_nodes") as progress_tracker:
-
             new_node = source.copy_to(
                 target,
                 position,
@@ -959,7 +962,7 @@ def copy(
                 generate_update_event(
                     pk,
                     CONTENTNODE,
-                    {COPYING_FLAG: False, "node_id": new_node.node_id},
+                    {COPYING_STATUS: COPYING_STATUS_VALUES.SUCCESS, "node_id": new_node.node_id},
                     channel_id=channel_id
                 ),
                 applied=True,
diff --git a/contentcuration/contentcuration/viewsets/sync/constants.py b/contentcuration/contentcuration/viewsets/sync/constants.py
index 84c2b5aad7..ace4ebaf7b 100644
--- a/contentcuration/contentcuration/viewsets/sync/constants.py
+++ b/contentcuration/contentcuration/viewsets/sync/constants.py
@@ -55,7 +55,15 @@
 )
 
 
-# Key to use for whether a node is currently copying
-COPYING_FLAG = "__COPYING"
+# Enum for copying states
+class COPYING_STATUS_VALUES:
+    COPYING = "COPYING"
+    FAILED = "FAILED"
+    SUCCESS = "SUCCESS"
+
+
+# Key to track copying status
+COPYING_STATUS = "__COPYING_STATUS"
+
 # Key for tracking id of async task that is relevant to this indexedDB row
 TASK_ID = "__TASK_ID"
diff --git a/contentcuration/kolibri_content/router.py b/contentcuration/kolibri_content/router.py
index b7b2e69b70..9a991a9df1 100644
--- a/contentcuration/kolibri_content/router.py
+++ b/contentcuration/kolibri_content/router.py
@@ -72,6 +72,16 @@ def get_content_database_connection(alias=None):
     return connections[alias].connection
 
 
+def cleanup_content_database_connection(alias):
+    try:
+        connection = connections[alias]
+        connection.close()
+        del connections.databases[alias]
+    except (ConnectionDoesNotExist, KeyError):
+        # Already cleaned up, nothing to do here!
+        pass
+
+
 class ContentDBRouter(object):
     """A router that decides what content database to read from based on a thread-local variable."""
 
@@ -158,6 +168,7 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_value, traceback):
         set_active_content_database(self.previous_alias)
+        cleanup_content_database_connection(self.alias)
 
     def __call__(self, querying_func):
         # allow using the context manager as a decorator
diff --git a/contentcuration/kolibri_public/import_metadata_view.py b/contentcuration/kolibri_public/import_metadata_view.py
index 9d2441e69b..534596cbb4 100644
--- a/contentcuration/kolibri_public/import_metadata_view.py
+++ b/contentcuration/kolibri_public/import_metadata_view.py
@@ -59,7 +59,7 @@ def _error_message(self, low):
             )
         return error
 
-    def retrieve(self, request, pk=None):
+    def retrieve(self, request, pk=None):  # noqa: C901
         """
         An endpoint to retrieve all content metadata required for importing a content node
         all of its ancestors, and any relevant needed metadata.
@@ -139,8 +139,18 @@ def retrieve(self, request, pk=None):
             # Map the table name from the kolibri_public table name to the equivalent Kolibri table name
             table_name = kc_model._meta.db_table
             # Tweak our introspection here to rely on Django model meta instead of SQLAlchemy
-            # Read from the base_models here, as those are the ones required for this schema version
-            raw_fields = [field.column for field in base_model._meta.fields]
+            # Read valid field names from the combination of the base model, and the mptt tree fields
+            # of the kc_model - because the base model is abstract, it does not get the mptt fields applied
+            # to its meta fields attribute, so we need to read the actual fields from the kc_model, but filter
+            # them only to names valid for the base model.
+            field_names = {field.column for field in base_model._meta.fields}
+            if hasattr(base_model, "_mptt_meta"):
+                field_names.add(base_model._mptt_meta.parent_attr)
+                field_names.add(base_model._mptt_meta.tree_id_attr)
+                field_names.add(base_model._mptt_meta.left_attr)
+                field_names.add(base_model._mptt_meta.right_attr)
+                field_names.add(base_model._mptt_meta.level_attr)
+            raw_fields = [field.column for field in kc_model._meta.fields if field.column in field_names]
             if qs.model is models.Language:
                 raw_fields = [rf for rf in raw_fields if rf != "lang_name"] + ["native_name"]
             qs = qs.values(*raw_fields)
diff --git a/contentcuration/kolibri_public/models.py b/contentcuration/kolibri_public/models.py
index 6b20c1f1d7..c0056d9cf9 100644
--- a/contentcuration/kolibri_public/models.py
+++ b/contentcuration/kolibri_public/models.py
@@ -29,7 +29,15 @@ def has_all_labels(self, field_name, labels):
         annotations = {}
         for bitmask_fieldname, bits in bits.items():
             annotation_fieldname = "{}_{}".format(bitmask_fieldname, "masked")
-            filters[annotation_fieldname + "__gt"] = 0
+            # To get the correct result, i.e. an AND that all the labels are present,
+            # we need to check that the aggregated value is euqal to the bits.
+            # If we wanted an OR (which would check for any being present),
+            # we would have to use GREATER THAN 0 here.
+            filters[annotation_fieldname] = bits
+            # This ensures that the annotated value is the result of the AND operation
+            # so if all the values are present, the result will be the same as the bits
+            # but if any are missing, it will not be equal to the bits, but will only be
+            # 0 if none of the bits are present.
             annotations[annotation_fieldname] = F(bitmask_fieldname).bitand(bits)
 
         return self.annotate(**annotations).filter(**filters)
diff --git a/contentcuration/kolibri_public/tests/test_importmetadata_api.py b/contentcuration/kolibri_public/tests/test_importmetadata_api.py
index e2da98a93b..b9184f6de1 100644
--- a/contentcuration/kolibri_public/tests/test_importmetadata_api.py
+++ b/contentcuration/kolibri_public/tests/test_importmetadata_api.py
@@ -5,6 +5,7 @@
 from django.db.models import Q
 from django.urls import reverse
 from django.utils.http import http_date
+from kolibri_content import base_models
 from kolibri_content import models as content
 from kolibri_content.constants.schema_versions import CONTENT_SCHEMA_VERSION
 from kolibri_public import models as public
@@ -44,11 +45,20 @@ def _assert_data(self, Model, ContentModel, queryset):
         response = self.client.get(
             reverse("publicimportmetadata-detail", kwargs={"pk": self.node.id})
         )
+        fields = Model._meta.fields
+        BaseModel = getattr(base_models, Model.__name__, Model)
+        field_names = {field.column for field in BaseModel._meta.fields}
+        if hasattr(BaseModel, "_mptt_meta"):
+            field_names.add(BaseModel._mptt_meta.parent_attr)
+            field_names.add(BaseModel._mptt_meta.tree_id_attr)
+            field_names.add(BaseModel._mptt_meta.left_attr)
+            field_names.add(BaseModel._mptt_meta.right_attr)
+            field_names.add(BaseModel._mptt_meta.level_attr)
         for response_data, obj in zip(response.data[ContentModel._meta.db_table], queryset):
             # Ensure that we are not returning any empty objects
             self.assertNotEqual(response_data, {})
-            for field in Model._meta.fields:
-                if field.column in response_data:
+            for field in fields:
+                if field.column in field_names:
                     value = response_data[field.column]
                     if hasattr(field, "from_db_value"):
                         value = field.from_db_value(value, None, connection)
diff --git a/contentcuration/kolibri_public/tests/test_mapper.py b/contentcuration/kolibri_public/tests/test_mapper.py
index a10ef159e1..4b56813464 100644
--- a/contentcuration/kolibri_public/tests/test_mapper.py
+++ b/contentcuration/kolibri_public/tests/test_mapper.py
@@ -2,9 +2,9 @@
 import tempfile
 
 from django.core.management import call_command
-from django.db import connections
 from django.test import TestCase
 from kolibri_content import models as kolibri_content_models
+from kolibri_content.router import cleanup_content_database_connection
 from kolibri_content.router import get_active_content_database
 from kolibri_content.router import using_content_database
 from kolibri_public import models as kolibri_public_models
@@ -116,8 +116,7 @@ def test_map_replace(self):
     @classmethod
     def tearDownClass(cls):
         # Clean up datbase connection after the test
-        connections[cls.tempdb].close()
-        del connections.databases[cls.tempdb]
+        cleanup_content_database_connection(cls.tempdb)
         super(ChannelMapperTest, cls).tearDownClass()
         if os.path.exists(cls.tempdb):
             os.remove(cls.tempdb)
diff --git a/contentcuration/kolibri_public/tests/test_public_v1_api.py b/contentcuration/kolibri_public/tests/test_public_v1_api.py
index 1f581f2a24..ecaac9c177 100644
--- a/contentcuration/kolibri_public/tests/test_public_v1_api.py
+++ b/contentcuration/kolibri_public/tests/test_public_v1_api.py
@@ -30,6 +30,7 @@ def test_info_endpoint(self):
         response = self.client.get(reverse("info"))
         self.assertEqual(response.data["application"], "studio")
         self.assertEqual(response.data["device_name"], "Kolibri Studio")
+        self.assertEqual(response.data["instance_id"], "ef896e7b7bbf5a359371e6f7afd28742")
 
     def test_empty_public_channels(self):
         """
diff --git a/contentcuration/kolibri_public/views_v1.py b/contentcuration/kolibri_public/views_v1.py
index 84d832cf0b..6b118f67d9 100644
--- a/contentcuration/kolibri_public/views_v1.py
+++ b/contentcuration/kolibri_public/views_v1.py
@@ -1,6 +1,7 @@
 import json
 
 from django.conf import settings
+from django.contrib.sites.models import Site
 from django.db.models import Q
 from django.db.models import TextField
 from django.db.models import Value
@@ -8,6 +9,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.cache import cache_page
 from kolibri_content.constants.schema_versions import MIN_CONTENT_SCHEMA_VERSION
+from le_utils.uuidv5 import generate_ecosystem_namespaced_uuid
 from rest_framework import viewsets
 from rest_framework.decorators import api_view
 from rest_framework.decorators import permission_classes
@@ -120,6 +122,20 @@ def get_channel_name_by_id(request, channel_id):
 }
 
 DEVICE_INFO_VERSION = "3"
+INSTANCE_ID = None
+
+
+def get_instance_id():
+    """
+    Returns a namespaced UUID for Studio based of the domain. The current site is configured
+    through Django settings
+    :return: A uuid
+    """
+    global INSTANCE_ID
+
+    if INSTANCE_ID is None:
+        INSTANCE_ID = generate_ecosystem_namespaced_uuid(Site.objects.get_current().domain).hex
+    return INSTANCE_ID
 
 
 def get_device_info(version=DEVICE_INFO_VERSION):
@@ -136,7 +152,7 @@ def get_device_info(version=DEVICE_INFO_VERSION):
     all_info = {
         "application": "studio",
         "kolibri_version": "0.16.0",
-        "instance_id": None,
+        "instance_id": get_instance_id(),
         'device_name': "Kolibri Studio",
         "operating_system": None,
         "subset_of_users_device": False,
diff --git a/contentcuration/search/viewsets/contentnode.py b/contentcuration/search/viewsets/contentnode.py
index 199c78817d..0f88a037f6 100644
--- a/contentcuration/search/viewsets/contentnode.py
+++ b/contentcuration/search/viewsets/contentnode.py
@@ -16,11 +16,9 @@
 from search.utils import get_fts_search_query
 
 from contentcuration.models import Channel
-from contentcuration.models import File
 from contentcuration.utils.pagination import ValuesViewsetPageNumberPagination
 from contentcuration.viewsets.base import ReadOnlyValuesViewset
 from contentcuration.viewsets.base import RequiredFilterSet
-from contentcuration.viewsets.common import NotNullMapArrayAgg
 from contentcuration.viewsets.common import UUIDFilter
 from contentcuration.viewsets.common import UUIDInFilter
 
@@ -105,16 +103,8 @@ class SearchContentNodeViewSet(ReadOnlyValuesViewset):
         "content_id": "contentnode__content_id",
         "node_id": "contentnode__node_id",
         "root_id": "channel__main_tree_id",
-        "title": "contentnode__title",
-        "description": "contentnode__description",
-        "author": "contentnode__author",
-        "provider": "contentnode__provider",
         "kind": "contentnode__kind__kind",
-        "thumbnail_encoding": "contentnode__thumbnail_encoding",
-        "published": "contentnode__published",
-        "modified": "contentnode__modified",
         "parent": "contentnode__parent_id",
-        "changed": "contentnode__changed",
         "public": "channel__public",
     }
 
@@ -148,10 +138,6 @@ def annotate_queryset(self, queryset):
         """
         Annotates thumbnails, resources count and original channel name.
         """
-        thumbnails = File.objects.filter(
-            contentnode=OuterRef("contentnode__id"), preset__thumbnail=True
-        )
-
         descendant_resources_count = ExpressionWrapper(((F("contentnode__rght") - F("contentnode__lft") - Value(1)) / Value(2)), output_field=IntegerField())
 
         original_channel_name = Coalesce(
@@ -169,11 +155,6 @@ def annotate_queryset(self, queryset):
 
         queryset = queryset.annotate(
             resource_count=descendant_resources_count,
-            thumbnail_checksum=Subquery(thumbnails.values("checksum")[:1]),
-            thumbnail_extension=Subquery(
-                thumbnails.values("file_format__extension")[:1]
-            ),
-            content_tags=NotNullMapArrayAgg("contentnode__tags__tag_name"),
             original_channel_name=original_channel_name,
         )
 
diff --git a/package.json b/package.json
index 74794499f6..497b3f54b1 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "broadcast-channel": "^5.1.0",
     "codemirror": "5.58.2",
     "core-js": "^3.25.1",
-    "dexie": "^3.2.2",
+    "dexie": "^3.2.4",
     "dexie-observable": "3.0.0-beta.11",
     "epubjs": "^0.3.89",
     "file-saver": "^2.0.2",
@@ -70,6 +70,7 @@
     "intl": "1.2.5",
     "jquery": "^2.2.4",
     "jspdf": "https://github.com/parallax/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e",
+    "jszip": "^3.10.1",
     "kolibri-constants": "^0.1.41",
     "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#e9a2ff34716bb6412fe99f835ded5b17345bab94",
     "lodash": "^4.17.21",
@@ -92,8 +93,8 @@
     "vue-router": "3.6.5",
     "vuetify": "^1.5.24",
     "vuex": "^3.0.1",
-    "workbox-precaching": "^6.5.4",
-    "workbox-window": "^6.5.4"
+    "workbox-precaching": "^7.0.0",
+    "workbox-window": "^7.0.0"
   },
   "devDependencies": {
     "@vue/test-utils": "1.0.0-beta.29",
@@ -109,15 +110,15 @@
     "jest": "^26.0.1",
     "jest-each": "^29.0.3",
     "jest-environment-jsdom-sixteen": "^1.0.3",
-    "jest-serializer-vue": "^2.0.2",
+    "jest-serializer-vue": "^3.1.0",
     "kolibri-tools": "0.16.0-dev.3",
     "less": "^3.0.1",
-    "less-loader": "^11.0.0",
+    "less-loader": "^11.1.3",
     "npm-run-all": "^4.1.3",
     "stylus": "^0.59.0",
-    "stylus-loader": "^7.1.2",
-    "web-streams-polyfill": "^3.2.1",
-    "workbox-webpack-plugin": "^6.5.4"
+    "stylus-loader": "^7.1.3",
+    "workbox-webpack-plugin": "^7.0.0",
+    "web-streams-polyfill": "^3.2.1"
   },
   "false": {},
   "peerDependencies": {},
diff --git a/requirements-dev.txt b/requirements-dev.txt
index e9c4bd9d4b..48d50d49ab 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -10,7 +10,7 @@ asgiref==3.3.4
     #   django
 aspy-yaml==1.3.0
     # via pre-commit
-attrs==19.3.0
+attrs==23.1.0
     # via
     #   -c requirements.txt
     #   pytest
@@ -90,13 +90,13 @@ flask-basicauth==0.2.0
     # via locust
 flask-cors==3.0.10
     # via locust
-fonttools==4.27.1
+fonttools==4.40.0
     # via -r requirements-dev.in
 gevent==21.12.0
     # via
     #   geventhttpclient
     #   locust
-geventhttpclient==1.5.3
+geventhttpclient==2.0.9
     # via locust
 greenlet==1.1.2
     # via gevent
@@ -122,8 +122,7 @@ jinja2==3.0.3
     # via
     #   coreschema
     #   flask
-    #   locust
-locust==2.8.6
+locust==2.15.1
     # via -r requirements-dev.in
 markupsafe==2.1.2
     # via
@@ -212,7 +211,6 @@ pytz==2022.1
     #   django
 pyyaml==6.0
     # via
-    #   -c requirements.txt
     #   aspy-yaml
     #   pre-commit
 pyzmq==23.1.0
@@ -259,9 +257,7 @@ tomli==1.2.3
     #   coverage
     #   pep517
 typing-extensions==4.5.0
-    # via
-    #   -c requirements.txt
-    #   locust
+    # via locust
 uritemplate==3.0.1
     # via
     #   coreapi
diff --git a/requirements.in b/requirements.in
index 6dbd88a554..2063f296d9 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,4 +1,3 @@
-attrs==19.3.0
 django-cte==1.2.1
 django-mptt==0.14.0
 django-filter==22.1
@@ -6,7 +5,7 @@ djangorestframework==3.12.4
 psycopg2-binary==2.9.5
 django-js-reverse==0.9.1
 django-registration==3.3
-le-utils==0.1.42
+le-utils==0.2.1
 gunicorn==20.1.0
 django-postmark==0.1.6
 jsonfield==3.1.0
@@ -19,13 +18,13 @@ Django==3.2.19
 django-webpack-loader==0.7.0
 google-cloud-error-reporting
 google-cloud-storage
-django-s3-storage==0.13.11
+django-s3-storage==0.14.0
 requests>=2.20.0
 google-cloud-core
 django-db-readonly==0.7.0
 oauth2client
 django-mathfilters
-google-cloud-kms==2.0.0
+google-cloud-kms==2.10.0
 google-crc32c==1.1.2
 backoff
 backports-abc==0.5
diff --git a/requirements.txt b/requirements.txt
index 3f52a3d368..fa137e67a9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,10 +10,8 @@ asgiref==3.3.4
     # via django
 async-timeout==4.0.2
     # via redis
-attrs==19.3.0
-    # via
-    #   -r requirements.in
-    #   jsonschema
+attrs==23.1.0
+    # via jsonschema
 backoff==2.2.1
     # via -r requirements.in
 backports-abc==0.5
@@ -95,7 +93,7 @@ django-redis==5.2.0
     # via -r requirements.in
 django-registration==3.3
     # via -r requirements.in
-django-s3-storage==0.13.11
+django-s3-storage==0.14.0
     # via -r requirements.in
 django-webpack-loader==0.7.0
     # via -r requirements.in
@@ -121,7 +119,7 @@ google-cloud-core==1.7.3
     #   google-cloud-storage
 google-cloud-error-reporting==1.4.0
     # via -r requirements.in
-google-cloud-kms==2.0.0
+google-cloud-kms==2.10.0
     # via -r requirements.in
 google-cloud-logging==2.3.1
     # via google-cloud-error-reporting
@@ -139,7 +137,7 @@ googleapis-common-protos[grpc]==1.57.0
     #   grpc-google-iam-v1
 grpc-google-iam-v1==0.12.4
     # via google-cloud-kms
-grpcio==1.51.1
+grpcio==1.53.0
     # via
     #   google-api-core
     #   googleapis-common-protos
@@ -166,12 +164,8 @@ jsonschema==4.17.3
     # via -r requirements.in
 kombu==5.2.4
     # via celery
-le-utils==0.1.42
+le-utils==0.2.1
     # via -r requirements.in
-libcst==0.4.9
-    # via google-cloud-kms
-mypy-extensions==1.0.0
-    # via typing-inspect
 newrelic==6.2.0.156
     # via -r requirements.in
 oauth2client==4.1.3
@@ -180,6 +174,7 @@ packaging==20.9
     # via
     #   google-api-core
     #   google-cloud-error-reporting
+    #   google-cloud-kms
 pathlib==1.0.1
     # via -r requirements.in
 pillow==9.4.0
@@ -229,8 +224,6 @@ pytz==2022.1
     #   django
     #   django-postmark
     #   google-api-core
-pyyaml==6.0
-    # via libcst
 redis==4.5.4
     # via
     #   -r requirements.in
@@ -260,12 +253,6 @@ six==1.16.0
     #   python-dateutil
 sqlparse==0.4.1
     # via django
-typing-extensions==4.5.0
-    # via
-    #   libcst
-    #   typing-inspect
-typing-inspect==0.8.0
-    # via libcst
 urllib3==1.26.14
     # via
     #   botocore
diff --git a/yarn.lock b/yarn.lock
index 1d65477512..57bf596870 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5232,10 +5232,10 @@ dexie-observable@3.0.0-beta.11:
   resolved "https://registry.yarnpkg.com/dexie-observable/-/dexie-observable-3.0.0-beta.11.tgz#2ab39e81f0fd2a8a040e014279d07b4c13c9100f"
   integrity sha512-mKwSYy54Kj73Njp3Rs+GoldLxyDJK1LF7niBkZxSenGAlBCXB5RxafH2Mg6Ay0B1pLlDYvJCWH31s88/Uz0WSg==
 
-dexie@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/dexie/-/dexie-3.2.2.tgz#fa6f2a3c0d6ed0766f8d97a03720056f88fe0e01"
-  integrity sha512-q5dC3HPmir2DERlX+toCBbHQXW5MsyrFqPFcovkH9N2S/UW/H3H5AWAB6iEOExeraAu+j+zRDG+zg/D7YhH0qg==
+dexie@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/dexie/-/dexie-3.2.4.tgz#b22a9729be1102acb2eee16102ea6e2bc76454cf"
+  integrity sha512-VKoTQRSv7+RnffpOJ3Dh6ozknBqzWw/F3iqMdsZg958R0AS8AnY9x9d1lbwENr0gzeGJHXKcGhAMRaqys6SxqA==
 
 diacritics@1.3.0:
   version "1.3.0"
@@ -8497,13 +8497,6 @@ jest-runtime@^29.5.0:
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-serializer-vue@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/jest-serializer-vue/-/jest-serializer-vue-2.0.2.tgz#b238ef286357ec6b480421bd47145050987d59b3"
-  integrity sha512-nK/YIFo6qe3i9Ge+hr3h4PpRehuPPGZFt8LDBdTHYldMb7ZWlkanZS8Ls7D8h6qmQP2lBQVDLP0DKn5bJ9QApQ==
-  dependencies:
-    pretty "2.0.0"
-
 jest-serializer-vue@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jest-serializer-vue/-/jest-serializer-vue-3.1.0.tgz#af65817aa416d019f837b6cc53f121a3222846f4"
@@ -8967,6 +8960,16 @@ jsprim@^1.2.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
+jszip@^3.10.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
+  integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    setimmediate "^1.0.5"
+
 jszip@^3.7.1:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061"
@@ -9017,7 +9020,7 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klona@^2.0.4, klona@^2.0.6:
+klona@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
   integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
@@ -9146,12 +9149,10 @@ launch-editor@^2.6.0:
     picocolors "^1.0.0"
     shell-quote "^1.7.3"
 
-less-loader@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.0.0.tgz#a31b2bc5cdfb62f1c7de9b2d01cd944c22b1a024"
-  integrity sha512-9+LOWWjuoectIEx3zrfN83NAGxSUB5pWEabbbidVQVgZhN+wN68pOvuyirVlH1IK4VT1f3TmlyvAnCXh8O5KEw==
-  dependencies:
-    klona "^2.0.4"
+less-loader@^11.1.3:
+  version "11.1.3"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.3.tgz#1bb62d6ca9bf00a177c02793b54baac40f9be694"
+  integrity sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==
 
 less@^3.0.1:
   version "3.13.1"
@@ -11699,9 +11700,9 @@ selfsigned@^2.1.1:
     node-forge "^1"
 
 "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@7.0.0:
   version "7.0.0"
@@ -11709,21 +11710,14 @@ semver@7.0.0:
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.8:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
-  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -12600,13 +12594,12 @@ stylelint@14.10.0:
     v8-compile-cache "^2.3.0"
     write-file-atomic "^4.0.1"
 
-stylus-loader@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-7.1.2.tgz#bf9556757344469f857e2edd79d1b9f69e364f69"
-  integrity sha512-terrqvQV0ie1q2XKHnStfLOztCyKj6CYO7NqFIP2ijIsGGgCX4cbyn49DjaTwpkc91QBnMMSYkK7JAIL5gvmIg==
+stylus-loader@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-7.1.3.tgz#1fdfa0d34e8c05a569bc0902e1ecdb857d764964"
+  integrity sha512-TY0SKwiY7D2kMd3UxaWKSf3xHF0FFN/FAfsSqfrhxRT/koXTwffq2cgEWDkLQz7VojMu7qEEHt5TlMjkPx9UDw==
   dependencies:
     fast-glob "^3.2.12"
-    klona "^2.0.6"
     normalize-path "^3.0.0"
 
 stylus@^0.59.0:
@@ -13814,29 +13807,29 @@ wildcard@^2.0.0:
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
 word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
-workbox-background-sync@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9"
-  integrity sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==
+workbox-background-sync@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-7.0.0.tgz#2b84b96ca35fec976e3bd2794b70e4acec46b3a5"
+  integrity sha512-S+m1+84gjdueM+jIKZ+I0Lx0BDHkk5Nu6a3kTVxP4fdj3gKouRNmhO8H290ybnJTOPfBDtTMXSQA/QLTvr7PeA==
   dependencies:
     idb "^7.0.1"
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
-workbox-broadcast-update@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz#8441cff5417cd41f384ba7633ca960a7ffe40f66"
-  integrity sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==
+workbox-broadcast-update@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-7.0.0.tgz#7f611ca1a94ba8ac0aa40fa171c9713e0f937d22"
+  integrity sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==
   dependencies:
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
-workbox-build@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz#7d06d31eb28a878817e1c991c05c5b93409f0389"
-  integrity sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==
+workbox-build@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-7.0.0.tgz#02ab5ef2991b3369b8b9395703f08912212769b4"
+  integrity sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==
   dependencies:
     "@apideck/better-ajv-errors" "^0.3.1"
     "@babel/core" "^7.11.1"
@@ -13860,132 +13853,132 @@ workbox-build@6.5.4:
     strip-comments "^2.0.1"
     tempy "^0.6.0"
     upath "^1.2.0"
-    workbox-background-sync "6.5.4"
-    workbox-broadcast-update "6.5.4"
-    workbox-cacheable-response "6.5.4"
-    workbox-core "6.5.4"
-    workbox-expiration "6.5.4"
-    workbox-google-analytics "6.5.4"
-    workbox-navigation-preload "6.5.4"
-    workbox-precaching "6.5.4"
-    workbox-range-requests "6.5.4"
-    workbox-recipes "6.5.4"
-    workbox-routing "6.5.4"
-    workbox-strategies "6.5.4"
-    workbox-streams "6.5.4"
-    workbox-sw "6.5.4"
-    workbox-window "6.5.4"
-
-workbox-cacheable-response@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz#a5c6ec0c6e2b6f037379198d4ef07d098f7cf137"
-  integrity sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==
-  dependencies:
-    workbox-core "6.5.4"
-
-workbox-core@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba"
-  integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q==
-
-workbox-expiration@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539"
-  integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==
+    workbox-background-sync "7.0.0"
+    workbox-broadcast-update "7.0.0"
+    workbox-cacheable-response "7.0.0"
+    workbox-core "7.0.0"
+    workbox-expiration "7.0.0"
+    workbox-google-analytics "7.0.0"
+    workbox-navigation-preload "7.0.0"
+    workbox-precaching "7.0.0"
+    workbox-range-requests "7.0.0"
+    workbox-recipes "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
+    workbox-streams "7.0.0"
+    workbox-sw "7.0.0"
+    workbox-window "7.0.0"
+
+workbox-cacheable-response@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-7.0.0.tgz#ee27c036728189eed69d25a135013053277482d2"
+  integrity sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==
+  dependencies:
+    workbox-core "7.0.0"
+
+workbox-core@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-7.0.0.tgz#dec114ec923cc2adc967dd9be1b8a0bed50a3545"
+  integrity sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==
+
+workbox-expiration@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-7.0.0.tgz#3d90bcf2a7577241de950f89784f6546b66c2baa"
+  integrity sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==
   dependencies:
     idb "^7.0.1"
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
-workbox-google-analytics@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz#c74327f80dfa4c1954cbba93cd7ea640fe7ece7d"
-  integrity sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==
+workbox-google-analytics@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-7.0.0.tgz#603b2c4244af1e85de0fb26287d4e17d3293452a"
+  integrity sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==
   dependencies:
-    workbox-background-sync "6.5.4"
-    workbox-core "6.5.4"
-    workbox-routing "6.5.4"
-    workbox-strategies "6.5.4"
+    workbox-background-sync "7.0.0"
+    workbox-core "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
 
-workbox-navigation-preload@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212"
-  integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==
+workbox-navigation-preload@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-7.0.0.tgz#4913878dbbd97057181d57baa18d2bbdde085c6c"
+  integrity sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==
   dependencies:
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
-workbox-precaching@6.5.4, workbox-precaching@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72"
-  integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==
+workbox-precaching@7.0.0, workbox-precaching@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-7.0.0.tgz#3979ba8033aadf3144b70e9fe631d870d5fbaa03"
+  integrity sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==
   dependencies:
-    workbox-core "6.5.4"
-    workbox-routing "6.5.4"
-    workbox-strategies "6.5.4"
+    workbox-core "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
 
-workbox-range-requests@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399"
-  integrity sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==
+workbox-range-requests@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-7.0.0.tgz#97511901e043df27c1aa422adcc999a7751f52ed"
+  integrity sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==
   dependencies:
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
-workbox-recipes@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz#cca809ee63b98b158b2702dcfb741b5cc3e24acb"
-  integrity sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==
+workbox-recipes@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-7.0.0.tgz#1a6a01c8c2dfe5a41eef0fed3fe517e8a45c6514"
+  integrity sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==
   dependencies:
-    workbox-cacheable-response "6.5.4"
-    workbox-core "6.5.4"
-    workbox-expiration "6.5.4"
-    workbox-precaching "6.5.4"
-    workbox-routing "6.5.4"
-    workbox-strategies "6.5.4"
+    workbox-cacheable-response "7.0.0"
+    workbox-core "7.0.0"
+    workbox-expiration "7.0.0"
+    workbox-precaching "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
 
-workbox-routing@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da"
-  integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==
+workbox-routing@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.0.0.tgz#6668438a06554f60645aedc77244a4fe3a91e302"
+  integrity sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==
   dependencies:
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
-workbox-strategies@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d"
-  integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==
+workbox-strategies@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-7.0.0.tgz#dcba32b3f3074476019049cc490fe1a60ea73382"
+  integrity sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==
   dependencies:
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
-workbox-streams@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69"
-  integrity sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==
+workbox-streams@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-7.0.0.tgz#36722aecd04785f88b6f709e541c094fc658c0f9"
+  integrity sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==
   dependencies:
-    workbox-core "6.5.4"
-    workbox-routing "6.5.4"
+    workbox-core "7.0.0"
+    workbox-routing "7.0.0"
 
-workbox-sw@6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz#d93e9c67924dd153a61367a4656ff4d2ae2ed736"
-  integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA==
+workbox-sw@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-7.0.0.tgz#7350126411e3de1409f7ec243df8d06bb5b08b86"
+  integrity sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==
 
-workbox-webpack-plugin@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz#baf2d3f4b8f435f3469887cf4fba2b7fac3d0fd7"
-  integrity sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==
+workbox-webpack-plugin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-7.0.0.tgz#6c61661a2cacde1239192a5877a041a2943d1a55"
+  integrity sha512-R1ZzCHPfzeJjLK2/TpKUhxSQ3fFDCxlWxgRhhSjMQLz3G2MlBnyw/XeYb34e7SGgSv0qG22zEhMIzjMNqNeKbw==
   dependencies:
     fast-json-stable-stringify "^2.1.0"
     pretty-bytes "^5.4.1"
     upath "^1.2.0"
     webpack-sources "^1.4.3"
-    workbox-build "6.5.4"
+    workbox-build "7.0.0"
 
-workbox-window@6.5.4, workbox-window@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz#d991bc0a94dff3c2dbb6b84558cff155ca878e91"
-  integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==
+workbox-window@7.0.0, workbox-window@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-7.0.0.tgz#a683ab33c896e4f16786794eac7978fc98a25d08"
+  integrity sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==
   dependencies:
     "@types/trusted-types" "^2.0.2"
-    workbox-core "6.5.4"
+    workbox-core "7.0.0"
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   name wrap-ansi-cjs