diff --git a/tutor/templates/jobs/init/cms.sh b/tutor/templates/jobs/init/cms.sh
index 2f732da22f1..1d420a48ab0 100644
--- a/tutor/templates/jobs/init/cms.sh
+++ b/tutor/templates/jobs/init/cms.sh
@@ -11,4 +11,8 @@ if [ -d /openedx/data/uploads/ ]; then
     mv /openedx/data/uploads/* /openedx/media/
     rm -rf /openedx/data/uploads/
   fi
-fi
\ No newline at end of file
+fi
+
+# Create waffle switches to enable some features, if they have not been explicitly defined before
+# Copy-paste of units in Studio (highly requested new feature, but defaults to off in Quince)
+(./manage.py cms waffle_flag --list | grep contentstore.enable_copy_paste_units) || ./manage.py lms waffle_flag --create contentstore.enable_copy_paste_units --everyone