Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -r24940cc694b5cab706055244b91904017b74ad54 -rc34b16da7fe48d6ed5ad039f0a61f66a12b215a0
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision 24940cc694b5cab706055244b91904017b74ad54)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision c34b16da7fe48d6ed5ad039f0a61f66a12b215a0)
@@ -12,6 +12,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.UUID;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -203,6 +204,7 @@
 		qbQuestion.clearID();
 		qbQuestion.setVersion(qbService.getMaxQuestionVersion(qbQuestion.getQuestionId()) + 1);
 		qbQuestion.setCreateDate(new Date());
+		qbQuestion.setUuid(UUID.randomUUID());
 	    }
 		break;
 	    case IQbService.QUESTION_MODIFIED_ID_BUMP: {
@@ -211,6 +213,7 @@
 		qbQuestion.clearID();
 		qbQuestion.setVersion(1);
 		qbQuestion.setCreateDate(new Date());
+		qbQuestion.setUuid(UUID.randomUUID());
 		// no need to bump question ID as the new question already has a new ID generated in initNewQuestion()
 	    }
 		break;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r0b845931db55d90f0dcabc0b33cce5c7df688153 -rc34b16da7fe48d6ed5ad039f0a61f66a12b215a0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 0b845931db55d90f0dcabc0b33cce5c7df688153)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision c34b16da7fe48d6ed5ad039f0a61f66a12b215a0)
@@ -311,13 +311,15 @@
 		    qbQuestion = qbQuestionClone;
 		    qbQuestion.setVersion(qbService.getMaxQuestionVersion(qbQuestion.getQuestionId()) + 1);
 		    qbQuestion.setCreateDate(new Date());
+		    qbQuestion.setUuid(UUID.randomUUID());
 		    break;
 		case IQbService.QUESTION_MODIFIED_ID_BUMP:
 		    // new questionDescription gets created
 		    qbQuestion = qbQuestionClone;
 		    qbQuestion.setVersion(1);
 		    qbQuestion.setQuestionId(qbService.generateNextQuestionId());
 		    qbQuestion.setCreateDate(new Date());
+		    qbQuestion.setUuid(UUID.randomUUID());
 		    break;
 	    }
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java
===================================================================
diff -u -rd9946f994303feb9afeed1f9c1a382427dba046b -rc34b16da7fe48d6ed5ad039f0a61f66a12b215a0
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision d9946f994303feb9afeed1f9c1a382427dba046b)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c34b16da7fe48d6ed5ad039f0a61f66a12b215a0)
@@ -34,6 +34,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.UUID;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -433,6 +434,7 @@
 		updatedQuestion.clearID();
 		updatedQuestion.setVersion(qbService.getMaxQuestionVersion(qbQuestion.getQuestionId()) + 1);
 		updatedQuestion.setCreateDate(new Date());
+		updatedQuestion.setUuid(UUID.randomUUID());
 	    }
 		break;
 	    case IQbService.QUESTION_MODIFIED_ID_BUMP: {
@@ -441,6 +443,7 @@
 		updatedQuestion.clearID();
 		updatedQuestion.setVersion(1);
 		updatedQuestion.setCreateDate(new Date());
+		updatedQuestion.setUuid(UUID.randomUUID());
 	    }
 		break;
 	    case IQbService.QUESTION_MODIFIED_NONE: {
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -rbcb806e82cb1d2f15b11791aeb5e8ff7335e0163 -rc34b16da7fe48d6ed5ad039f0a61f66a12b215a0
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision bcb806e82cb1d2f15b11791aeb5e8ff7335e0163)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c34b16da7fe48d6ed5ad039f0a61f66a12b215a0)
@@ -38,6 +38,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.UUID;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -547,6 +548,7 @@
 		updatedQuestion.clearID();
 		updatedQuestion.setVersion(qbService.getMaxQuestionVersion(qbQuestion.getQuestionId()) + 1);
 		updatedQuestion.setCreateDate(new Date());
+		updatedQuestion.setUuid(UUID.randomUUID());
 	    }
 		break;
 	    case IQbService.QUESTION_MODIFIED_ID_BUMP: {
@@ -556,6 +558,7 @@
 		updatedQuestion.setQuestionId(qbService.generateNextQuestionId());
 		updatedQuestion.setVersion(1);
 		updatedQuestion.setCreateDate(new Date());
+		updatedQuestion.setUuid(UUID.randomUUID());
 	    }
 		break;
 	    case IQbService.QUESTION_MODIFIED_NONE: {