Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r9d0d81c8d1348fd8eaf2da0bc713621459a47718 -r90aaa6a33006ccf9104ff54239cf13b9ef587728
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 9d0d81c8d1348fd8eaf2da0bc713621459a47718)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 90aaa6a33006ccf9104ff54239cf13b9ef587728)
@@ -116,6 +116,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
@@ -3453,6 +3454,7 @@
 
 		qbQuestion = new QbQuestion();
 		qbQuestion.setQuestionId(qbService.generateNextQuestionId());
+		qbQuestion.setContentFolderId(FileUtil.generateUniqueContentFolderID());
 		qbQuestion.setType(type);
 		qbQuestion.setName(JsonUtil.optString(questionJSONData, RestTags.QUESTION_TITLE));
 		qbQuestion.setDescription(JsonUtil.optString(questionJSONData, RestTags.QUESTION_TEXT));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r9d0d81c8d1348fd8eaf2da0bc713621459a47718 -r90aaa6a33006ccf9104ff54239cf13b9ef587728
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 9d0d81c8d1348fd8eaf2da0bc713621459a47718)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 90aaa6a33006ccf9104ff54239cf13b9ef587728)
@@ -108,6 +108,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
@@ -2102,6 +2103,7 @@
 
 		qbQuestion = new QbQuestion();
 		qbQuestion.setQuestionId(qbService.generateNextQuestionId());
+		qbQuestion.setContentFolderId(FileUtil.generateUniqueContentFolderID());
 		qbQuestion.setType(QbQuestion.TYPE_MULTIPLE_CHOICE);
 		qbQuestion.setName(JsonUtil.optString(questionData, RestTags.QUESTION_TITLE));
 		qbQuestion.setDescription(JsonUtil.optString(questionData, RestTags.QUESTION_TEXT));
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
===================================================================
diff -u -r9d0d81c8d1348fd8eaf2da0bc713621459a47718 -r90aaa6a33006ccf9104ff54239cf13b9ef587728
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 9d0d81c8d1348fd8eaf2da0bc713621459a47718)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 90aaa6a33006ccf9104ff54239cf13b9ef587728)
@@ -79,6 +79,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -1189,6 +1190,7 @@
 	    qbQuestion.setType(QbQuestion.TYPE_ESSAY);
 	    qbQuestion.setQuestionId(qbService.generateNextQuestionId());
 	    qbQuestion.setVersion(1);
+	    qbQuestion.setContentFolderId(FileUtil.generateUniqueContentFolderID());
 
 	    qbQuestion.setName(JsonUtil.optString(questionData, RestTags.QUESTION_TEXT));
 	    qbQuestion.setFeedback(JsonUtil.optString(questionData, "feedback"));
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r9d0d81c8d1348fd8eaf2da0bc713621459a47718 -r90aaa6a33006ccf9104ff54239cf13b9ef587728
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 9d0d81c8d1348fd8eaf2da0bc713621459a47718)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 90aaa6a33006ccf9104ff54239cf13b9ef587728)
@@ -106,6 +106,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
@@ -2633,6 +2634,7 @@
 		qbQuestion = new QbQuestion();
 		qbQuestion.setType(QbQuestion.TYPE_MULTIPLE_CHOICE);
 		qbQuestion.setQuestionId(qbService.generateNextQuestionId());
+		qbQuestion.setContentFolderId(FileUtil.generateUniqueContentFolderID());
 		qbQuestion.setName(JsonUtil.optString(questionData, RestTags.QUESTION_TITLE));
 		qbQuestion.setDescription(JsonUtil.optString(questionData, RestTags.QUESTION_TEXT));
 		scratchieDao.insert(qbQuestion);