diff --git a/contentcuration/contentcuration/constants/completion_criteria.py b/contentcuration/contentcuration/constants/completion_criteria.py
index deee7fd62a..ffed5d7821 100644
--- a/contentcuration/contentcuration/constants/completion_criteria.py
+++ b/contentcuration/contentcuration/constants/completion_criteria.py
@@ -20,6 +20,53 @@ def _build_validator():
 validator = _build_validator()
 
 
+ALLOWED_MODELS_PER_KIND = {
+    content_kinds.DOCUMENT: {
+        completion_criteria.PAGES,
+        completion_criteria.TIME,
+        completion_criteria.APPROX_TIME,
+        completion_criteria.REFERENCE,
+    },
+    content_kinds.EXERCISE: {completion_criteria.MASTERY},
+    content_kinds.HTML5: {
+        completion_criteria.DETERMINED_BY_RESOURCE,
+        completion_criteria.TIME,
+        completion_criteria.APPROX_TIME,
+        completion_criteria.REFERENCE,
+    },
+    content_kinds.H5P: {
+        completion_criteria.DETERMINED_BY_RESOURCE,
+        completion_criteria.TIME,
+        completion_criteria.APPROX_TIME,
+        completion_criteria.REFERENCE,
+    },
+    content_kinds.AUDIO: {
+        completion_criteria.TIME,
+        completion_criteria.APPROX_TIME,
+        completion_criteria.REFERENCE,
+    },
+    content_kinds.VIDEO: {
+        completion_criteria.TIME,
+        completion_criteria.APPROX_TIME,
+        completion_criteria.REFERENCE,
+    },
+}
+
+
+def check_model_for_kind(data, kind):
+    model = data.get("model")
+    if kind is None or model is None or kind not in ALLOWED_MODELS_PER_KIND:
+        return
+
+    # validate that content kind is allowed for the completion criteria model
+    if model not in ALLOWED_MODELS_PER_KIND[kind]:
+        raise ValidationError(
+            "Completion criteria model '{}' is invalid for content kind '{}'".format(
+                model, kind
+            )
+        )
+
+
 def validate(data, kind=None):
     """
     :param data: Dictionary of data to validate
@@ -49,16 +96,4 @@ def validate(data, kind=None):
         e.error_list.extend(error_descriptions)
         raise e
 
-    model = data.get("model")
-    if kind is None or model is None:
-        return
-
-    # validate that content kind is allowed for the completion criteria model
-    if (model == completion_criteria.PAGES and kind != content_kinds.DOCUMENT) or (
-        model == completion_criteria.MASTERY and kind != content_kinds.EXERCISE
-    ):
-        raise ValidationError(
-            "Completion criteria model '{}' is invalid for content kind '{}'".format(
-                model, kind
-            )
-        )
+    check_model_for_kind(data, kind)
diff --git a/contentcuration/contentcuration/context_processors.py b/contentcuration/contentcuration/context_processors.py
index 86d372895b..83736d7972 100644
--- a/contentcuration/contentcuration/context_processors.py
+++ b/contentcuration/contentcuration/context_processors.py
@@ -22,6 +22,10 @@ def site_variables(request):
         "DEBUG": settings.DEBUG,
         "LANG_INFO": json_for_parse_from_data(language_globals()),
         "LOGGED_IN": not request.user.is_anonymous,
+        "SENTRY_DSN": settings.SENTRY_DSN,
+        "SENTRY_ENVIRONMENT": settings.SENTRY_ENVIRONMENT,
+        "SENTRY_RELEASE": settings.SENTRY_RELEASE,
+        "SENTRY_ACTIVE": settings.SENTRY_ACTIVE,
     }
 
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/__tests__/CurrentTopicView.spec.js b/contentcuration/contentcuration/frontend/channelEdit/__tests__/CurrentTopicView.spec.js
index 7745554d28..3f7fd9b0e2 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/__tests__/CurrentTopicView.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/__tests__/CurrentTopicView.spec.js
@@ -81,15 +81,21 @@ function selectNode(wrapper) {
 }
 
 describe('CurrentTopicView', () => {
+  let wrapper;
+
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
   it('smoke test', () => {
     const store = storeFactory(STORE_CONFIG);
-    const wrapper = makeWrapper({ store });
+    wrapper = makeWrapper({ store });
 
     expect(wrapper.isVueInstance()).toBe(true);
   });
 
   describe('for a topic with nodes', () => {
-    let store, wrapper;
+    let store;
 
     beforeEach(() => {
       global.CHANNEL_EDIT_GLOBAL.channel_id = CHANNEL.id;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
index 2209dda4ac..2afa529798 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ActivityDuration.vue
@@ -23,6 +23,7 @@
               :items="availableNumbers"
               :menu-props="menuProps"
               :attach="attach"
+              :rules="minutesRules"
             />
           </template>
         </DropdownWrapper>
@@ -102,10 +103,7 @@
         if (this.audioVideoUpload) {
           return false;
         }
-        return (
-          this.selectedDuration !== DurationDropdownMap.EXACT_TIME &&
-          this.selectedCompletion === CompletionDropdownMap.completeDuration
-        );
+        return this.selectedCompletion === CompletionDropdownMap.completeDuration;
       },
       showOptionalLabel() {
         return this.selectedDuration !== DurationDropdownMap.EXACT_TIME;
@@ -153,8 +151,13 @@
           return getShortActivityDurationValidators().map(translateValidator);
         } else if (this.selectedDuration === DurationDropdownMap.LONG_ACTIVITY) {
           return getLongActivityDurationValidators().map(translateValidator);
+        } else if (
+          this.selectedDuration === DurationDropdownMap.EXACT_TIME &&
+          this.selectedCompletion === CompletionDropdownMap.completeDuration
+        ) {
+          return getActivityDurationValidators().map(translateValidator);
         }
-        return getActivityDurationValidators().map(translateValidator);
+        return [];
       },
     },
     created() {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
index 5202afb40c..788651098e 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
@@ -1,6 +1,15 @@
 <template>
 
   <div>
+    <!-- Checkbox for "Allow learners to mark complete" -->
+    <Checkbox
+      v-model="learnerManaged"
+      color="primary"
+      :indeterminate="notUnique"
+      :disabled="notUnique"
+      :label="$tr('learnersCanMarkComplete')"
+      style="padding-bottom: 16px;"
+    />
     <!-- Layout when practice quizzes are enabled -->
     <VLayout xs6 md6>
       <!-- "Completion" dropdown menu  -->
@@ -10,6 +19,7 @@
             ref="completion"
             v-model="completionDropdown"
             box
+            :placeholder="getPlaceholder('value')"
             :items="showCorrectCompletionOptions"
             :label="translateMetadataString('completion')"
             :required="required"
@@ -24,9 +34,9 @@
         <MasteryCriteriaGoal
           v-if="showMasteryCriteriaGoalDropdown"
           ref="mastery_model"
-          v-model="goal"
+          v-model="masteryModel"
           :placeholder="getPlaceholder('mastery_model')"
-          :required="isUnique(mastery_model)"
+          :required="isUnique(masteryModel)"
           @focus="trackClick('Mastery model')"
         />
       </VFlex>
@@ -36,25 +46,25 @@
       <MasteryCriteriaMofNFields
         v-if="kind === 'exercise'"
         ref="mastery_model_m_of_n"
-        v-model="masteryModelItem"
+        v-model="mOfN"
         :showMofN="showMofN"
-        :mPlaceholder="getPlaceholder('m')"
-        :mRequired="isUnique(m)"
-        :nPlaceholder="getPlaceholder('n')"
-        :nRequired="isUnique(n)"
+        :mPlaceholder="getPlaceholder('mOfN.m')"
+        :mRequired="isUnique(mOfN.m)"
+        :nPlaceholder="getPlaceholder('mOfN.n')"
+        :nRequired="isUnique(mOfN.n)"
         @mFocus="trackClick('Mastery m value')"
         @nFocus="trackClick('Mastery n value')"
       />
     </VLayout>
 
     <VLayout row wrap>
-      <DropdownWrapper component="VFlex" xs6 md6 class="pr-2">
+      <DropdownWrapper v-if="showDuration" component="VFlex" xs6 md6 class="pr-2">
         <template #default="{ attach, menuProps }">
           <VSelect
-            v-if="!hideDurationDropdown"
             ref="duration"
             v-model="durationDropdown"
             box
+            :placeholder="getPlaceholder('value')"
             :items="selectableDurationOptions"
             :label="translateMetadataString('duration')"
             :required="required"
@@ -67,14 +77,13 @@
       </DropdownWrapper>
 
       <!-- "Activity duration" minutes input -->
-      <VFlex xs6 md6>
+      <VFlex v-if="showDuration" xs6 md6>
         <ActivityDuration
-          v-if="showActivityDurationInput"
           ref="activity_duration"
-          v-model="minutes"
-          :selectedDuration="currentDurationDropdown || durationDropdown"
+          v-model="durationValue"
+          :selectedDuration="durationDropdown"
           :duration="fileDuration"
-          :selectedCompletion="currentCompletionDropdown || completionDropdown"
+          :selectedCompletion="completionDropdown"
           :audioVideoUpload="kind === 'video' || kind === 'audio'"
         />
       </VFlex>
@@ -99,7 +108,9 @@
     ContentModalities,
     CompletionDropdownMap,
     DurationDropdownMap,
+    nonUniqueValue,
   } from 'shared/constants';
+  import Checkbox from 'shared/views/form/Checkbox';
   import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
   import {
@@ -113,17 +124,64 @@
   const DEFAULT_SHORT_ACTIVITY = 600;
   const DEFAULT_LONG_ACTIVITY = 3000;
   const SHORT_LONG_ACTIVITY_MIDPOINT = 1860;
-  const nonUniqueValue = {};
-  nonUniqueValue.toString = () => '';
 
-  const SuggestedDurationTypesMap = {
-    APPROX_TIME: 'approx_time',
-    TIME: 'time',
+  const defaultCompletionCriteriaModels = {
+    [ContentKindsNames.VIDEO]: CompletionCriteriaModels.TIME,
+    [ContentKindsNames.AUDIO]: CompletionCriteriaModels.TIME,
+    [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
+    [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
+    [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
+    [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
+  };
+
+  const defaultCompletionCriteriaThresholds = {
+    // Audio and Video threshold defaults are dynamic based
+    // on the duration of the file itself.
+    [ContentKindsNames.DOCUMENT]: '100%',
+    [ContentKindsNames.HTML5]: 300,
+    // We cannot set an automatic default threshold for exercises.
+  };
+
+  const completionCriteriaToDropdownMap = {
+    [CompletionCriteriaModels.TIME]: CompletionDropdownMap.completeDuration,
+    [CompletionCriteriaModels.APPROX_TIME]: CompletionDropdownMap.completeDuration,
+    [CompletionCriteriaModels.PAGES]: CompletionDropdownMap.allContent,
+    [CompletionCriteriaModels.DETERMINED_BY_RESOURCE]: CompletionDropdownMap.determinedByResource,
+    [CompletionCriteriaModels.MASTERY]: CompletionDropdownMap.goal,
+    [CompletionCriteriaModels.REFERENCE]: CompletionDropdownMap.reference,
+  };
+
+  const CompletionOptionsDropdownMap = {
+    [ContentKindsNames.DOCUMENT]: [
+      CompletionDropdownMap.allContent,
+      CompletionDropdownMap.completeDuration,
+      CompletionDropdownMap.reference,
+    ],
+    [ContentKindsNames.EXERCISE]: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
+    [ContentKindsNames.HTML5]: [
+      CompletionDropdownMap.completeDuration,
+      CompletionDropdownMap.determinedByResource,
+      CompletionDropdownMap.reference,
+    ],
+    [ContentKindsNames.H5P]: [
+      CompletionDropdownMap.determinedByResource,
+      CompletionDropdownMap.completeDuration,
+      CompletionDropdownMap.reference,
+    ],
+    [ContentKindsNames.VIDEO]: [
+      CompletionDropdownMap.completeDuration,
+      CompletionDropdownMap.reference,
+    ],
+    [ContentKindsNames.AUDIO]: [
+      CompletionDropdownMap.completeDuration,
+      CompletionDropdownMap.reference,
+    ],
   };
 
   export default {
     name: 'CompletionOptions',
     components: {
+      Checkbox,
       DropdownWrapper,
       ActivityDuration,
       MasteryCriteriaMofNFields,
@@ -150,18 +208,19 @@
         default: () => ({}),
       },
     },
-    data() {
-      return {
-        // required state because we need to know the durationDropdown before it is set in backend
-        currentDurationDropdown: null,
-        // required state because we need to know the completion to determine durationDropdown model
-        currentCompletionDropdown: null,
-        mastery_model: null,
-        m: null,
-        n: null,
-      };
-    },
     computed: {
+      notUnique() {
+        return this.value === nonUniqueValue;
+      },
+      model() {
+        return this.value.model || defaultCompletionCriteriaModels[this.kind];
+      },
+      threshold() {
+        if (!this.value.model) {
+          return this.generateDefaultThreshold();
+        }
+        return this.value.threshold;
+      },
       showMasteryCriteriaGoalDropdown() {
         if (this.kind === ContentKindsNames.EXERCISE) {
           //this ensures that anytime the completion dropdown is practice quiz
@@ -172,547 +231,166 @@
       audioVideoResource() {
         return this.kind === ContentKindsNames.AUDIO || this.kind === ContentKindsNames.VIDEO;
       },
-      hideDurationDropdown() {
-        // named "hide" instead of "show" because "show" is the default behavior
-        if (this.value) {
-          if (this.kind === ContentKindsNames.H5P) {
-            return true;
-          }
-          return (
-            this.currentCompletionDropdown === CompletionDropdownMap.reference ||
-            (this.value.model === CompletionCriteriaModels.REFERENCE &&
-              !this.currentCompletionDropdown) ||
-            //should be hidden if model is reference and we're getting this from the BE
-            this.currentCompletionDropdown === CompletionDropdownMap.determinedByResource
-          );
-        }
-        return false;
+      showDuration() {
+        return (
+          this.model === CompletionCriteriaModels.TIME ||
+          this.model === CompletionCriteriaModels.APPROX_TIME
+        );
       },
       showReferenceHint() {
         /*
           The reference hint should be shown only when "Reference" is selected
         */
-        if (this.value) {
-          if (this.kind === ContentKindsNames.H5P || this.kind === ContentKindsNames.HTML5) {
-            if (this.currentCompletionDropdown === CompletionDropdownMap.determinedByResource) {
-              return false;
-            }
-            if (
-              this.value.model === CompletionCriteriaModels.REFERENCE &&
-              this.currentCompletionDropdown === CompletionDropdownMap.completeDuration
-            ) {
-              return true;
-            }
-          }
-          if (this.audioVideoResource) {
-            return this.value.model === CompletionCriteriaModels.REFERENCE;
-          }
-          return (
-            this.value.model === CompletionCriteriaModels.REFERENCE &&
-            this.currentCompletionDropdown !== CompletionDropdownMap.completeDuration
-          );
-        }
-        return false;
-      },
-      showActivityDurationInput() {
-        /* The `ActivityDuration` component should visible when:
-          - Long activity, short activity, or exact time are chosen if it is not an AV resource
-          - Long activity or short activity are chosen if it is an AV resource
-          - Long activity, short activity, or exact time are chosen in HTML5
-        */
-        if (this.value) {
-          const switchingFromReferenceBetweenAllContentViewedAndCompleteDuration =
-            this.value.suggested_duration === null || this.value.suggested_duration_type === null;
-
-          if (!this.audioVideoResource) {
-            if (this.kind === ContentKindsNames.HTML5 || this.kind === ContentKindsNames.H5P) {
-              if (this.value.model !== CompletionCriteriaModels.REFERENCE) {
-                if (!this.currentCompletionDropdown) {
-                  return true;
-                }
-                return this.currentCompletionDropdown === CompletionDropdownMap.completeDuration;
-              }
-            }
-            return !(
-              this.value.model === CompletionCriteriaModels.REFERENCE ||
-              switchingFromReferenceBetweenAllContentViewedAndCompleteDuration
-            );
-          }
-        }
-        return this.audioVideoResource && this.value.model !== CompletionCriteriaModels.REFERENCE;
+        return this.model === CompletionCriteriaModels.REFERENCE;
       },
       completionDropdown: {
         get() {
-          if (this.audioVideoResource) {
-            if (this.value.model === CompletionCriteriaModels.REFERENCE) {
-              return CompletionDropdownMap.reference;
-            }
-            return CompletionDropdownMap.completeDuration;
-          }
-
-          if (this.kind === ContentKindsNames.DOCUMENT) {
-            if (!this.value['model']) {
-              return CompletionDropdownMap.allContent;
-            } else {
-              if (
-                this.value.model === CompletionCriteriaModels.PAGES ||
-                this.value.model === CompletionCriteriaModels.REFERENCE
-              ) {
-                return CompletionDropdownMap.allContent;
-              }
-              return CompletionDropdownMap.completeDuration;
-            }
-          }
-
-          if (this.kind === ContentKindsNames.HTML5) {
-            if (
-              !this.value['model'] ||
-              this.value.model === CompletionCriteriaModels.APPROX_TIME ||
-              this.value.model === CompletionCriteriaModels.TIME ||
-              this.value.model === CompletionCriteriaModels.REFERENCE
-            ) {
-              return CompletionDropdownMap.completeDuration;
-            }
-            return CompletionDropdownMap.determinedByResource;
-          }
-
-          if (this.kind === ContentKindsNames.H5P) {
-            if (!this.value['model']) {
-              return CompletionDropdownMap.determinedByResource;
-            }
-            return CompletionDropdownMap.completeDuration;
+          if (this.notUnique) {
+            return;
           }
-
-          if (this.kind === ContentKindsNames.EXERCISE) {
-            // if the practice quiz flag is set, return "practice quiz"
-            if (this.practiceQuizzesAllowed && this.value.modality === ContentModalities.QUIZ) {
-              return CompletionDropdownMap.practiceQuiz;
-            }
-            return CompletionDropdownMap.goal;
+          if (
+            this.value.modality === ContentModalities.QUIZ &&
+            this.model === CompletionCriteriaModels.MASTERY
+          ) {
+            return CompletionDropdownMap.practiceQuiz;
           }
-
-          return '';
+          return completionCriteriaToDropdownMap[this.model];
         },
         set(value) {
-          let update = {};
-          this.currentCompletionDropdown = value;
+          const update = {};
 
-          // FOR AUDIO/VIDEO
           if (value === CompletionDropdownMap.reference) {
-            update.suggested_duration_type = this.value.suggested_duration_type;
-            update.completion_criteria = {
-              model: CompletionCriteriaModels.REFERENCE,
-              threshold: null,
-            };
-          }
-
-          // FOR DOCUMENTS
-          if (this.kind === ContentKindsNames.DOCUMENT) {
-            if (value === CompletionDropdownMap.allContent) {
-              update.suggested_duration_type = this.value.suggested_duration_type;
-              update.suggested_duration = this.value.suggested_duration;
-              update.completion_criteria = {
-                model: CompletionCriteriaModels.PAGES,
-                threshold: '100%',
-              };
-            } else if (value === CompletionDropdownMap.reference) {
-              update.suggested_duration_type = null;
-              update.completion_criteria = {
-                model: CompletionCriteriaModels.REFERENCE,
-                threshold: null,
-              };
-            } else {
-              update.suggested_duration_type = this.value.suggested_duration_type;
-              update.suggested_duration = this.value.suggested_duration;
-              if (
-                this.durationDropdown === DurationDropdownMap.LONG_ACTIVITY ||
-                this.durationDropdown === DurationDropdownMap.SHORT_ACTIVITY
-              ) {
-                update.completion_criteria = {
-                  model: CompletionCriteriaModels.APPROX_TIME,
-                  threshold: this.value.suggested_duration || 0,
-                };
-              } else if (this.durationDropdown === DurationDropdownMap.EXACT_TIME) {
-                update.completion_criteria = {
-                  model: CompletionCriteriaModels.TIME,
-                  threshold: this.value.suggested_duration || 0,
-                };
-              } else {
-                // default state
-                update.completion_criteria = {
-                  model: this.value.model,
-                  threshold: this.value.threshold,
-                };
-              }
-            }
-          }
-
-          // FOR H5P/HTML5
-          if (this.kind === ContentKindsNames.HTML5 || this.kind === ContentKindsNames.H5P) {
-            if (value === CompletionDropdownMap.determinedByResource) {
-              update.completion_criteria = {
-                model: this.value.model,
-                threshold: this.value.threshold,
-              };
-            }
-          }
-
-          // FOR EXERCISES
-          if (this.kind === ContentKindsNames.EXERCISE) {
-            if (value === CompletionDropdownMap.practiceQuiz) {
-              update.modality = ContentModalities.QUIZ;
-              update.completion_criteria = {
-                model: this.value.model,
-                threshold: this.value.threshold,
-              };
+            update.model = CompletionCriteriaModels.REFERENCE;
+            update.durationType = null;
+            update.duration = null;
+            update.threshold = null;
+          } else if (value === CompletionDropdownMap.completeDuration) {
+            update.model = this.audioVideoResource
+              ? CompletionCriteriaModels.TIME
+              : CompletionCriteriaModels.APPROX_TIME;
+            if (!this.audioVideoResource) {
+              update.threshold = DEFAULT_SHORT_ACTIVITY;
+              update.duration = update.threshold;
             } else {
-              update.modality = null;
-              update.completion_criteria = {
-                model: this.value.model,
-                threshold: this.value.threshold,
-              };
+              update.threshold = this.generateDefaultThreshold();
+              update.duration = update.threshold;
             }
+            update.durationType = update.model;
+          } else if (value === CompletionDropdownMap.allContent) {
+            update.model = CompletionCriteriaModels.PAGES;
+            update.threshold = '100%';
+          } else if (value === CompletionDropdownMap.determinedByResource) {
+            update.model = CompletionCriteriaModels.DETERMINED_BY_RESOURCE;
+            update.durationType = null;
+            update.duration = null;
+            update.threshold = null;
+          } else if (value === CompletionDropdownMap.practiceQuiz) {
+            update.modality = ContentModalities.QUIZ;
+            update.threshold = { mastery_model: MasteryModelsNames.DO_ALL };
+          } else if (value === CompletionDropdownMap.goal) {
+            update.modality = null;
+            update.model = CompletionCriteriaModels.MASTERY;
           }
           this.handleInput(update);
         },
       },
-      goal: {
+      masteryModel: {
         get() {
-          if (this.value.threshold) {
-            return { mastery_model: this.value.threshold.mastery_model };
-          }
-          return { mastery_model: this.mastery_model };
+          return get(this, 'threshold.mastery_model');
         },
-        set(threshold) {
-          let update = {};
-          if (threshold.mastery_model === MasteryModelsNames.M_OF_N) {
-            update.completion_criteria = {
-              model: CompletionCriteriaModels.MASTERY,
-              threshold: {
-                mastery_model: threshold.mastery_model,
-                m: get(this.value, 'threshold.m') || this.m,
-                n: get(this.value, 'threshold.n') || this.n,
-              },
-            };
-          } else {
-            update.completion_criteria = {
-              model: CompletionCriteriaModels.MASTERY,
-              threshold: {
-                mastery_model: threshold.mastery_model,
-                m: null,
-                n: null,
-              },
-            };
+        set(mastery_model) {
+          const update = { threshold: { mastery_model } };
+          if (mastery_model === MasteryModelsNames.M_OF_N) {
+            update.threshold.m = get(this, 'threshold.m');
+            update.threshold.n = get(this, 'threshold.n');
           }
           this.handleInput(update);
         },
       },
       showMofN() {
-        if (this.kind === ContentKindsNames.EXERCISE) {
-          if (this.value.modality === ContentModalities.QUIZ) {
-            return false;
-          }
-          if (this.value.threshold) {
-            const defaultStateWhenSwitchingFromGoalToPracticeQuiz =
-              this.value.threshold.mastery_model === MasteryModelsNames.M_OF_N &&
-              this.currentCompletionDropdown === null;
-            if (
-              this.currentCompletionDropdown === CompletionDropdownMap.goal &&
-              this.value.threshold.mastery_model === MasteryModelsNames.M_OF_N
-            ) {
-              return true;
-            }
-            if (defaultStateWhenSwitchingFromGoalToPracticeQuiz) {
-              return true;
-            }
-          }
+        if (this.kind !== ContentKindsNames.EXERCISE) {
+          return false;
         }
-        return false;
+        if (this.value.modality === ContentModalities.QUIZ) {
+          return false;
+        }
+        return get(this, 'threshold.mastery_model') === MasteryModelsNames.M_OF_N;
       },
-      masteryModelItem: {
+      mOfN: {
         get() {
-          if (get(this.value, 'threshold.mastery_model') !== MasteryModelsNames.M_OF_N) {
-            return {
-              m: null,
-              n: null,
-            };
-          }
           return {
-            m: get(this.value, 'threshold.m') || this.m,
-            n: get(this.value, 'threshold.n') || this.n,
+            m: get(this.value, 'threshold.m'),
+            n: get(this.value, 'threshold.n'),
           };
         },
         set(threshold) {
-          this.m = get(threshold, 'm') || this.m;
-          this.n = get(threshold, 'n') || this.n;
-
-          const mastery_model = get(this.value, 'threshold.mastery_model');
-          const completion_criteria = {
-            model: CompletionCriteriaModels.MASTERY,
-            threshold: {
-              mastery_model,
-            },
-          };
+          const mastery_model = get(this, 'threshold.mastery_model');
           if (mastery_model === MasteryModelsNames.M_OF_N) {
-            completion_criteria.threshold.m = this.m;
-            completion_criteria.threshold.n = this.n;
+            threshold.mastery_model = mastery_model;
+            this.handleInput({ threshold });
           }
-          this.handleInput({ completion_criteria });
         },
       },
-      isLongActivity() {
-        return (
-          this.value.suggested_duration > SHORT_LONG_ACTIVITY_MIDPOINT &&
-          this.value.suggested_duration_type === SuggestedDurationTypesMap.APPROX_TIME
-        );
-      },
-      isShortActivity() {
-        return (
-          this.value.suggested_duration <= SHORT_LONG_ACTIVITY_MIDPOINT &&
-          this.value.suggested_duration_type === SuggestedDurationTypesMap.APPROX_TIME
-        );
-      },
-      isExactTime() {
-        return this.value.suggested_duration_type === SuggestedDurationTypesMap.TIME;
-      },
-      isSwitchingFromCompleteDurationToAllContent() {
-        return (
-          this.completionDropdown === CompletionDropdownMap.completeDuration &&
-          this.currentCompletionDropdown === CompletionDropdownMap.allContent
-        );
-      },
-      isSwitchingFromAllContentToCompleteDuration() {
-        return (
-          this.completionDropdown === CompletionDropdownMap.allContent &&
-          this.currentCompletionDropdown === CompletionDropdownMap.completeDuration
-        );
-      },
-      requiresAudioVideoDefault() {
-        return this.audioVideoResource && !this.value.model;
-      },
-      completionDropdownIsCompleteDuration() {
+      timeBasedModel() {
         return (
-          (this.completionDropdown === null &&
-            this.currentCompletionDropdown === CompletionDropdownMap.completeDuration) ||
-          (this.completionDropdown === CompletionDropdownMap.completeDuration &&
-            this.currentCompletionDropdown === null) ||
-          (this.completionDropdown === CompletionDropdownMap.completeDuration &&
-            this.currentCompletionDropdown === CompletionDropdownMap.completeDuration) ||
-          this.currentCompletionDropdown === CompletionDropdownMap.completeDuration
+          this.model === CompletionCriteriaModels.TIME ||
+          this.model === CompletionCriteriaModels.APPROX_TIME
         );
       },
-      completionDropdownIsAllContentViewed() {
-        return (
-          (this.completionDropdown === null &&
-            this.currentCompletionDropdown === CompletionDropdownMap.allContent) ||
-          (this.completionDropdown === CompletionDropdownMap.allContent &&
-            this.currentCompletionDropdown === null) ||
-          (this.completionDropdown === CompletionDropdownMap.allContent &&
-            this.currentCompletionDropdown === CompletionDropdownMap.allContent)
-        );
-      },
-      durationDropdown: {
+      durationValue: {
         get() {
-          if (this.value) {
-            const defaultStateForAudioVideo =
-              this.value.suggested_duration === null &&
-              !this.value.suggested_duration_type &&
-              this.audioVideoResource;
-            if (
-              this.value.model === CompletionCriteriaModels.REFERENCE ||
-              (this.currentCompletionDropdown === CompletionDropdownMap.completeDuration &&
-                this.currentDurationDropdown === DurationDropdownMap.REFERENCE)
-            ) {
-              return DurationDropdownMap.REFERENCE;
-            } else if (this.value.model === CompletionCriteriaModels.PAGES) {
-              if (this.isLongActivity) {
-                return DurationDropdownMap.LONG_ACTIVITY;
-              }
-              if (this.isShortActivity) {
-                return DurationDropdownMap.SHORT_ACTIVITY;
-              }
-              if (this.isExactTime) {
-                return DurationDropdownMap.EXACT_TIME;
-              }
-            } else if (
-              this.value.model === CompletionCriteriaModels.TIME ||
-              defaultStateForAudioVideo
-            ) {
-              return DurationDropdownMap.EXACT_TIME;
-            } else {
-              if (this.isLongActivity) {
-                return DurationDropdownMap.LONG_ACTIVITY;
-              }
-              if (this.isShortActivity) {
-                return DurationDropdownMap.SHORT_ACTIVITY;
-              }
-              if (this.isExactTime) {
-                return DurationDropdownMap.EXACT_TIME;
-              }
-            }
-          }
-          return '';
+          return this.timeBasedModel ? this.threshold : this.value.suggested_duration;
         },
         set(duration) {
-          const update = {};
-          this.currentDurationDropdown = duration;
-
-          if (duration === DurationDropdownMap.REFERENCE) {
-            update.suggested_duration_type = null;
-            update.completion_criteria = {
-              model: CompletionCriteriaModels.REFERENCE,
-              threshold: null,
-            };
-          } else if (
-            this.isSwitchingFromCompleteDurationToAllContent ||
-            this.completionDropdownIsAllContentViewed
-          ) {
-            if (duration === DurationDropdownMap.EXACT_TIME) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.TIME;
-              update.suggested_duration = this.value.suggested_duration || 60;
-            }
-            if (duration === DurationDropdownMap.SHORT_ACTIVITY) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.APPROX_TIME;
-              update.suggested_duration = this.handleMinutesInputFromActivityDuration(
-                this.value.suggested_duration,
-                duration
-              );
-            }
-            if (duration === DurationDropdownMap.LONG_ACTIVITY) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.APPROX_TIME;
-              update.suggested_duration = this.handleMinutesInputFromActivityDuration(
-                this.value.suggested_duration,
-                duration
-              );
-            }
-            update.completion_criteria = {
-              model: CompletionCriteriaModels.PAGES,
-              threshold: '100%',
-            };
-          } else if (
-            this.isSwitchingFromAllContentToCompleteDuration ||
-            this.requiresAudioVideoDefault ||
-            this.completionDropdownIsCompleteDuration ||
-            this.kind === ContentKindsNames.HTML5 ||
-            this.kind === ContentKindsNames.H5P
-          ) {
-            if (duration === DurationDropdownMap.SHORT_ACTIVITY) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.APPROX_TIME;
-              update.suggested_duration = this.handleMinutesInputFromActivityDuration(
-                this.value.suggested_duration,
-                duration
-              );
-              update.completion_criteria = {
-                model: CompletionCriteriaModels.APPROX_TIME,
-                threshold: update.suggested_duration,
-              };
-            }
-            if (duration === DurationDropdownMap.LONG_ACTIVITY) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.APPROX_TIME;
-              update.suggested_duration = this.handleMinutesInputFromActivityDuration(
-                this.value.suggested_duration,
-                duration
-              );
-              update.completion_criteria = {
-                model: CompletionCriteriaModels.APPROX_TIME,
-                threshold: update.suggested_duration,
-              };
-            }
-            if (duration === DurationDropdownMap.EXACT_TIME) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.TIME;
-              update.suggested_duration = this.value.suggested_duration || 60;
-              update.completion_criteria = {
-                model: CompletionCriteriaModels.TIME,
-                threshold: update.suggested_duration,
-              };
-            }
-          }
-
-          if (this.value.model === CompletionCriteriaModels.MASTERY) {
-            if (duration === DurationDropdownMap.SHORT_ACTIVITY) {
-              update.suggested_duration = this.handleMinutesInputFromActivityDuration(
-                this.value.suggested_duration,
-                duration
-              );
-              update.completion_criteria = {
-                model: this.value.model,
-                threshold: this.value.threshold,
-              };
-            }
-            if (duration === DurationDropdownMap.LONG_ACTIVITY) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.APPROX_TIME;
-              const roundedValue = Math.round(this.value.suggested_duration / 600) * 600;
-              if (roundedValue < SHORT_LONG_ACTIVITY_MIDPOINT || roundedValue > 7200) {
-                update.suggested_duration = DEFAULT_LONG_ACTIVITY;
-              } else {
-                update.suggested_duration = roundedValue;
-              }
-              update.completion_criteria = {
-                model: this.value.model,
-                threshold: this.value.threshold,
-              };
-            }
-            if (duration === DurationDropdownMap.EXACT_TIME) {
-              update.suggested_duration_type = SuggestedDurationTypesMap.TIME;
-              update.suggested_duration = this.value.suggested_duration || 60;
-              update.completion_criteria = {
-                model: this.value.model,
-                threshold: this.value.threshold,
-              };
-            }
+          const update = {
+            duration,
+          };
+          if (this.timeBasedModel) {
+            update.threshold = duration;
           }
-
           this.handleInput(update);
         },
       },
-      minutes: {
+      durationType() {
+        return this.timeBasedModel ? this.model : this.value.suggested_duration_type;
+      },
+      durationDropdown: {
         get() {
-          return this.value.suggested_duration;
-        },
-        set(minutes) {
+          if (this.durationType === CompletionCriteriaModels.TIME) {
+            return DurationDropdownMap.EXACT_TIME;
+          }
           if (
-            this.value.model === CompletionCriteriaModels.PAGES ||
-            this.value.model === CompletionCriteriaModels.MASTERY
+            this.durationValue > SHORT_LONG_ACTIVITY_MIDPOINT &&
+            this.durationType === CompletionCriteriaModels.APPROX_TIME
+          ) {
+            return DurationDropdownMap.LONG_ACTIVITY;
+          }
+          return DurationDropdownMap.SHORT_ACTIVITY;
+        },
+        set(dropdownValue) {
+          const update = {};
+          if (dropdownValue === DurationDropdownMap.EXACT_TIME) {
+            update.durationType = CompletionCriteriaModels.TIME;
+          } else if (
+            dropdownValue === DurationDropdownMap.LONG_ACTIVITY ||
+            dropdownValue === DurationDropdownMap.SHORT_ACTIVITY
           ) {
-            this.handleInput({
-              suggested_duration: minutes,
-              completion_criteria: {
-                model: this.value.model,
-                threshold: this.value.threshold,
-              },
-            });
+            update.durationType = CompletionCriteriaModels.APPROX_TIME;
+            update.duration = this.handleMinutesInputFromActivityDuration(
+              this.durationValue,
+              dropdownValue
+            );
           } else {
-            this.handleInput({
-              suggested_duration: minutes,
-              completion_criteria: {
-                model: this.value.model,
-                threshold: minutes,
-              },
-            });
+            update.durationType = null;
           }
+          if (this.timeBasedModel) {
+            update.model = update.durationType;
+            update.threshold = update.duration || this.durationValue;
+          }
+          this.handleInput(update);
         },
       },
       showCorrectCompletionOptions() {
-        const CompletionOptionsDropdownMap = {
-          document: [
-            CompletionDropdownMap.allContent,
-            CompletionDropdownMap.completeDuration,
-            CompletionDropdownMap.reference,
-          ],
-          exercise: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
-          html5: [
-            CompletionDropdownMap.completeDuration,
-            CompletionDropdownMap.determinedByResource,
-            CompletionDropdownMap.reference,
-          ],
-          h5p: [
-            CompletionDropdownMap.determinedByResource,
-            CompletionDropdownMap.completeDuration,
-            CompletionDropdownMap.reference,
-          ],
-          audio: [CompletionDropdownMap.completeDuration, CompletionDropdownMap.reference],
-          video: [CompletionDropdownMap.completeDuration, CompletionDropdownMap.reference],
-        };
         if (this.kind) {
           return CompletionOptionsDropdownMap[this.kind].map(model => ({
             text: this.$tr(model),
@@ -721,130 +399,118 @@
         }
         return [];
       },
-      allPossibleDurationOptions() {
-        //this is used because of this Vuetify issue for dropdowns with multiple values: https://github.com/vuetifyjs/vuetify/issues/11529
+      selectableDurationOptions() {
         return [
           {
             text: this.$tr(DurationDropdownMap.EXACT_TIME),
-            value: CompletionCriteriaModels.TIME,
-            id: 'exactTime',
+            value: 'exactTime',
           },
           {
             text: this.translateMetadataString(DurationDropdownMap.SHORT_ACTIVITY),
-            value: CompletionCriteriaModels.APPROX_TIME,
-            id: 'shortActivity',
+            value: 'shortActivity',
           },
           {
             text: this.translateMetadataString(DurationDropdownMap.LONG_ACTIVITY),
-            value: CompletionCriteriaModels.APPROX_TIME,
-            id: 'longActivity',
+            value: 'longActivity',
           },
         ];
       },
-      /**
-       * When the duration dropdown is for audio, video, or documents, if "Complete duration"
-       * is chosen, then "Reference" cannot be selected
-       */
-      selectableDurationOptions() {
-        if (
-          this.kind === ContentKindsNames.DOCUMENT &&
-          this.currentCompletionDropdown === CompletionDropdownMap.completeDuration
-        ) {
-          return this.allPossibleDurationOptions.map(model => ({
-            value: model.id,
-            text: model.text,
-          }));
-        } else if (this.kind === ContentKindsNames.EXERCISE) {
-          return this.allPossibleDurationOptions.map(model => ({
-            value: model.id,
-            text: model.text,
-          }));
-        } else {
-          return this.allPossibleDurationOptions.map(model => ({
-            value: model.id,
-            text: model.text,
-          }));
-        }
-      },
       completionRules() {
-        if (this.kind) {
-          return this.required ? getCompletionValidators().map(translateValidator) : [];
+        if (this.kind && this.required) {
+          return getCompletionValidators().map(translateValidator);
         }
-        return false;
+        return [];
       },
       durationRules() {
-        const defaultStateForDocument = this.currentCompletionDropdown === null;
-        if (this.value) {
-          const allContentViewedIsChosenInCompletionDropdown =
-            this.currentCompletionDropdown === CompletionDropdownMap.allContent ||
-            (this.value.model === CompletionCriteriaModels.PAGES &&
-              this.currentCompletionDropdown === CompletionDropdownMap.allContent);
-
-          if (defaultStateForDocument || allContentViewedIsChosenInCompletionDropdown) {
-            return [];
-          }
+        if (this.completionDropdown === CompletionDropdownMap.completeDuration) {
+          return getDurationValidators().map(translateValidator);
         }
-        return getDurationValidators().map(translateValidator);
+        return [];
+      },
+      learnerManaged: {
+        get() {
+          return get(this.value, 'learner_managed', false);
+        },
+        set(learner_managed) {
+          this.handleInput({ learner_managed });
+        },
       },
     },
     methods: {
+      generateDefaultThreshold() {
+        if (this.audioVideoResource) {
+          return this.fileDuration || this.value.suggested_duration;
+        }
+        return defaultCompletionCriteriaThresholds[this.kind];
+      },
       trackClick(label) {
         this.$analytics.trackClick('channel_editor_modal_details', label);
       },
-      handleMinutesInputFromActivityDuration(minutes, duration) {
-        let suggested_duration;
-        let roundedValue;
-        if (duration === DurationDropdownMap.SHORT_ACTIVITY) {
-          roundedValue = Math.round(minutes / 300) * 300;
+      handleMinutesInputFromActivityDuration(minutes, durationDropdown) {
+        if (durationDropdown === DurationDropdownMap.SHORT_ACTIVITY) {
+          const roundedValue = Math.round(minutes / 300) * 300;
           if (roundedValue > SHORT_LONG_ACTIVITY_MIDPOINT || roundedValue <= 0) {
-            suggested_duration = DEFAULT_SHORT_ACTIVITY;
-          } else {
-            suggested_duration = roundedValue;
+            return DEFAULT_SHORT_ACTIVITY;
           }
+          return roundedValue;
         }
-        if (duration === DurationDropdownMap.LONG_ACTIVITY) {
-          roundedValue = Math.round(minutes / 600) * 600;
+        if (durationDropdown === DurationDropdownMap.LONG_ACTIVITY) {
+          const roundedValue = Math.round(minutes / 600) * 600;
           if (roundedValue < SHORT_LONG_ACTIVITY_MIDPOINT || roundedValue > 7200) {
-            suggested_duration = DEFAULT_LONG_ACTIVITY;
-          } else {
-            suggested_duration = roundedValue;
+            return DEFAULT_LONG_ACTIVITY;
           }
+          return roundedValue;
         }
-        return suggested_duration;
+        return Math.round(minutes / 60) * 60;
       },
-      handleInput({
-        completion_criteria,
-        suggested_duration,
-        suggested_duration_type,
-        modality,
-      } = {}) {
+      handleInput({ model, threshold, duration, durationType, modality, learner_managed } = {}) {
         const data = {
-          completion_criteria,
-          suggested_duration,
-          suggested_duration_type,
-          modality,
+          completion_criteria: {
+            model: this.model,
+            threshold: this.threshold,
+            learner_managed: this.learnerManaged,
+          },
+          suggested_duration: this.durationValue,
+          suggested_duration_type: this.durationType,
+          modality: this.value.modality,
         };
 
-        if (!completion_criteria) {
-          data['completion_criteria'] = this.value['completion_criteria'];
+        if (typeof model !== 'undefined') {
+          data.completion_criteria.model = model;
         }
-        if (modality === undefined) {
-          data['modality'] = this.value['modality'];
+        if (typeof modality !== 'undefined') {
+          data.modality = modality;
         }
-        if (suggested_duration === undefined) {
-          data['suggested_duration'] = this.value['suggested_duration'];
+        if (durationType) {
+          data.suggested_duration_type = durationType;
+        } else if (typeof durationType !== 'undefined') {
+          delete data.suggested_duration_type;
         }
-        if (suggested_duration_type === undefined) {
-          data['suggested_duration_type'] = this.value['suggested_duration_type'];
+        if (duration) {
+          data.suggested_duration = this.handleMinutesInputFromActivityDuration(
+            duration,
+            this.durationType
+          );
+        } else if (typeof duration !== 'undefined') {
+          delete data.suggested_duration;
+        }
+        if (threshold) {
+          data.completion_criteria.threshold = threshold;
+        } else if (typeof threshold !== 'undefined') {
+          delete data.completion_criteria.threshold;
+        }
+        if (learner_managed) {
+          data.completion_criteria.learner_managed = true;
+        } else if (typeof learner_managed !== 'undefined') {
+          delete data.completion_criteria.learner_managed;
         }
-
         this.$emit('input', data);
       },
       isUnique(value) {
         return value !== nonUniqueValue;
       },
       getPlaceholder(field) {
-        return this.isUnique(this[field]) ? '' : '---';
+        return this.isUnique(get(this, field)) ? '' : '---';
       },
     },
     $trs: {
@@ -859,10 +525,8 @@
       exactTime: 'Time to complete',
       referenceHint:
         'Progress will not be tracked on reference material unless learners mark it as complete',
+      learnersCanMarkComplete: 'Allow learners to mark as complete',
     },
   };
 
 </script>
-<style lang="less" scoped>
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index 904130a43b..ec6c56d582 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -34,6 +34,7 @@
           />
           <VLayout row wrap>
             <VFlex
+              v-if="oneSelected"
               xs12
               md6
               class="basicInfoColumn"
@@ -41,7 +42,6 @@
             >
               <!-- Description -->
               <VTextarea
-                v-if="oneSelected"
                 ref="description"
                 v-model="description"
                 :label="$tr('descriptionLabel')"
@@ -54,9 +54,14 @@
                 @focus="trackClick('Description')"
               />
             </VFlex>
-            <VFlex xs12 md6 :class="{ 'pl-2': $vuetify.breakpoint.mdAndUp }">
+            <VFlex
+              xs12
+              :[mdValue]="true"
+              :class="{ 'pl-2': $vuetify.breakpoint.mdAndUp && oneSelected }"
+            >
               <!-- Learning activity -->
               <LearningActivityOptions
+                v-if="oneSelected"
                 ref="learning_activities"
                 v-model="contentLearningActivities"
                 :disabled="anyIsTopic"
@@ -64,12 +69,14 @@
               />
               <!-- Level -->
               <LevelsOptions
+                v-if="oneSelected"
                 ref="contentLevel"
                 v-model="contentLevel"
                 @focus="trackClick('Levels dropdown')"
               />
               <!-- What you will need -->
               <ResourcesNeededOptions
+                v-if="oneSelected"
                 ref="resourcesNeeded"
                 v-model="resourcesNeeded"
                 @focus="trackClick('What you will need')"
@@ -104,7 +111,7 @@
             </VFlex>
           </VLayout>
           <!-- Category -->
-          <CategoryOptions ref="categories" v-model="categories" />
+          <CategoryOptions v-if="oneSelected" ref="categories" v-model="categories" />
         </VFlex>
       </VLayout>
 
@@ -130,15 +137,6 @@
           <h1 class="subheading">
             {{ $tr('completionLabel') }}
           </h1>
-          <!-- Checkbox for "Allow learners to mark complete" -->
-          <VFlex md6 class="pb-2">
-            <Checkbox
-              v-model="learnerManaged"
-              color="primary"
-              :label="$tr('learnersCanMarkComplete')"
-              style="margin-top: 0px; padding-top: 0px"
-            />
-          </VFlex>
           <CompletionOptions
             v-model="completionAndDuration"
             :kind="firstNode.kind"
@@ -196,6 +194,7 @@
 
           <!-- For Beginners -->
           <KCheckbox
+            v-if="oneSelected"
             id="beginners"
             ref="beginners"
             :checked="forBeginners"
@@ -366,8 +365,11 @@
 <script>
 
   import difference from 'lodash/difference';
+  import get from 'lodash/get';
   import intersection from 'lodash/intersection';
+  import isEqual from 'lodash/isEqual';
   import uniq from 'lodash/uniq';
+  import uniqWith from 'lodash/uniqWith';
   import { mapGetters, mapActions } from 'vuex';
   import ContentNodeThumbnail from '../../views/files/thumbnails/ContentNodeThumbnail';
   import FileUpload from '../../views/files/FileUpload';
@@ -392,13 +394,14 @@
   import VisibilityDropdown from 'shared/views/VisibilityDropdown';
   import Checkbox from 'shared/views/form/Checkbox';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
-  import { NEW_OBJECT, AccessibilityCategories, ResourcesNeededTypes } from 'shared/constants';
+  import {
+    NEW_OBJECT,
+    AccessibilityCategories,
+    ResourcesNeededTypes,
+    nonUniqueValue,
+  } from 'shared/constants';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
 
-  // Define an object to act as the place holder for non unique values.
-  const nonUniqueValue = {};
-  nonUniqueValue.toString = () => '';
-
   function getValueFromResults(results) {
     if (results.length === 0) {
       return null;
@@ -551,8 +554,11 @@
         return this.firstNode.original_channel_name;
       },
       requiresAccessibility() {
-        return this.nodes.every(
-          node => node.kind !== ContentKindsNames.AUDIO && node.kind !== ContentKindsNames.TOPIC
+        return (
+          this.oneSelected &&
+          this.nodes.every(
+            node => node.kind !== ContentKindsNames.AUDIO && node.kind !== ContentKindsNames.TOPIC
+          )
         );
       },
       audioAccessibility() {
@@ -630,8 +636,11 @@
       thumbnailEncoding: generateGetterSetter('thumbnail_encoding'),
       completionAndDuration: {
         get() {
-          const { completion_criteria, modality } =
-            this.getExtraFieldsValueFromNodes('options') || {};
+          const options = this.getExtraFieldsValueFromNodes('options', {});
+          if (options === nonUniqueValue) {
+            return nonUniqueValue;
+          }
+          const { completion_criteria, modality } = options;
           const suggested_duration_type = this.getExtraFieldsValueFromNodes(
             'suggested_duration_type'
           );
@@ -644,27 +653,12 @@
           };
         },
         set({ completion_criteria, suggested_duration, suggested_duration_type, modality }) {
-          if (completion_criteria) {
-            completion_criteria.learner_managed = this.learnerManaged;
-          }
           const options = { completion_criteria, modality };
           this.updateExtraFields({ options });
           this.updateExtraFields({ suggested_duration_type });
           this.update({ suggested_duration });
         },
       },
-      learnerManaged: {
-        get() {
-          const { completion_criteria = {} } = this.getExtraFieldsValueFromNodes('options') || {};
-          return completion_criteria.learner_managed;
-        },
-        set(value) {
-          const { completion_criteria = {}, ...options } =
-            this.getExtraFieldsValueFromNodes('options') || {};
-          completion_criteria.learner_managed = value;
-          this.updateExtraFields({ options: { ...options, completion_criteria } });
-        },
-      },
       /* COMPUTED PROPS */
       disableAuthEdits() {
         return this.nodes.some(node => node.freeze_authoring_data);
@@ -719,6 +713,11 @@
       videoSelected() {
         return this.oneSelected && this.firstNode.kind === ContentKindsNames.VIDEO;
       },
+      // Dynamically compute the size of the VFlex used
+      /* eslint-disable-next-line kolibri/vue-no-unused-properties */
+      mdValue() {
+        return this.oneSelected ? 'md6' : 'md12';
+      },
     },
     watch: {
       nodes: {
@@ -814,7 +813,7 @@
         return getValueFromResults(results);
       },
       getExtraFieldsValueFromNodes(key, defaultValue = null) {
-        const results = uniq(
+        const results = uniqWith(
           this.nodes.map(node => {
             if (
               Object.prototype.hasOwnProperty.call(
@@ -825,8 +824,9 @@
             ) {
               return this.diffTracker[node.id].extra_fields[key];
             }
-            return node.extra_fields[key] || defaultValue;
-          })
+            return get(node.extra_fields, key, defaultValue);
+          }),
+          isEqual
         );
         return getValueFromResults(results);
       },
@@ -882,7 +882,6 @@
       assessmentOptionsLabel: 'Assessment options',
       randomizeQuestionLabel: 'Randomize question order for learners',
       completionLabel: 'Completion',
-      learnersCanMarkComplete: 'Allow learners to mark as complete',
     },
   };
 
@@ -907,7 +906,7 @@
     }
 
     .section .flex {
-      margin: 24px 0 !important;
+      margin: 12px 0 !important;
     }
 
     .auth-section {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
index 1395d5b573..09a6ee32ca 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/MasteryCriteriaGoal.vue
@@ -41,17 +41,12 @@
     mixins: [constantsTranslationMixin],
     props: {
       value: {
-        type: Object,
+        type: String,
         required: false,
         validator: function(value) {
-          return (
-            !value ||
-            !value.mastery_model ||
-            !value.mastery_model.toString() ||
-            MasteryModels.has(value.mastery_model)
-          );
+          return !value || MasteryModels.has(value);
         },
-        default: () => ({}),
+        default: '',
       },
       placeholder: {
         type: String,
@@ -73,10 +68,10 @@
     computed: {
       masteryModel: {
         get() {
-          return this.value && this.value.mastery_model;
+          return this.value;
         },
         set(mastery_model) {
-          this.handleInput({ mastery_model });
+          this.$emit('input', mastery_model);
         },
       },
       masteryCriteria() {
@@ -89,15 +84,6 @@
         return this.required ? getMasteryModelValidators().map(translateValidator) : [];
       },
     },
-    methods: {
-      handleInput(newValue) {
-        let data = {
-          ...this.value,
-          ...newValue,
-        };
-        this.$emit('input', data);
-      },
-    },
     $trs: {
       labelText: 'Goal',
     },
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
index 241945dffd..db75897951 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Vuetify from 'vuetify';
 import { shallowMount, mount } from '@vue/test-utils';
 import CompletionOptions from '../CompletionOptions.vue';
+import { CompletionCriteriaModels } from 'shared/constants';
 
 Vue.use(Vuetify);
 
@@ -82,23 +83,23 @@ describe('CompletionOptions', () => {
           });
           expect(wrapper.vm.completionDropdown).toBe('allContent');
         });
-        it(`'All content viewed' should be displayed if the model in the backend is 'reference'`, () => {
+        it(`'All content viewed' should be displayed if the model in the backend is 'pages'`, () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'document',
-              value: { model: 'reference' },
+              value: { model: 'pages', threshold: '100%' },
             },
           });
           expect(wrapper.vm.completionDropdown).toBe('allContent');
         });
-        it(`'All content viewed' should be displayed if the model in the backend is 'pages'`, () => {
+        it(`'Reference' should be displayed if the model in the backend is 'reference'`, () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'document',
-              value: { model: 'pages', threshold: '100%' },
+              value: { model: 'reference' },
             },
           });
-          expect(wrapper.vm.completionDropdown).toBe('allContent');
+          expect(wrapper.vm.completionDropdown).toBe('reference');
         });
         it(`'Complete duration' should be displayed if 'exact time'`, () => {
           const wrapper = mount(CompletionOptions, {
@@ -144,7 +145,7 @@ describe('CompletionOptions', () => {
         });
       });
       describe(`exercise`, () => {
-        it(`'Practice until goal is met' should be displayed by default if 'practice quiz' is enabled `, () => {
+        it(`'When goal is met' should be displayed by default`, () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'exercise',
@@ -155,7 +156,7 @@ describe('CompletionOptions', () => {
         });
       });
       describe(`html5 or h5p`, () => {
-        it(`'Complete duration' should be displayed by default for html5`, () => {
+        it(`'When time spent is equal to duration' should be displayed by default for html5 and h5p`, () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'html5',
@@ -164,15 +165,6 @@ describe('CompletionOptions', () => {
           });
           expect(wrapper.vm.completionDropdown).toBe('completeDuration');
         });
-        it(`'Determined by this resource' should be displayed if there is no model in the backend for h5p`, () => {
-          const wrapper = mount(CompletionOptions, {
-            propsData: {
-              kind: 'h5p',
-              value: { model: null },
-            },
-          });
-          expect(wrapper.vm.completionDropdown).toBe('determinedByResource');
-        });
       });
     });
     describe(`changing states`, () => {
@@ -190,11 +182,10 @@ describe('CompletionOptions', () => {
           expect(wrapper.emitted('input')).toBeTruthy();
         });
       });
-      describe(`audio/video`, () => {
+      describe(`reference hint`, () => {
         it(`'Reference hint is visible when 'Reference' is selected`, () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
-              kind: 'audio',
               value: { model: 'reference' },
             },
           });
@@ -202,7 +193,7 @@ describe('CompletionOptions', () => {
         });
       });
       describe(`exercise`, () => {
-        it(`Goal and MofN components should not be displayed when switching to PQ from PUGIM`, async () => {
+        it(`Goal and MofN components should not be displayed when 'Practice Quiz' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'exercise',
@@ -219,7 +210,12 @@ describe('CompletionOptions', () => {
   });
   describe(`duration dropdown`, () => {
     it(`renders the duration dropdown`, () => {
-      const wrapper = mount(CompletionOptions);
+      const wrapper = mount(CompletionOptions, {
+        propsData: {
+          kind: 'audio',
+          value: { suggested_duration: null },
+        },
+      });
       const dropdown = wrapper.find({ ref: 'duration' });
       expect(dropdown.exists()).toBe(true);
     });
@@ -231,25 +227,29 @@ describe('CompletionOptions', () => {
             value: { suggested_duration: null },
           },
         });
+        const dropdown = wrapper.find({ ref: 'duration' });
+        expect(dropdown.exists()).toBe(true);
         expect(wrapper.vm.durationDropdown).toBe('exactTime');
       });
-      it(`duration dropdown is empty by default for documents`, () => {
+      it(`duration dropdown is hidden by default for documents`, () => {
         const wrapper = mount(CompletionOptions, {
           propsData: {
             kind: 'document',
             value: { suggested_duration: null },
           },
         });
-        expect(wrapper.vm.durationDropdown).toBe('');
+        const dropdown = wrapper.find({ ref: 'duration' });
+        expect(dropdown.exists()).toBe(false);
       });
-      it(`duration dropdown is empty by default for exercises`, () => {
+      it(`duration dropdown is hidden by default for exercises`, () => {
         const wrapper = mount(CompletionOptions, {
           propsData: {
             kind: 'exercise',
             value: { model: 'mastery', threshold: { m: 3, n: 5 }, suggested_duration: null },
           },
         });
-        expect(wrapper.vm.durationDropdown).toBe('');
+        const dropdown = wrapper.find({ ref: 'duration' });
+        expect(dropdown.exists()).toBe(false);
       });
       it(`'Reference' is disabled for exercises`, async () => {
         const wrapper = mount(CompletionOptions, {
@@ -264,20 +264,14 @@ describe('CompletionOptions', () => {
         const clickableDurationDropdown = wrapper.vm.selectableDurationOptions;
         expect(clickableDurationDropdown.length).toBe(3);
       });
-      it(`duration dropdown is empty by default for html5`, () => {
-        const wrapper = mount(CompletionOptions, {
-          propsData: {
-            kind: 'html5',
-            value: { suggested_duration: null },
-          },
-        });
-        expect(wrapper.vm.durationDropdown).toBe('');
-      });
       it(`duration dropdown is hidden by default for h5p`, () => {
         const wrapper = mount(CompletionOptions, {
           propsData: {
             kind: 'h5p',
-            value: { suggested_duration: null },
+            value: {
+              suggested_duration: null,
+              model: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
+            },
           },
         });
         const dropdown = wrapper.find({ ref: 'duration' });
@@ -288,7 +282,7 @@ describe('CompletionOptions', () => {
       it('input should be emitted when duration dropdown is updated', async () => {
         const wrapper = mount(CompletionOptions, {
           propsData: {
-            kind: 'document',
+            kind: 'audio',
             value: { model: null },
           },
         });
@@ -309,7 +303,6 @@ describe('CompletionOptions', () => {
         wrapper.find({ ref: 'duration' }).vm.$emit('input', 'shortActivity');
         await wrapper.vm.$nextTick();
         expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-        expect(wrapper.vm.showActivityDurationInput).toBe(true);
       });
       it(`minutes input is displayed when 'Long activity' is selected`, async () => {
         const wrapper = mount(CompletionOptions, {
@@ -321,11 +314,11 @@ describe('CompletionOptions', () => {
         wrapper.find({ ref: 'duration' }).vm.$emit('input', 'longActivity');
         await wrapper.vm.$nextTick();
         expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-        expect(wrapper.vm.showActivityDurationInput).toBe(true);
       });
     });
     describe(`document`, () => {
-      describe(`'All content viewed' is selected as completion`, () => {
+      // Skip these tests until we reenable descriptive duration setting.
+      describe.skip(`'All content viewed' is selected as completion`, () => {
         it(`minutes input is displayed when 'Short activity' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
@@ -336,7 +329,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'shortActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Long activity' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -348,7 +340,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'longActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Exact time' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -360,7 +351,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'exactTime');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is hidden and reference hint is displayed when 'Reference' is selected`, () => {
           const wrapper = mount(CompletionOptions, {
@@ -370,7 +360,6 @@ describe('CompletionOptions', () => {
             },
           });
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(false);
-          expect(wrapper.vm.showActivityDurationInput).toBe(false);
           expect(wrapper.vm.showReferenceHint).toBe(true);
         });
       });
@@ -385,7 +374,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'shortActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Long activity' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -397,7 +385,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'longActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Exact time' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -409,16 +396,17 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'exactTime');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
       });
-      describe(`switching between 'All content viewed (ACV)' and 'Complete duration (CD)'`, () => {
+      // Skip these tests until we reenable descriptive duration setting.
+      describe.skip(`switching between 'All content viewed (ACV)' and 'Complete duration (CD)'`, () => {
         it(`Duration dropdown and minutes input stay the same when switching betweeen 'Short activity' in ACV and CD`, async () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'document',
               value: {
                 model: 'approx_time',
+                threshold: 1200,
                 suggested_duration: 1200,
                 suggested_duration_type: 'approx_time',
               },
@@ -430,8 +418,7 @@ describe('CompletionOptions', () => {
 
           expect(wrapper.vm.durationDropdown).toBe('shortActivity');
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
-          expect(wrapper.vm.minutes).toBe(1200);
+          expect(wrapper.vm.durationValue).toBe(1200);
         });
         it(`Duration dropdown and minutes input stay the same when switching betweeen 'Long activity' in ACV and CD`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -450,8 +437,7 @@ describe('CompletionOptions', () => {
 
           expect(wrapper.vm.durationDropdown).toBe('longActivity');
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
-          expect(wrapper.vm.minutes).toBe(6000);
+          expect(wrapper.vm.durationValue).toBe(6000);
         });
         it(`Duration dropdown and minutes input stay the same when switching betweeen 'Exact time' in ACV and CD`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -471,12 +457,12 @@ describe('CompletionOptions', () => {
 
           expect(wrapper.vm.durationDropdown).toBe('exactTime');
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
-          expect(wrapper.vm.minutes).toBe(1234);
+          expect(wrapper.vm.durationValue).toBe(1234);
         });
       });
     });
-    describe(`exercise`, () => {
+    // Skip these tests until we reenable descriptive duration setting.
+    describe.skip(`exercise`, () => {
       describe(`when completion dropdown is 'Practice until goal is met'`, () => {
         it(`minutes input is displayed when 'Short activity' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -488,7 +474,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'shortActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Long activity' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -500,7 +485,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'longActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Exact time' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -512,7 +496,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'exactTime');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
       });
       describe(`when completion dropdown is 'Practice quiz'`, () => {
@@ -526,7 +509,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'shortActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Long activity' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -538,7 +520,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'longActivity');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
         it(`minutes input is displayed when 'Exact time' is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -550,7 +531,6 @@ describe('CompletionOptions', () => {
           wrapper.find({ ref: 'duration' }).vm.$emit('input', 'exactTime');
           await wrapper.vm.$nextTick();
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
         });
       });
       describe(`switching between 'Practice until goal is met (PUGIM)' and 'Practice quiz (PQ)'`, () => {
@@ -573,8 +553,7 @@ describe('CompletionOptions', () => {
 
           expect(wrapper.vm.durationDropdown).toBe('shortActivity');
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
-          expect(wrapper.vm.minutes).toBe(1200);
+          expect(wrapper.vm.durationValue).toBe(1200);
         });
         it(`Duration dropdown and minutes input stay the same when switching betweeen 'Long activity' in PUGIM and PQ`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -595,8 +574,7 @@ describe('CompletionOptions', () => {
 
           expect(wrapper.vm.durationDropdown).toBe('longActivity');
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
-          expect(wrapper.vm.minutes).toBe(6000);
+          expect(wrapper.vm.durationValue).toBe(6000);
         });
         it(`Duration dropdown and minutes input stay the same when switching betweeen 'Exact time' in PUGIM and PQ`, async () => {
           const wrapper = mount(CompletionOptions, {
@@ -617,59 +595,51 @@ describe('CompletionOptions', () => {
 
           expect(wrapper.vm.durationDropdown).toBe('exactTime');
           expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
-          expect(wrapper.vm.minutes).toBe(1234);
+          expect(wrapper.vm.durationValue).toBe(1234);
         });
       });
     });
     describe(`html5 or h5p`, () => {
       describe(`when completion dropdown is 'Determined by this resource'`, () => {
-        it(`minutes input is displayed when 'Short activity' is selected`, async () => {
+        it(`duration dropdown is always hidden`, async () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'html5',
-              value: { suggested_duration: null, model: 'approx_time' },
+              value: {
+                suggested_duration: null,
+                model: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
+              },
             },
           });
-          wrapper.find({ ref: 'duration' }).vm.$emit('input', 'shortActivity');
-          await wrapper.vm.$nextTick();
-          expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
+          expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(false);
+          expect(wrapper.find({ ref: 'duration' }).exists()).toBe(false);
         });
-        it(`minutes input is displayed when 'Long activity' is selected`, async () => {
+        it(`minutes input is hidden and reference hint is displayed when 'Reference' is selected`, () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'html5',
-              value: { suggested_duration: null, model: 'approx_time' },
+              value: { suggested_duration: null, model: 'reference' },
             },
           });
-          wrapper.find({ ref: 'duration' }).vm.$emit('input', 'longActivity');
-          await wrapper.vm.$nextTick();
-          expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
+          expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(false);
+          expect(wrapper.vm.showReferenceHint).toBe(true);
         });
-        it(`minutes input is displayed when 'Exact time' is selected`, async () => {
+      });
+    });
+    describe(`html5`, () => {
+      describe(`when completion dropdown is the default value`, () => {
+        it(`should emit determined by resource when it is selected`, async () => {
           const wrapper = mount(CompletionOptions, {
             propsData: {
               kind: 'html5',
-              value: { suggested_duration: null, model: 'time' },
+              value: { suggested_duration: null, model: null },
             },
           });
-          wrapper.find({ ref: 'duration' }).vm.$emit('input', 'exactTime');
+          wrapper.find({ ref: 'completion' }).vm.$emit('input', 'determinedByResource');
           await wrapper.vm.$nextTick();
-          expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(true);
-          expect(wrapper.vm.showActivityDurationInput).toBe(true);
-        });
-        it(`minutes input is hidden and reference hint is displayed when 'Reference' is selected`, () => {
-          const wrapper = mount(CompletionOptions, {
-            propsData: {
-              kind: 'html5',
-              value: { suggested_duration: null, model: 'reference' },
-            },
-          });
-          expect(wrapper.find({ ref: 'activity_duration' }).exists()).toBe(false);
-          expect(wrapper.vm.showActivityDurationInput).toBe(false);
-          expect(wrapper.vm.showReferenceHint).toBe(true);
+          expect(wrapper.emitted('input')[0][0].completion_criteria.model).toEqual(
+            CompletionCriteriaModels.DETERMINED_BY_RESOURCE
+          );
         });
       });
     });
@@ -721,26 +691,24 @@ describe('CompletionOptions', () => {
           propsData: {
             kind: 'document',
             value: {
-              model: 'pages',
-              threshold: '100%',
-              suggested_duration: 4200,
+              model: 'approx_time',
+              threshold: 6000,
+              suggested_duration: 6000,
               suggested_duration_type: 'approx_time',
             },
           },
         });
         wrapper.find({ ref: 'duration' }).vm.$emit('input', 'exactTime');
         await wrapper.vm.$nextTick();
-
-        expect(wrapper.vm.currentDurationDropdown).toBe('exactTime');
-        expect(wrapper.vm.minutes).toBe(4200);
+        expect(wrapper.vm.durationValue).toBe(6000);
       });
       it(`displays 'Short activity' value`, async () => {
         const wrapper = mount(CompletionOptions, {
           propsData: {
             kind: 'document',
             value: {
-              model: 'pages',
-              threshold: '100%',
+              model: 'approx_time',
+              threshold: 200,
               suggested_duration: 200,
               suggested_duration_type: 'approx_time',
             },
@@ -749,8 +717,7 @@ describe('CompletionOptions', () => {
         wrapper.find({ ref: 'duration' }).vm.$emit('input', 'exactTime');
         await wrapper.vm.$nextTick();
 
-        expect(wrapper.vm.currentDurationDropdown).toBe('exactTime');
-        expect(wrapper.vm.minutes).toBe(200);
+        expect(wrapper.vm.durationValue).toBe(200);
       });
     });
   });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaGoal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaGoal.spec.js
index 49cc0159b5..81d7e17bb5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaGoal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/masteryCriteriaGoal.spec.js
@@ -23,7 +23,7 @@ describe('masteryCriteriaGoal', () => {
   beforeEach(() => {
     formWrapper = makeWrapper();
     wrapper = formWrapper.find(MasteryCriteriaGoal);
-    wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
+    wrapper.setProps({ value: 'm_of_n' });
     modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
   });
 
@@ -35,7 +35,7 @@ describe('masteryCriteriaGoal', () => {
     });
     it('should render according to masteryModel prop', () => {
       function test(model) {
-        wrapper.setProps({ value: { mastery_model: model } });
+        wrapper.setProps({ value: model });
         expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
       }
       MasteryModels.forEach(test);
@@ -71,12 +71,12 @@ describe('masteryCriteriaGoal', () => {
       expect(wrapper.emitted('input')).toBeFalsy();
       modelInput.setValue('do_all');
       expect(wrapper.emitted('input')).toBeTruthy();
-      expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
+      expect(wrapper.emitted('input')[0][0]).toEqual('do_all');
     });
   });
   describe('validation', () => {
     it('should flag empty required mastery models', () => {
-      wrapper.setProps({ value: { mastery_model: null } });
+      wrapper.setProps({ value: null });
       formWrapper.vm.validate();
       expect(
         wrapper
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index 3ab612faca..644ccd629d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -93,7 +93,7 @@
         </div>
       </VFadeTransition>
 
-      <VToolbarItems>
+      <VToolbarItems v-if="!loadingAncestors">
         <Menu class="pa-1">
           <template #activator="{ on }">
             <IconButton
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
index 696b830450..db190d800c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/TreeViewBase.vue
@@ -63,7 +63,7 @@
         <span v-if="canManage && isRicecooker" class="font-weight-bold grey--text subheading">
           {{ $tr('apiGenerated') }}
         </span>
-        <VTooltip v-if="canManage" bottom attach="body" lazy>
+        <VTooltip v-if="!loading && canManage" bottom attach="body" lazy>
           <template #activator="{ on }">
             <!-- Need to wrap in div to enable tooltip when button is disabled -->
             <div style="height: 100%;" v-on="on">
@@ -82,7 +82,7 @@
           </template>
           <span>{{ publishButtonTooltip }}</span>
         </VTooltip>
-        <span v-else class="font-weight-bold grey--text subheading">
+        <span v-else-if="!loading" class="font-weight-bold grey--text subheading">
           {{ $tr('viewOnly') }}
         </span>
       </template>
@@ -279,6 +279,12 @@
       MessageDialog,
     },
     mixins: [titleMixin],
+    props: {
+      loading: {
+        type: Boolean,
+        default: false,
+      },
+    },
     data() {
       return {
         drawer: false,
@@ -331,7 +337,9 @@
         }
       },
       showChannelMenu() {
-        return this.$vuetify.breakpoint.xsOnly || this.canManage || this.isPublished;
+        return (
+          !this.loading && (this.$vuetify.breakpoint.xsOnly || this.canManage || this.isPublished)
+        );
       },
       viewChannelDetailsLink() {
         return {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
index c9f522e478..0a310e354c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/TreeView/index.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <TreeViewBase @dropToClipboard="handleDropToClipboard">
+  <TreeViewBase :loading="loading" @dropToClipboard="handleDropToClipboard">
     <template v-if="hasStagingTree && canManage" #extension>
       <Banner
         :value="true"
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/thumbnails/ThumbnailGenerator.vue b/contentcuration/contentcuration/frontend/channelEdit/views/files/thumbnails/ThumbnailGenerator.vue
index 9bb1a29f1d..e99f2e8738 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/thumbnails/ThumbnailGenerator.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/thumbnails/ThumbnailGenerator.vue
@@ -158,6 +158,7 @@
           return book.loaded.cover.then(() => {
             if (!book.cover) {
               this.handleError();
+              return;
             }
             return book.archive.createUrl(book.cover, { base64: true }).then(this.handleGenerated);
           });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
index 943fa59de0..c743ee25b9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
@@ -59,5 +59,7 @@ export function UPDATE_ASSESSMENTITEM_FROM_INDEXEDDB(state, { id, ...mods }) {
 }
 
 export function DELETE_ASSESSMENTITEM(state, assessmentItem) {
-  Vue.delete(state.assessmentItemsMap[assessmentItem.contentnode], assessmentItem.assessment_id);
+  if (state.assessmentItemsMap[assessmentItem.contentnode]) {
+    Vue.delete(state.assessmentItemsMap[assessmentItem.contentnode], assessmentItem.assessment_id);
+  }
 }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js
index 657757e9af..17d049cad9 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/task/index.js
@@ -28,7 +28,10 @@ export default {
     getPublishTaskForChannel(state) {
       return function(channelId) {
         return Object.values(state.asyncTasksMap).find(
-          t => t.channel_id.replace('-', '') === channelId && t.task_name === 'export-channel'
+          t =>
+            t.task_name === 'export-channel' &&
+            t.channel_id &&
+            t.channel_id.replace('-', '') === channelId
         );
       };
     },
diff --git a/contentcuration/contentcuration/frontend/shared/app.js b/contentcuration/contentcuration/frontend/shared/app.js
index cc0e9f9bc7..1918b41125 100644
--- a/contentcuration/contentcuration/frontend/shared/app.js
+++ b/contentcuration/contentcuration/frontend/shared/app.js
@@ -123,10 +123,12 @@ import { Session, injectVuexStore } from 'shared/data/resources';
 // just say yes to devtools (in debug mode)
 if (process.env.NODE_ENV !== 'production') {
   Vue.config.devtools = true;
-} else {
+} else if (window.sentryActive) {
   Sentry.init({
     Vue,
-    dsn: 'https://e4b21baeb7a044b885464d2af687fb73@sentry.io/1252819',
+    dsn: window.sentryDSN,
+    environment: window.sentryEnvironment,
+    release: window.sentryRelease,
     initialScope: {
       user: window.user ? { id: window.user.id, email: window.user.email } : null,
     },
diff --git a/contentcuration/contentcuration/frontend/shared/constants.js b/contentcuration/contentcuration/frontend/shared/constants.js
index 9a4c7796d7..21a14afc08 100644
--- a/contentcuration/contentcuration/frontend/shared/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/constants.js
@@ -171,6 +171,7 @@ export const ValidationErrors = {
   INVALID_NUMBER_OF_CORRECT_ANSWERS: 'INVALID_NUMBER_OF_CORRECT_ANSWERS',
   NO_VALID_PRIMARY_FILES: 'NO_VALID_PRIMARY_FILES',
   INVALID_COMPLETION_CRITERIA_MODEL: 'INVALID_COMPLETION_CRITERIA_MODEL',
+  COMPLETION_REQUIRED: 'COMPLETION_REQUIRED',
   LEARNING_ACTIVITY_REQUIRED: 'LEARNING_ACTIVITY_REQUIRED',
   DURATION_REQUIRED: 'DURATION_REQUIRED',
   ACTIVITY_DURATION_REQUIRED: 'ACTIVITY_DURATION_REQUIRED',
@@ -218,5 +219,8 @@ export const DurationDropdownMap = {
   EXACT_TIME: 'exactTime',
   SHORT_ACTIVITY: 'shortActivity',
   LONG_ACTIVITY: 'longActivity',
-  REFERENCE: 'reference',
 };
+
+// Define an object to act as the place holder for non unique values.
+export const nonUniqueValue = {};
+nonUniqueValue.toString = () => '';
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index e83b686384..bd8796a8fe 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -694,10 +694,23 @@ class Resource extends mix(APIResource, IndexedDBResource) {
         // ContentNode tree operations are the troublemakers causing the logic below
         if (this.tableName === TABLE_NAMES.CONTENTNODE) {
           // Only fetch new updates if we don't have pending changes to ContentNode that
-          // affect tree structure
+          // affect local tree structure
           refresh = db[CHANGES_TABLE].where('table')
             .equals(TABLE_NAMES.CONTENTNODE)
-            .filter(c => TREE_CHANGE_TYPES.includes(c.type))
+            .filter(c => {
+              if (!TREE_CHANGE_TYPES.includes(c.type)) {
+                return false;
+              }
+              let parent = c.parent;
+              if (c.type === CHANGE_TYPES.CREATED) {
+                parent = c.obj.parent;
+              }
+              return (
+                params.parent === parent ||
+                params.parent === c.key ||
+                (params.id__in || []).includes(c.key)
+              );
+            })
             .count()
             .then(pendingCount => pendingCount === 0);
         }
@@ -937,6 +950,13 @@ export const Session = new IndexedDBResource({
       this.monitorKeepAlive();
       window.addEventListener('focus', () => this.monitorKeepAlive());
       window.addEventListener('blur', () => this.stopMonitorKeepAlive());
+      document.addEventListener('visibilitychange', () => {
+        if (document.hidden) {
+          this.stopMonitorKeepAlive();
+        } else {
+          this.monitorKeepAlive();
+        }
+      });
     }
   },
   async getSession() {
@@ -1309,6 +1329,11 @@ export const ContentNode = new TreeResource({
               from_key: isCreate ? id : null,
               target,
               position,
+              // Regardless of the specific target/position
+              // always record the resolved parent for the tree insert
+              // so that we can avoid doing fetches while such changes
+              // are pending.
+              parent: parent.id,
               oldObj: isCreate ? null : node,
               source: CLIENTID,
               table: this.tableName,
diff --git a/contentcuration/contentcuration/frontend/shared/data/serverSync.js b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
index cc775d2ea5..e114b8cd19 100644
--- a/contentcuration/contentcuration/frontend/shared/data/serverSync.js
+++ b/contentcuration/contentcuration/frontend/shared/data/serverSync.js
@@ -253,10 +253,15 @@ async function syncChanges() {
     channel_revs[channelId] = get(user, [MAX_REV_KEY, channelId], 0);
   }
 
+  const unAppliedChanges = await db[CHANGES_TABLE].orderBy('server_rev')
+    .filter(c => c.synced && !c.errors && !c.disallowed)
+    .toArray();
+
   const requestPayload = {
     changes: [],
     channel_revs,
     user_rev: user.user_rev || 0,
+    unapplied_revs: unAppliedChanges.map(c => c.server_rev).filter(Boolean),
   };
 
   if (lastChange) {
diff --git a/contentcuration/contentcuration/frontend/shared/utils/validation.js b/contentcuration/contentcuration/frontend/shared/utils/validation.js
index cda5f363b0..9c19911f1f 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/validation.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/validation.js
@@ -1,7 +1,7 @@
 import get from 'lodash/get';
 import CompletionCriteriaModels from 'kolibri-constants/CompletionCriteria';
 import translator from '../translator';
-import { AssessmentItemTypes, ValidationErrors } from '../constants';
+import { AssessmentItemTypes, ValidationErrors, ContentModalities } from '../constants';
 import Licenses from 'shared/leUtils/Licenses';
 import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
@@ -105,6 +105,10 @@ export function isNodeComplete({ nodeDetails, assessmentItems, files }) {
 }
 
 // Private helpers
+function _isPracticeQuiz(node) {
+  return get(node, 'extra_fields.options.modality') === ContentModalities.QUIZ;
+}
+
 function _getLicense(node) {
   return node.license && Licenses.get(node.license.id || node.license);
 }
@@ -137,6 +141,7 @@ function _getErrorMsg(error) {
     [ValidationErrors.MASTERY_MODEL_N_GT_ZERO]: translator.$tr('masteryModelNGtZero'),
     [ValidationErrors.LEARNING_ACTIVITY_REQUIRED]: translator.$tr('fieldRequired'),
     [ValidationErrors.DURATION_REQUIRED]: translator.$tr('fieldRequired'),
+    [ValidationErrors.COMPLETION_REQUIRED]: translator.$tr('fieldRequired'),
     [ValidationErrors.ACTIVITY_DURATION_REQUIRED]: translator.$tr('fieldRequired'),
     [ValidationErrors.ACTIVITY_DURATION_MIN_FOR_SHORT_ACTIVITY]: translator.$tr(
       'activityDurationGteOne'
@@ -271,6 +276,22 @@ export function getNodeLearningActivityErrors(node) {
     .filter(value => value !== true);
 }
 
+export function getCompletionDurationErrors(node) {
+  const criteria = get(node, 'extra_fields.options.completion_criteria', {});
+  // duration requirement is blocking only when is is required for the model
+  // and there is no valid threshold
+  if (criteria.model === CompletionCriteriaModels.TIME) {
+    if (criteria.threshold) {
+      return [];
+    } else {
+      return getDurationValidators()
+        .map(validator => validator(node))
+        .filter(value => value !== true);
+    }
+  }
+  return [];
+}
+
 export function getNodeLicenseDescriptionErrors(node) {
   const license = _getLicense(node);
   if (!license || !license.is_custom) {
@@ -321,6 +342,11 @@ export function getNodeDetailsErrors(node) {
     errors = errors.concat(titleErrors);
   }
 
+  const completionDurationErrors = getCompletionDurationErrors(node);
+  if (completionDurationErrors.length) {
+    errors = errors.concat(completionDurationErrors);
+  }
+
   // authoring information is required for resources
   if (!node.freeze_authoring_data && node.kind !== ContentKindsNames.TOPIC) {
     const licenseErrors = getNodeLicenseErrors(node);
@@ -346,8 +372,10 @@ export function getNodeDetailsErrors(node) {
     }
   }
 
-  // mastery is required on exercises
-  if (node.kind === ContentKindsNames.EXERCISE) {
+  // mastery is required on exercises but not on practice quizzes
+  // Practice quiz requirements are set in the background, and separate validations
+  // run to check this based on the completion_criteria in LE utils
+  if (node.kind === ContentKindsNames.EXERCISE && !_isPracticeQuiz(node)) {
     const masteryModelErrors = getNodeMasteryModelErrors(node);
     const masteryModelMErrors = getNodeMasteryModelMErrors(node);
     const masteryModelNErrors = getNodeMasteryModelNErrors(node);
diff --git a/contentcuration/contentcuration/frontend/shared/views/ExpandableList.vue b/contentcuration/contentcuration/frontend/shared/views/ExpandableList.vue
index 66b03d6e12..2bb20e3a2e 100644
--- a/contentcuration/contentcuration/frontend/shared/views/ExpandableList.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/ExpandableList.vue
@@ -78,6 +78,7 @@
     props: {
       items: {
         type: Array,
+        required: true,
         default: () => [],
       },
       max: {
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
index 0b8e3c3524..151b2ab449 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
@@ -58,7 +58,7 @@ export function storageUrl(checksum, file_format) {
     return '';
   }
   /*eslint no-undef: "error"*/
-  return `${window.storageBaseUrl}${checksum[0]}/${checksum[1]}/${checksum}.${file_format}`;
+  return `/content/storage/${checksum[0]}/${checksum[1]}/${checksum}.${file_format}`;
 }
 
 /**
diff --git a/contentcuration/contentcuration/models.py b/contentcuration/contentcuration/models.py
index 2b9aea4224..8c772e46af 100644
--- a/contentcuration/contentcuration/models.py
+++ b/contentcuration/contentcuration/models.py
@@ -1700,18 +1700,19 @@ def get_details(self, channel_id=None):
             "resource_count": node.get("resource_count", 0),
             "resource_size": node.get("resource_size", 0),
             "includes": for_educators,
-            "kind_count": node.get("kind_count", []),
-            "languages": node.get("languages", ""),
-            "accessible_languages": node.get("accessible_languages", ""),
-            "licenses": node.get("licenses", ""),
-            "tags": node.get("tags_list", []),
-            "copyright_holders": node["copyright_holders"],
-            "authors": node["authors"],
-            "aggregators": node["aggregators"],
-            "providers": node["providers"],
-            "sample_pathway": pathway,
+            "kind_count": node.get("kind_count") or [],
+            "languages": node.get("languages") or [],
+            "accessible_languages": node.get("accessible_languages") or [],
+            "licenses": node.get("licenses") or [],
+            "tags": node.get("tags_list") or [],
             "original_channels": original_channels,
+            "sample_pathway": pathway,
             "sample_nodes": sample_nodes,
+            # source model fields for the below default to an empty string, but can also be null
+            "authors": list(filter(bool, node["authors"])),
+            "aggregators": list(filter(bool, node["aggregators"])),
+            "providers": list(filter(bool, node["providers"])),
+            "copyright_holders": list(filter(bool, node["copyright_holders"])),
         }
 
         # Set cache with latest data
diff --git a/contentcuration/contentcuration/settings.py b/contentcuration/contentcuration/settings.py
index 3a479f637e..deb5894eab 100644
--- a/contentcuration/contentcuration/settings.py
+++ b/contentcuration/contentcuration/settings.py
@@ -25,6 +25,7 @@
 logging.getLogger("newrelic").setLevel(logging.CRITICAL)
 logging.getLogger("botocore").setLevel(logging.WARNING)
 logging.getLogger("boto3").setLevel(logging.WARNING)
+logging.basicConfig(level="INFO")
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 STORAGE_ROOT = "storage"
@@ -413,18 +414,23 @@ def gettext(s):
 key = get_secret("SENTRY_DSN_KEY")
 if key:
     key = key.strip()  # strip any possible whitespace or trailing newline
-release_commit = get_secret("RELEASE_COMMIT_SHA")
-if key and len(key) > 0 and release_commit:
+
+SENTRY_DSN = 'https://{secret}@sentry.io/1252819'.format(secret=key) if key else None
+SENTRY_ENVIRONMENT = get_secret("BRANCH_ENVIRONMENT")
+SENTRY_RELEASE = get_secret("RELEASE_COMMIT_SHA")
+SENTRY_ACTIVE = False
+
+if SENTRY_DSN and SENTRY_RELEASE and SENTRY_ENVIRONMENT:
     import sentry_sdk
     # TODO: there are also Celery and Redis integrations, but since they are new
     # I left them as a separate task so we can spend more time on testing.
     from sentry_sdk.integrations.django import DjangoIntegration
 
     sentry_sdk.init(
-        dsn='https://{secret}@sentry.io/1252819'.format(secret=key),
+        dsn=SENTRY_DSN,
         integrations=[DjangoIntegration()],
-        release=release_commit,
-        environment=get_secret("BRANCH_ENVIRONMENT"),
+        release=SENTRY_RELEASE,
+        environment=SENTRY_ENVIRONMENT,
         send_default_pii=True,
     )
 
diff --git a/contentcuration/contentcuration/templates/base.html b/contentcuration/contentcuration/templates/base.html
index 0adeeb1ac7..8137cc54d5 100644
--- a/contentcuration/contentcuration/templates/base.html
+++ b/contentcuration/contentcuration/templates/base.html
@@ -77,6 +77,12 @@
           var csrftoken = '{{ csrf_token }}';
           var betaMode = "{{ BETA_MODE }}" === "True";
           var storageBaseUrl = "{{ STORAGE_HOST }}/{{ STORAGE_BASE_URL }}";
+          {% if SENTRY_ACTIVE %}
+          var sentryActive = true;
+          var sentryDSN = "{{ SENTRY_DSN }}";
+          var sentryEnvironment = "{{ SENTRY_ENVIRONMENT }}";
+          var sentryRelease = "{{ SENTRY_RELEASE }}";
+          {% endif %}
           {%  if not debug %}
           if (user && user.id && window.Sentry) {
             Sentry.setUser({ id: user.id, email: user.email });
diff --git a/contentcuration/contentcuration/tests/test_contentnodes.py b/contentcuration/contentcuration/tests/test_contentnodes.py
index 03b70cff50..25569f8988 100644
--- a/contentcuration/contentcuration/tests/test_contentnodes.py
+++ b/contentcuration/contentcuration/tests/test_contentnodes.py
@@ -184,6 +184,10 @@ def test_get_node_details(self):
         assert details["resource_count"] > 0
         assert details["resource_size"] > 0
         assert len(details["kind_count"]) > 0
+        assert len(details["authors"]) == len([author for author in details["authors"] if author])
+        assert len(details["aggregators"]) == len([aggregator for aggregator in details["aggregators"] if aggregator])
+        assert len(details["providers"]) == len([provider for provider in details["providers"] if provider])
+        assert len(details["copyright_holders"]) == len([holder for holder in details["copyright_holders"] if holder])
 
 
 class NodeOperationsTestCase(StudioTestCase):
diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index 291dcb5679..0e2a2bf398 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -24,6 +24,7 @@
 from .base import StudioTestCase
 from .helpers import clear_tasks
 from .testdata import channel
+from .testdata import create_studio_file
 from .testdata import node as create_node
 from .testdata import slideshow
 from contentcuration import models as cc
@@ -38,6 +39,9 @@
 pytestmark = pytest.mark.django_db
 
 
+thumbnail_bytes = b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\nIDATx\x9cc\x00\x01\x00\x00\x05\x00\x01\r\n-\xb4\x00\x00\x00\x00IEND\xaeB`\x82'  # noqa E501
+
+
 def description():
     return "".join(random.sample(string.printable, 20))
 
@@ -116,11 +120,35 @@ def setUp(self):
         new_exercise.complete = True
         new_exercise.parent = current_exercise.parent
         new_exercise.save()
+        thumbnail_data = create_studio_file(thumbnail_bytes, preset="exercise_thumbnail", ext="png")
+        file_obj = thumbnail_data["db_file"]
+        file_obj.contentnode = new_exercise
+        file_obj.save()
         for ai in current_exercise.assessment_items.all():
             ai.id = None
             ai.contentnode = new_exercise
             ai.save()
 
+        legacy_extra_fields = {
+            'mastery_model': exercises.M_OF_N,
+            'randomize': True,
+            'm': 1,
+            'n': 2
+        }
+
+        legacy_exercise = create_node({'kind_id': 'exercise', 'title': 'Legacy Mastery test', 'extra_fields': legacy_extra_fields})
+        legacy_exercise.complete = True
+        legacy_exercise.parent = current_exercise.parent
+        legacy_exercise.save()
+        thumbnail_data = create_studio_file(thumbnail_bytes, preset="exercise_thumbnail", ext="png")
+        file_obj = thumbnail_data["db_file"]
+        file_obj.contentnode = legacy_exercise
+        file_obj.save()
+        for ai in current_exercise.assessment_items.all():
+            ai.id = None
+            ai.contentnode = legacy_exercise
+            ai.save()
+
         first_topic = self.content_channel.main_tree.get_descendants().first()
 
         # Add a publishable topic to ensure it does not inherit but that its children do
@@ -357,6 +385,23 @@ def test_child_no_inherit_learning_activity(self):
         # Should only be the learning activities we set on the child directly, not any parent ones.
         self.assertEqual(first_child.learning_activities, learning_activities.LISTEN)
 
+    def test_publish_no_modify_exercise_extra_fields(self):
+        exercise = cc.ContentNode.objects.get(title="Mastery test")
+        self.assertEqual(exercise.extra_fields["options"]["completion_criteria"]["threshold"], {
+            "m": 1,
+            "n": 2,
+            "mastery_model": exercises.M_OF_N,
+        })
+
+    def test_publish_no_modify_legacy_exercise_extra_fields(self):
+        current_exercise = cc.ContentNode.objects.get(title="Legacy Mastery test")
+        self.assertEqual(current_exercise.extra_fields, {
+            'mastery_model': exercises.M_OF_N,
+            'randomize': True,
+            'm': 1,
+            'n': 2
+        })
+
 
 class ChannelExportUtilityFunctionTestCase(StudioTestCase):
     @classmethod
diff --git a/contentcuration/contentcuration/tests/test_serializers.py b/contentcuration/contentcuration/tests/test_serializers.py
index 25331a7daf..1eed06db9e 100644
--- a/contentcuration/contentcuration/tests/test_serializers.py
+++ b/contentcuration/contentcuration/tests/test_serializers.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from django.db.models.query import QuerySet
-from django.test.testcases import SimpleTestCase
+from le_utils.constants import content_kinds
 from rest_framework import serializers
 
 from .base import BaseAPITestCase
@@ -11,7 +11,6 @@
 from contentcuration.viewsets.channel import ChannelSerializer as BaseChannelSerializer
 from contentcuration.viewsets.common import ContentDefaultsSerializer
 from contentcuration.viewsets.contentnode import ContentNodeSerializer
-from contentcuration.viewsets.contentnode import ExtraFieldsOptionsSerializer
 
 
 def ensure_no_querysets_in_serializer(object):
@@ -24,36 +23,35 @@ def ensure_no_querysets_in_serializer(object):
         )
 
 
-class ExtraFieldsOptionsSerializerTestCase(SimpleTestCase):
+class ContentNodeSerializerTestCase(BaseAPITestCase):
     def setUp(self):
-        super(ExtraFieldsOptionsSerializerTestCase, self).setUp()
-        self.data = dict(modality="QUIZ")
+        super(ContentNodeSerializerTestCase, self).setUp()
+        self.data = dict(extra_fields=dict(options=dict(modality="QUIZ")), complete=True)
+        self.node = ContentNode(kind_id=content_kinds.VIDEO)
 
     @property
     def serializer(self):
-        return ExtraFieldsOptionsSerializer(data=self.data)
+        return ContentNodeSerializer(instance=self.node, data=self.data, partial=True)
 
     def test_no_completion_criteria(self):
         self.assertTrue(self.serializer.is_valid())
 
     def test_completion_criteria__valid(self):
-        self.data.update(completion_criteria={"model": "time", "threshold": 10, "learner_managed": True})
+        self.data["extra_fields"]["options"].update(completion_criteria={"model": "time", "threshold": 10, "learner_managed": True})
         serializer = self.serializer
         serializer.is_valid()
         try:
-            serializer.update({}, serializer.validated_data)
+            serializer.update(self.node, serializer.validated_data)
         except serializers.ValidationError:
             self.fail("Completion criteria should be valid")
 
     def test_completion_criteria__invalid(self):
-        self.data.update(completion_criteria={"model": "time", "threshold": "test"})
+        self.data["extra_fields"]["options"].update(completion_criteria={"model": "time", "threshold": "test"})
         serializer = self.serializer
         serializer.is_valid()
         with self.assertRaises(serializers.ValidationError):
-            serializer.update({}, serializer.validated_data)
-
+            serializer.update(self.node, serializer.validated_data)
 
-class ContentNodeSerializerTestCase(BaseAPITestCase):
     def test_repr_doesnt_evaluate_querysets(self):
         node_ids = [
             "00000000000000000000000000000003",
diff --git a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
index 518688687b..a70f1a43ac 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_contentnode.py
@@ -575,7 +575,9 @@ def test_cannot_update_no_permissions(self):
         )
 
     def test_update_contentnode_exercise_mastery_model(self):
-        contentnode = models.ContentNode.objects.create(**self.contentnode_db_metadata)
+        metadata = self.contentnode_db_metadata
+        metadata["kind_id"] = content_kinds.EXERCISE
+        contentnode = models.ContentNode.objects.create(**metadata)
 
         # Update m and n fields
         m = 5
@@ -599,6 +601,7 @@ def test_update_contentnode_exercise_mastery_model(self):
 
     def test_update_contentnode_exercise_mastery_model_partial(self):
         data = self.contentnode_db_metadata
+        data["kind_id"] = content_kinds.EXERCISE
         data["extra_fields"] = {
             "options": {
                 "completion_criteria": {
@@ -628,6 +631,7 @@ def test_update_contentnode_exercise_mastery_model_partial(self):
 
     def test_update_contentnode_exercise_mastery_model_old(self):
         data = self.contentnode_db_metadata
+        data["kind_id"] = content_kinds.EXERCISE
         data["extra_fields"] = {
             "m": 5,
             "n": 10,
@@ -778,6 +782,8 @@ def test_update_contentnode_update_options_invalid_completion_criteria(self):
                     contentnode.id,
                     CONTENTNODE,
                     {
+                        # Only do full validation of this when the update is setting to True.
+                        "complete": True,
                         "extra_fields.options.completion_criteria.model": completion_criteria.TIME,
                     },
                     channel_id=self.channel.id
diff --git a/contentcuration/contentcuration/utils/publish.py b/contentcuration/contentcuration/utils/publish.py
index b3bbad1f37..93bee0bf40 100644
--- a/contentcuration/contentcuration/utils/publish.py
+++ b/contentcuration/contentcuration/utils/publish.py
@@ -408,7 +408,7 @@ def create_associated_thumbnail(ccnode, ccfilemodel):
             "points": [],
             "zoom": 0,
         })
-        ccnode.save()
+        ccnode.save(update_fields=("thumbnail_encoding",))
 
     return create_thumbnail_from_base64(
         encoding,
diff --git a/contentcuration/contentcuration/utils/sentry.py b/contentcuration/contentcuration/utils/sentry.py
index aaa3dc10a3..c9566de78a 100644
--- a/contentcuration/contentcuration/utils/sentry.py
+++ b/contentcuration/contentcuration/utils/sentry.py
@@ -1,8 +1,17 @@
 from django.conf import settings
 
 
-def report_exception(exception=None):
+def report_exception(exception=None, user=None, contexts=None):
     if getattr(settings, "SENTRY_ACTIVE", False):
         from sentry_sdk import capture_exception
 
-        capture_exception(exception)
+        scope_args = {
+            "contexts": contexts
+        }
+
+        if user and not user.is_anonymous:
+            scope_args["user"] = {
+                "email": user.email,
+            }
+
+        capture_exception(exception, **scope_args)
diff --git a/contentcuration/contentcuration/viewsets/base.py b/contentcuration/contentcuration/viewsets/base.py
index afa3eeaa98..ef430b0fee 100644
--- a/contentcuration/contentcuration/viewsets/base.py
+++ b/contentcuration/contentcuration/viewsets/base.py
@@ -650,7 +650,7 @@ def create_from_changes(self, changes):
                     change.update({"errors": serializer.errors})
                     errors.append(change)
             except Exception as e:
-                log_sync_exception(e)
+                log_sync_exception(e, user=self.request.user, change=change)
                 change["errors"] = [str(e)]
                 errors.append(change)
 
@@ -693,7 +693,7 @@ def delete_from_changes(self, changes):
                 # job done!
                 pass
             except Exception as e:
-                log_sync_exception(e)
+                log_sync_exception(e, user=self.request.user, change=change)
                 change["errors"] = [str(e)]
                 errors.append(change)
         return errors
@@ -731,7 +731,7 @@ def update_from_changes(self, changes):
                 change.update({"errors": ValidationError("Not found").detail})
                 errors.append(change)
             except Exception as e:
-                log_sync_exception(e)
+                log_sync_exception(e, user=self.request.user, change=change)
                 change["errors"] = [str(e)]
                 errors.append(change)
         return errors
@@ -768,7 +768,7 @@ def create_from_changes(self, changes):
             try:
                 self.perform_bulk_create(serializer)
             except Exception as e:
-                log_sync_exception(e)
+                log_sync_exception(e, user=self.request.user, changes=changes)
                 for change in changes:
                     change["errors"] = [str(e)]
                 errors.extend(changes)
@@ -807,7 +807,7 @@ def update_from_changes(self, changes):
             try:
                 self.perform_bulk_update(serializer)
             except Exception as e:
-                log_sync_exception(e)
+                log_sync_exception(e, user=self.request.user, changes=changes)
                 for change in changes:
                     change["errors"] = [str(e)]
                 errors.extend(changes)
diff --git a/contentcuration/contentcuration/viewsets/channel.py b/contentcuration/contentcuration/viewsets/channel.py
index 6cec4d752e..c028405130 100644
--- a/contentcuration/contentcuration/viewsets/channel.py
+++ b/contentcuration/contentcuration/viewsets/channel.py
@@ -454,7 +454,7 @@ def publish_from_changes(self, changes):
                     publish["key"], version_notes=publish.get("version_notes"), language=publish.get("language")
                 )
             except Exception as e:
-                log_sync_exception(e)
+                log_sync_exception(e, user=self.request.user, change=publish)
                 publish["errors"] = [str(e)]
                 errors.append(publish)
         return errors
@@ -513,7 +513,7 @@ def sync_from_changes(self, changes):
                     assessment_items=sync.get("assessment_items")
                 )
             except Exception as e:
-                log_sync_exception(e)
+                log_sync_exception(e, user=self.request.user, change=sync)
                 sync["errors"] = [str(e)]
                 errors.append(sync)
         return errors
diff --git a/contentcuration/contentcuration/viewsets/contentnode.py b/contentcuration/contentcuration/viewsets/contentnode.py
index 7982cabf59..ca636c95a4 100644
--- a/contentcuration/contentcuration/viewsets/contentnode.py
+++ b/contentcuration/contentcuration/viewsets/contentnode.py
@@ -275,14 +275,6 @@ class CompletionCriteriaSerializer(JSONFieldDictSerializer):
     model = CharField()
     learner_managed = BooleanField(required=False, allow_null=True)
 
-    def update(self, instance, validated_data):
-        instance = super(CompletionCriteriaSerializer, self).update(instance, validated_data)
-        try:
-            completion_criteria_validator.validate(instance)
-        except DjangoValidationError as e:
-            raise ValidationError(e)
-        return instance
-
 
 class ExtraFieldsOptionsSerializer(JSONFieldDictSerializer):
     modality = ChoiceField(choices=(("QUIZ", "Quiz"),), allow_null=True, required=False)
@@ -407,11 +399,23 @@ def validate(self, data):
                     raise ValidationError("tag is greater than 30 characters")
         return data
 
+    def _check_completion_criteria(self, kind, complete, validated_data):
+        completion_criteria = validated_data.get("extra_fields", {}).get("options", {}).get("completion_criteria", {})
+        try:
+            if complete:
+                completion_criteria_validator.validate(completion_criteria, kind)
+            else:
+                completion_criteria_validator.check_model_for_kind(completion_criteria, kind)
+        except DjangoValidationError as e:
+            raise ValidationError(e)
+
     def create(self, validated_data):
         tags = None
         if "tags" in validated_data:
             tags = validated_data.pop("tags")
 
+        self._check_completion_criteria(validated_data.get("kind"), validated_data.get("complete", False), validated_data)
+
         instance = super(ContentNodeSerializer, self).create(validated_data)
 
         if tags:
@@ -429,6 +433,9 @@ def update(self, instance, validated_data):
         if "tags" in validated_data:
             tags = validated_data.pop("tags")
             set_tags({instance.id: tags})
+
+        self._check_completion_criteria(validated_data.get("kind", instance.kind_id), validated_data.get("complete", instance.complete), validated_data)
+
         return super(ContentNodeSerializer, self).update(instance, validated_data)
 
 
diff --git a/contentcuration/contentcuration/viewsets/sync/base.py b/contentcuration/contentcuration/viewsets/sync/base.py
index 77b4061f7b..455a97e4aa 100644
--- a/contentcuration/contentcuration/viewsets/sync/base.py
+++ b/contentcuration/contentcuration/viewsets/sync/base.py
@@ -121,7 +121,7 @@ def apply_changes(changes_queryset):
                     change.applied = True
                     changed_fields = ("applied",)
         except Exception as e:
-            log_sync_exception(e)
+            log_sync_exception(e, user=change.created_by, change=change.serialize_to_change_dict())
             change.errored = True
             change.kwargs["errors"] = [str(e)]
         change.save(update_fields=changed_fields)
diff --git a/contentcuration/contentcuration/viewsets/sync/endpoint.py b/contentcuration/contentcuration/viewsets/sync/endpoint.py
index 17cb6dca68..a7b1e657fb 100644
--- a/contentcuration/contentcuration/viewsets/sync/endpoint.py
+++ b/contentcuration/contentcuration/viewsets/sync/endpoint.py
@@ -74,15 +74,18 @@ def get_channel_revs(self, request):
 
     def return_changes(self, request, channel_revs):
         user_rev = request.data.get("user_rev") or 0
+        unapplied_revs = request.data.get("unapplied_revs", [])
         session_key = request.session.session_key
 
+        unapplied_revs_filter = Q(server_rev__in=unapplied_revs)
+
         # Create a filter that returns all applied changes, and any errored changes made by this session
         relevant_to_session_filter = (Q(applied=True) | Q(errored=True, session_id=session_key))
 
-        change_filter = (Q(user=request.user, server_rev__gt=user_rev) & relevant_to_session_filter)
+        change_filter = (Q(user=request.user) & (unapplied_revs_filter | Q(server_rev__gt=user_rev)) & relevant_to_session_filter)
 
         for channel_id, rev in channel_revs.items():
-            change_filter |= (Q(channel_id=channel_id, server_rev__gt=rev) & relevant_to_session_filter)
+            change_filter |= (Q(channel_id=channel_id) & (unapplied_revs_filter | Q(server_rev__gt=rev)) & relevant_to_session_filter)
 
         changes_to_return = list(
             Change.objects.filter(
@@ -141,7 +144,7 @@ def post(self, request):
             "allowed": [],
             "changes": [],
             "errors": [],
-            "successess": [],
+            "successes": [],
             "tasks": [],
         }
 
diff --git a/contentcuration/contentcuration/viewsets/sync/utils.py b/contentcuration/contentcuration/viewsets/sync/utils.py
index 6bfc072e5c..1d3718b5e2 100644
--- a/contentcuration/contentcuration/viewsets/sync/utils.py
+++ b/contentcuration/contentcuration/viewsets/sync/utils.py
@@ -74,10 +74,19 @@ def generate_publish_event(
     return event
 
 
-def log_sync_exception(e):
+def log_sync_exception(e, user=None, change=None, changes=None):
     # Capture exception and report, but allow sync
     # to complete properly.
-    report_exception(e)
+
+    contexts = {}
+
+    if change is not None:
+        contexts["change"] = change
+
+    elif changes is not None:
+        contexts["changes"] = changes
+
+    report_exception(e, user=user, contexts=contexts)
 
     # make sure we leave a record in the logs just in case.
     logging.error(e)
diff --git a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
index 98b28b9e15..be4fa9c946 100644
--- a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
@@ -820,7 +820,7 @@
   "DetailsTabView.importedFromButtonText": "استيراد من {channel}",
   "DetailsTabView.languageChannelHelpText": "اتركه فارغاً من أجل استخدام لغة القناة",
   "DetailsTabView.languageHelpText": "اتركه فارغًا من أجل استخدام لغة المجلد",
-  "DetailsTabView.learnersCanMarkComplete": "السماح للمتعلمين بتحديده على أنه مكتمل",
+  "CompletionOptions.learnersCanMarkComplete": "السماح للمتعلمين بتحديده على أنه مكتمل",
   "DetailsTabView.noTagsFoundText": "لم يتم العثور على نتائج بحث لـ\"{text}\". إضغط على 'إدخال' لإنشاء تصنيف جديد",
   "DetailsTabView.providerLabel": "موفر الخدمة",
   "DetailsTabView.providerToolTip": "المنظمة التي كلّفت بالمحتوى أو تقوم بنشر المحتوى",
diff --git a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
index 87f8407605..c24f068db5 100644
--- a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
@@ -820,7 +820,7 @@
   "DetailsTabView.importedFromButtonText": "Importado desde {channel}",
   "DetailsTabView.languageChannelHelpText": "Dejar en blanco para usar el idioma del canal",
   "DetailsTabView.languageHelpText": "Dejar en blanco para usar el idioma de la carpeta",
-  "DetailsTabView.learnersCanMarkComplete": "Permitir a los estudiantes marcar como completado",
+  "CompletionOptions.learnersCanMarkComplete": "Permitir a los estudiantes marcar como completado",
   "DetailsTabView.noTagsFoundText": "No se han encontrado resultados para \"{text}\". Pulse la tecla 'Entrar' para crear una nueva etiqueta",
   "DetailsTabView.providerLabel": "Proveedor",
   "DetailsTabView.providerToolTip": "Organización que ha encargado o está distribuyendo el contenido",
diff --git a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
index 7a5bf9c90a..ae87e9d86c 100644
--- a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
@@ -820,7 +820,7 @@
   "DetailsTabView.importedFromButtonText": "Importer à partir de {channel}",
   "DetailsTabView.languageChannelHelpText": "Laisser vide pour utiliser la langue de la chaîne",
   "DetailsTabView.languageHelpText": "Laisser vide pour utiliser la langue du dossier",
-  "DetailsTabView.learnersCanMarkComplete": "Autoriser les apprenants à marquer le contenu comme étant terminé",
+  "CompletionOptions.learnersCanMarkComplete": "Autoriser les apprenants à marquer le contenu comme étant terminé",
   "DetailsTabView.noTagsFoundText": "Aucun résultat trouvé pour \"{text}\". Appuyez sur la touche 'Entrée' pour créer une nouvelle étiquette",
   "DetailsTabView.providerLabel": "Fournisseur",
   "DetailsTabView.providerToolTip": "Organisation ayant commandé le contenu ou qui le distribue",
diff --git a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
index 8a9484c521..a9d58c8bc2 100644
--- a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
@@ -820,7 +820,7 @@
   "DetailsTabView.importedFromButtonText": "Imported from {channel}",
   "DetailsTabView.languageChannelHelpText": "Leave blank to use the channel language",
   "DetailsTabView.languageHelpText": "Leave blank to use the folder language",
-  "DetailsTabView.learnersCanMarkComplete": "Allow learners to mark as complete",
+  "CompletionOptions.learnersCanMarkComplete": "Allow learners to mark as complete",
   "DetailsTabView.noTagsFoundText": "No results found for \"{text}\". Press 'Enter' key to create a new tag",
   "DetailsTabView.providerLabel": "Provider",
   "DetailsTabView.providerToolTip": "Organization that commissioned or is distributing the content",
diff --git a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json b/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
index 7298ca4a21..34ec773bf5 100644
--- a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
+++ b/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
@@ -820,7 +820,7 @@
   "DetailsTabView.importedFromButtonText": "Importado do {channel}",
   "DetailsTabView.languageChannelHelpText": "Deixar em branco para usar o idioma do canal",
   "DetailsTabView.languageHelpText": "Deixar em branco para que o idioma da pasta seja utilizado",
-  "DetailsTabView.learnersCanMarkComplete": "Permitir que os alunos marquem como 'concluído'",
+  "CompletionOptions.learnersCanMarkComplete": "Permitir que os alunos marquem como 'concluído'",
   "DetailsTabView.noTagsFoundText": "Nenhum resultado encontrado para \"{text}\". Pressione 'Enter' para criar um novo marcador",
   "DetailsTabView.providerLabel": "Provedor",
   "DetailsTabView.providerToolTip": "Organização que encomendou ou distribui o conteúdo",
diff --git a/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature b/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature
index 3b7070e32e..4ae96901ab 100755
--- a/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature
+++ b/integration_testing/features/wip-studio-edit-modal/edit-completion-field.feature
@@ -9,93 +9,107 @@ Feature: Edit completion/duration field
 		Then I see the *Edit details* modal for the <resource>
 			And I see the *Completion* section underneath the *Basic information* section
 
+	Scenario: Default options for .MP4 or .MP3 on file upload
+		Given I am viewing an .MP4 or an .MP3 file that I have just added
+			And I see the *Completion* section
+		Then I see the *Completion* is set by default to *When time spent is equal to duration*
+			And *Duration* is set by default to *Time to complete*
+		Then I see the exact duration <XX:XX> appear next to the *Duration* field as plain text
+			And I see that I cannot edit it
+
 	Scenario: View options for .MP4 or .MP3
 		Given I am viewing an .MP4 or an .MP3 file
 		When I click the *Completion* dropdown
-		Then I see the options: *Complete duration* and *Reference*
+		Then I see the options: *When time spent is equal to duration* and *Reference material*
 		When I click the *Duration* dropdown
-		Then I see the options: *Exact time to complete*, *Short activity*, and *Long activity*
+		Then I see the options: *Time to complete*, *Short activity*, and *Long activity*
+
+
+	Scenario: Default options for .PDF, .EPUB or slides
+		Given I am viewing a .PDF, .EPUB or slidesfile that I have just added
+			And I see the *Completion* section
+		Then I see the *Completion* is set by default to *Viewed in its entirety*
+			And *Duration* is hidden by default
 
 	Scenario: View options for .PDF, .EPUB or slides
 		Given I am viewing .PDF, .EPUB or slides
 		When I click the *Completion* dropdown
-		Then I see the options: *All content viewed*, *Complete duration*, and *Reference*
+		Then I see the options: *Viewed in its entirety*, *When time spent is equal to duration*, and *Reference material*
+
+
+	Scenario: Default options for .ZIP on file upload
+		Given I am viewing a .ZIP file that I have just added
+			And I see the *Completion* section
+		Then I see the *Completion* is set by default to *When time spent is equal to duration*
+			And *Duration* is set by default to *Short Activity* with a value of *5 minutes*
 
 	Scenario: View options for .ZIP
 		Given I am viewing a .ZIP
 		When I click on the *Completion* dropdown
-		Then I see the options: *Complete duration*, *Determined by this resource*, and *Reference*
+		Then I see the options: *When time spent is equal to duration*,  *Determined by the resource*, and *Reference material*
+
+	Scenario: Default options for Exercise on content creation
+		Given I am viewing an exercise  that I have just added
+			And I see the *Completion* section
+		Then I see the *Completion* is set by default to *When goal is met*
+			And there is a *goal* dropdown with no default set
+			And *Duration* is not visible for exercises
 
 	Scenario: View options for Practice resources
 		Given I am viewing an exercise
 		When I click on the *Completion* dropdown
-		Then I see the options: *Practice until goal is met* and *Practice quiz*
+		Then I see the options: *When goal is met* and *Practice quiz*
 
 	Scenario: Set completion to *Short activity*
 		When I click on the *Completion* dropdown
 			And I select *Short activity*
 		Then I see *Short activity* appear in the text input
-			And I see a *Minutes* text input field appear next to *Completion*
-			And I see a slider appear next to *Minutes*
+			And I see a *Minutes* dropdown input field appear next to *Completion*
 			And I see *Minutes* is set to 10 by default
-			And I see the maximum value of the slider is 30 minutes
+			And I see the maximum option in the menu is 30 minutes
 			And I see the caption *(Optional) Duration until resource is marked as complete. This value will not be shown to learners*
 
 	Scenario: Adjust time for short activities
 		Given *Completion* is set to *Short activity*
-		When I adjust the slider
-		Then I see the value in the *Minutes* field change to match the slider
-		When I type in a new value into *Minutes*
-		When I lose focus on *Minutes*
-		Then I see the slider changes to match the value in *Minutes*
-		When I enter a value above 30 minutes into *Minutes*
-		Then I see the value in *Minutes* is set to 30 minutes
-			And I see the slider is set to 30 minutes
+		When I adjust the value by selecting a different option in the dropdown
+		Then I see the value in the *Minutes* field update
 
 	Scenario: Set completion to *Long activity*
 		When I click on the *Completion* dropdown
 			And I select *Long activity*
 		Then I see *Long activity* appear in the text input
-			And I see a *Minutes* text input field appear next to *Completion*
-			And I see a slider appear next to *Minutes*
-			And I see *Minutes* is set to 45 by default
-			And I see the maximum value of the slider is 120 minutes
-			And I see the caption *(Optional) Duration until resource is marked as complete. This value will not be shown to learners*
+		And I see a *Minutes* dropdown input field appear next to *Completion*
+		And I see *Minutes* is set to 50 by default
+		And I see the maximum option in the menu is 120 minutes
+		And I see the maximum option in the menu is 40 minutes
+		And I see the caption *(Optional) Duration until resource is marked as complete. This value will not be shown to learners*
 
 	Scenario: Adjust time for long activities
 		Given *Completion* is set to *Long activity*
-		When I adjust the slider
-		Then I see the value in the *Minutes* field change to match the slider
-		When I type in a new value into *Minutes*
-		When I lose focus on *Minutes*
-		Then I see the slider changes to match the value in *Minutes*
-		When I enter a value above 120 minutes into *Minutes*
-		Then I see the value in *Minutes* is set to 120 minutes
-			And I see the slider is set to 120 minutes
-		When I enter a value below 45 minutes into *Minutes*
-		Then I see the value in *Minutes* is set to 45 minutes
-			And I see the slider is set to 45 minutes
-
-	Scenario: Set completion to *Reference*
+		When I adjust the value by selecting a different option in the dropdown
+		Then I see the value in the *Minutes* field update
+
+	Scenario: Set completion to *Reference material*
 		When I click on the *Completion* dropdown
-			And I select *Reference*
-		Then I see *Reference* appear as an input for *Completion*
+			And I select *Reference material*
+		Then I see *Reference material* appear as an input for *Completion*
 			And I see the caption *Progress will not be tracked on reference material unless learners mark it as complete*
+			And the *Duration* input field is hidden
 
-	Scenario: Set completion to *Exact time to complete* on .MP4 or .MOV
+	Scenario: Set completion to *Time to complete* on .MP4 or .MOV
 		Given I am viewing an .MP4 or .MOV
 		When I click the *Completion* dropdown
-		When I select *Exact time to complete*
-		Then I see the exact duration <XX:XX> appear next to the *Completion* field as plain text
+		When I select *Time to complete*
+		Then I see the exact duration <XX:XX> appear next to the *Duration* field as plain text
 			And I see that I cannot edit it
 
-	Scenario: Set completion to *Exact time to complete* for non- .MP4 or .MOV
-		Given I am viewing a resource that is not an .MP4 or .MOV
-		When I click the *Completion* dropdown
-			And I select *Exact time to complete*
-		Then I see a *Exact time to complete* appear as an input for *Completion*
-			And I see a *Minutes* text input field appear next to *Completion*
-			And I see it is empty by default
+	Scenario: Set completion to *Time to complete* for .PDF, .EPUB, or slides
+		Given I am viewing a resource that is a .PDF, .EPUB, or slides
+			And *Completion* is set to *When time spent is equal to duration*
+		When I click the *Duration* dropdown
+			And I select *Time to complete*
+		Then I see a *Time to complete* appear as an input for *Duration*
+			And I see a *Minutes* text input field appear next to *Duration*
 		When I click the *Minutes* field
 			And I enter a whole number
 			And I lose focus on the field
@@ -106,11 +120,16 @@ Feature: Edit completion/duration field
 		When I try to enter a non-numeric input or non-whole number
 		Then I see that I am blocked from entering that input
 
+	Scenario: Check *Allow learners to mark as complete*
+		Given I can see the *Allow learners to mark as complete* field in *Completion*
+		When I click on the checkbox
+		Then I see that it changes from its current state to the opposite
+
 	Scenario: Set completion to *Practice until goal is met*
 		Given I am viewing an exercise
 		When I click the *Completion* dropdown
-			And I click *Practice until goal is met*
-		Then I see the *Completion* field is set to *Practice until goal is met*
+			And I click *When goal is met*
+		Then I see the *Completion* field is set to *When goal is met*
 			And I see an empty *Goal* text field dropdown appears next to it
 		When I click the *Goal* dropdown
 		Then I see the options: *100% correct*, *M of N*, *10 in a row*, *2 in a row*, *3 in a row*, *5 in a row*
@@ -118,16 +137,18 @@ Feature: Edit completion/duration field
 		Then I see an empty *Correct answers needed* text field, */*, and empty *Recent answers* text field appear
 
 	Scenario: See that *Completion* field is required
-		Given the *Completion* field of <resource> is empty
-		When I click the *Completion* text field
-			And I lose focus on the *Completion* text field
-		Then I see *Completion* is in an error state
-			And I see *Completion is required*
+		Given that a required *Completion* or *Duration* field of <resource> is empty
+		When I click the *Completion* or *Duration* text field
+			And I lose focus on the *Completion* or *Duration* text field
+		Then I see *Completion* or *Duration* is in an error state
+			And I see *This field is required*
 		When I click *FINISH*
+		Then I see a pop up that informs me that the resource is incomplete
+			And I can *Exit anyway* or *Keep editing*
+		When I click *EXIT* without adding the required fields
 		Then I see <resource> in the topic tree
 			And I see a red error icon on <resource>
 		When I left-click the <resource>
 		Then I see the previewer for the <resource>
-			And I see there is no learning activity label at the top left
-			And I see the *Completion* field has a red error icon
-			And I see the message *Missing completion criteria* in red text
+			And I see the missing *Completion* or *Duration* field has a red outline error
+		And I see *This field is required* below the field
diff --git a/requirements.in b/requirements.in
index 8d4b5eb708..2704539269 100644
--- a/requirements.in
+++ b/requirements.in
@@ -6,7 +6,7 @@ djangorestframework==3.12.4
 psycopg2-binary==2.9.5
 django-js-reverse==0.9.1
 django-registration==3.3
-le-utils==0.1.41
+le-utils==0.1.42
 gunicorn==20.1.0
 django-postmark==0.1.6
 jsonfield==3.1.0
diff --git a/requirements.txt b/requirements.txt
index 8b478194a8..e6068899d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -166,7 +166,7 @@ jsonschema==4.16.0
     # via -r requirements.in
 kombu==5.2.4
     # via celery
-le-utils==0.1.41
+le-utils==0.1.42
     # via -r requirements.in
 newrelic==6.2.0.156
     # via -r requirements.in
diff --git a/yarn.lock b/yarn.lock
index a99d51e19f..f42a49c523 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1605,57 +1605,47 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@sentry/browser@7.11.1":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.11.1.tgz#377d417e833ef54c78a93ef720a742bda5022625"
-  integrity sha512-k2XHuzPfnm8VJPK5eWd1+Y5VCgN42sLveb8Qxc3prb5PSL416NWMLZaoB7RMIhy430fKrSFiosnm6QDk2M6pbA==
-  dependencies:
-    "@sentry/core" "7.11.1"
-    "@sentry/types" "7.11.1"
-    "@sentry/utils" "7.11.1"
+"@sentry/browser@7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.19.0.tgz#ce21544b843d5c4d5dcb9fe9b7ee31c5c4e91f42"
+  integrity sha512-dWi5VjEwiLb4ofata0UCLdTbXLD1uDUebe9rNSBkHZ3fHF4eap4ZJlu3dYePKB0CKZhZrjzbydimMhaMUNdnug==
+  dependencies:
+    "@sentry/core" "7.19.0"
+    "@sentry/types" "7.19.0"
+    "@sentry/utils" "7.19.0"
     tslib "^1.9.3"
 
-"@sentry/core@7.11.1":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.11.1.tgz#d68e796f3b6428aefd6086a1db00118df7a9a9e4"
-  integrity sha512-kaDSZ6VNuO4ZZdqUOOX6XM6x+kjo2bMnDQ3IJG51FPvVjr8lXYhXj1Ccxcot3pBYAIWPPby2+vNDOXllmXqoBA==
+"@sentry/core@7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.19.0.tgz#74e0eaf4b9f42bb0290f4b3f3b0ea3e272dd693e"
+  integrity sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==
   dependencies:
-    "@sentry/hub" "7.11.1"
-    "@sentry/types" "7.11.1"
-    "@sentry/utils" "7.11.1"
+    "@sentry/types" "7.19.0"
+    "@sentry/utils" "7.19.0"
     tslib "^1.9.3"
 
-"@sentry/hub@7.11.1":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.11.1.tgz#1749b2b102ea1892ff388d65d66d3b402b393958"
-  integrity sha512-M6ClgdXdptS0lUBKB5KpXXe2qMQhsoiEN2pEGRI6+auqhfHCUQB1ZXsfjiOYexKC9fwx7TyFyZ9Jcaf2DTxEhw==
-  dependencies:
-    "@sentry/types" "7.11.1"
-    "@sentry/utils" "7.11.1"
-    tslib "^1.9.3"
-
-"@sentry/types@7.11.1":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.11.1.tgz#06e2827f6ba37159c33644208a0453b86d25e232"
-  integrity sha512-gIEhOPxC2cjrxQ0+K2SFJ1P6e/an5osSxVc9OOtekN28eHtVsXFCLB8XVWeNQnS7N2VkrVrkqORMBz1kvIcvVQ==
+"@sentry/types@7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.19.0.tgz#3ebb96670399b637a945fa499fa7436f7b930147"
+  integrity sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA==
 
-"@sentry/utils@7.11.1":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.11.1.tgz#1635c5b223369d9428bc83c9b8908c9c3287ee10"
-  integrity sha512-tRVXNT5O9ilkV31pyHeTqA1PcPQfMV/2OR6yUYM4ah+QVISovC0f0ybhByuH5nYg6x/Gsnx1o7pc8L1GE3+O7A==
+"@sentry/utils@7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.19.0.tgz#0e039fe57056074c3a5e47bd50d9cb4ac9a6e909"
+  integrity sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==
   dependencies:
-    "@sentry/types" "7.11.1"
+    "@sentry/types" "7.19.0"
     tslib "^1.9.3"
 
 "@sentry/vue@^7.11.1":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-7.11.1.tgz#dc3a1d4868a3400222053465dac154a9e30aedce"
-  integrity sha512-4RiaMbvGITpKpnzJBixCR874HjYCmK11yt9YRt/rwXE185TKCVyq54h+57l3680WgNz4MU9oI+PF6C/1E/LfXg==
-  dependencies:
-    "@sentry/browser" "7.11.1"
-    "@sentry/core" "7.11.1"
-    "@sentry/types" "7.11.1"
-    "@sentry/utils" "7.11.1"
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-7.19.0.tgz#3352eb1dac349045c71c522bf12770be310422c0"
+  integrity sha512-d8voF9B+Dqnn9YiTQaiaNUC7p0dq+UxMWjtVatC9YVR7efgQPyTbgTmw6N4yRmWtlD2Itaspwz7UNZdeCGQbHw==
+  dependencies:
+    "@sentry/browser" "7.19.0"
+    "@sentry/core" "7.19.0"
+    "@sentry/types" "7.19.0"
+    "@sentry/utils" "7.19.0"
     tslib "^1.9.3"
 
 "@sinclair/typebox@^0.24.1":
@@ -8000,9 +7990,9 @@ known-css-properties@^0.24.0:
   integrity sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==
 
 kolibri-constants@^0.1.41:
-  version "0.1.41"
-  resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.1.41.tgz#7acf8118bc4ab2ceb3e28b807e391d46bb563ed9"
-  integrity sha512-cykNfZvnW8FZlpYnk3SvTUuCOGlYGwgmQbor91dpWe9z8Tb4jcZKYzIY+ZBCsjgsU1azb+R+gdqLxrdw9LgGLg==
+  version "0.1.42"
+  resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.1.42.tgz#2f62a8d8b8894e5cfbd47ee6564b31018818c93f"
+  integrity sha512-2hUxYnzUEfhLFJO9egVSwYW8/PKob9wLeDYfB74mtIzgQ4zy6huRj3574WetK9gREi+W1Jcm7HGPsfZIFzFvrA==
 
 "kolibri-design-system@https://github.com/learningequality/kolibri-design-system#e9a2ff34716bb6412fe99f835ded5b17345bab94":
   version "1.3.0"