Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
diff -u -r6ff1966e270c9f86609b19a72f4906419f89670b -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 6ff1966e270c9f86609b19a72f4906419f89670b)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -251,5 +251,10 @@
      */
     boolean syncRatQuestions(long toolContentId, List<Long> newQuestionUids);
 
+    /**
+     * Delegates to ILearningDesignService#findMatchingRatActivity(long)
+     */
+    Long findMatchingRatActivity(long toolContentId);
+
     void assignGroupsForGalleryWalk(SortedMap<String, Set<String>> groups, int clusterSize);
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r6ff1966e270c9f86609b19a72f4906419f89670b -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 6ff1966e270c9f86609b19a72f4906419f89670b)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -566,12 +566,16 @@
 	return session.getLearners().size();
     }
 
+    public Long findMatchingRatActivity(long toolContentId) {
+	return learningDesignService.findMatchingRatActivity(toolContentId);
+    }
+
     /**
      * Updates TBL iRAT/tRAT activity with questions from matching tRAT/iRAT activity
      */
     @Override
     public boolean syncRatQuestions(long toolContentId, List<Long> newQuestionUids) {
-	Long matchingRATActivityId = learningDesignService.findMatchingRatActivity(toolContentId);
+	Long matchingRATActivityId = findMatchingRatActivity(toolContentId);
 	if (matchingRATActivityId == null) {
 	    return false;
 	}
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r13b9f60ae467a5926804ac7229154f390a81b793 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 13b9f60ae467a5926804ac7229154f390a81b793)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -459,4 +459,5 @@
 label.authoring.advance.question.distribution = Question distribution
 label.monitoring.user.summary.marker.comment = Comment
 label.monitoring.user.summary.marker = Marker
-label.activity.monitoring = Activity details
\ No newline at end of file
+label.activity.monitoring = Activity details
+message.authoring.rat.questions.sync = You have edited questions in this activity. Do you want to synchronise the changes with the corresponding TBL RAT activity?
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r3949a1bbc3c7b576035600a88cda331703c12d9e -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 3949a1bbc3c7b576035600a88cda331703c12d9e)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -219,6 +219,7 @@
     public static final String CONFIG_KEY_AUTO_EXPAND_JUSTIFICATION = "autoexpandJustification";
 
     public static final String ATTR_IS_QUESTION_ETHERPAD_ENABLED = "isQuestionEtherpadEnabled";
+    public static final String ATTR_HAS_MATCHING_RAT_ACTIVITY = "hasMatchingRatActivity";
 
     public static final String ATTR_CODE_STYLES = "codeStyles";
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -rbca8248580df6c46e6a8462d80e4341598cd9f28 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -23,31 +23,9 @@
 
 package org.lamsfoundation.lams.tool.assessment.web.controller;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.net.URLDecoder;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -90,9 +68,29 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.util.HtmlUtils;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.net.URLDecoder;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 /**
  * @author Andrey Balan
@@ -208,6 +206,9 @@
 	boolean aiEnabled = Configuration.isLamsModuleAvailable(Configuration.AI_MODULE_CLASS);
 	sessionMap.put(AttributeNames.ATTR_IS_AI_ENABLED, aiEnabled);
 
+	boolean hasMatchingRatActivity = lamsToolService.findMatchingRatActivity(contentId) != null;
+	sessionMap.put(AssessmentConstants.ATTR_HAS_MATCHING_RAT_ACTIVITY, hasMatchingRatActivity);
+
 	Hibernate.initialize(assessment.getSections());
 
 	return "pages/authoring/start";
@@ -238,7 +239,7 @@
     @SuppressWarnings("unchecked")
     @RequestMapping(path = "/updateContent", method = RequestMethod.POST)
     public String updateContent(@ModelAttribute("assessmentForm") AssessmentForm assessmentForm,
-	    HttpServletRequest request) throws Exception {
+	    @RequestParam(required = false) boolean syncRatQuestions, HttpServletRequest request) throws Exception {
 	// get back sessionMAP
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(assessmentForm.getSessionMapID());
@@ -427,9 +428,11 @@
 	    }
 	}
 
-	List<Long> newQuestionUids = assessmentPO.getQuestionReferences().stream()
-		.collect(Collectors.mapping(q -> q.getQuestion().getQbQuestion().getUid(), Collectors.toList()));
-	lamsToolService.syncRatQuestions(assessmentPO.getContentId(), newQuestionUids);
+	if (syncRatQuestions) {
+	    List<Long> newQuestionUids = assessmentPO.getQuestionReferences().stream()
+		    .collect(Collectors.mapping(q -> q.getQuestion().getQbQuestion().getUid(), Collectors.toList()));
+	    lamsToolService.syncRatQuestions(assessmentPO.getContentId(), newQuestionUids);
+	}
 
 	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -12,7 +12,10 @@
 	 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
 	<script>
-        function init() {
+		const hasMatchingRatActivity = ${not empty sessionMap.hasMatchingRatActivity and sessionMap.hasMatchingRatActivity};
+		let questionsEdited = false;
+
+		function init() {
             var tag = document.getElementById("currentTab");
 		    if (tag.value != ""){
 		    	selectTab(tag.value);
@@ -48,6 +51,9 @@
 	        $("#display-summary").removeAttr("disabled", "disabled");
 	        $("#questionsPerPage").prop('disabled', false);
 
+			$('#syncRatQuestions').val(hasMatchingRatActivity && questionsEdited &&
+					confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.authoring.rat.questions.sync'/></spring:escapeBody>"));
+
         	return true;
         }
         
@@ -65,6 +71,7 @@
 		
 			<form:hidden path="assessment.contentId" />
 			<input type="hidden" name="mode" value="${mode}">
+			<input type="hidden" id="syncRatQuestions" name="syncRatQuestions" value="false">
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="contentFolderID" />
 			<form:hidden path="currentTab" id="currentTab" />
@@ -100,4 +107,4 @@
 	
 	</form:form>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -63,6 +63,7 @@
 					toolContentId: ${sessionMap.toolContentID}
 				},
 				function() {
+					questionsEdited = true;
 					$(this).removeClass("contains-nothing");
 				}
 			);
@@ -73,6 +74,8 @@
     		var	deletionConfirmed = confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='warning.msg.authoring.do.you.want.to.delete'/></spring:escapeBody>");
 
     		if (deletionConfirmed) {
+				questionsEdited = true;
+
     			var sequenceId = $('.reference-sequence-id', $(this).parents('tr')).val();
 
     			$(questionListTargetDiv).load(
@@ -108,6 +111,7 @@
 	//The panel of assessment list panel
 	var questionListTargetDiv = "#itemArea";
 	function initNewReferenceHref() {
+		questionsEdited = true;
 		var questionTypeDropdown = document.getElementById("questionType");
 		var questionType = questionTypeDropdown.value;
 		
@@ -152,6 +156,7 @@
 		if (oldQbQuestionUid == newQbQuestionUid) {
 			return;
 		}
+		questionsEdited = true;
 		
 		var url = "<c:url value="/authoring/changeItemQuestionVersion.do"/>";
 		$(questionListTargetDiv).load(
@@ -213,6 +218,7 @@
 	
  	// this method is called by QTI questionChoice.jsp 
     function saveQTI(formHTML, formName) {
+		questionsEdited = true;
     	var form = $($.parseHTML(formHTML));
     	// first, save questions in the QB
 		$.ajax({
@@ -331,4 +337,4 @@
 			</div>
 		</div>
 	</div>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -17,10 +17,10 @@
 		existingQbQuestionUids = '${existingQbQuestionUids}'.trim();
 		
 	switch (qbQuestionModified) {
-		case <%= IQbService.QUESTION_MODIFIED_UPDATE %>: 
+		case <%= IQbService.QUESTION_MODIFIED_UPDATE %>:
 			qbMessage = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="message.qb.modified.update" /></spring:escapeBody>';
 			break;
-		case <%= IQbService.QUESTION_MODIFIED_VERSION_BUMP %>: 
+		case <%= IQbService.QUESTION_MODIFIED_VERSION_BUMP %>:
 			let showMessage = true;
 		
 			// check if we are in main authoring environment
@@ -39,11 +39,12 @@
 				qbMessage = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="message.qb.modified.version" /></spring:escapeBody>';
 			}
 			break;
-		case <%= IQbService.QUESTION_MODIFIED_ID_BUMP %>: 
+		case <%= IQbService.QUESTION_MODIFIED_ID_BUMP %>:
 			qbMessage = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="message.qb.modified.new" /></spring:escapeBody>';
 			break;
 	}
 	if (qbMessage) {
+		questionsEdited = true;
 		alert(qbMessage);
 	}
 
@@ -57,6 +58,7 @@
 		    direction: 'vertical',
 			store: {
 				set: function (sortable) {
+					questionsEdited = true;
 					//update all sequenceIds
 					for (var i = 0; i < sortable.el.rows.length; i++) {
 					 	var tr = sortable.el.rows[i];
@@ -243,4 +245,4 @@
 			</tr>
 		</c:forEach>
 	</table>
-</div>
+</div>
\ No newline at end of file
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r228aa841d4e48c883a83d62f58ced29f39494da2 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 228aa841d4e48c883a83d62f58ced29f39494da2)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -312,3 +312,4 @@
 label.minutes = minutes
 label.hours = hour(s)
 label.incorrect.answer = Incorrect answer
+message.authoring.rat.questions.sync = You have edited questions in this activity. Do you want to synchronise the changes with the corresponding TBL RAT activity?
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -191,6 +191,8 @@
     public static final String ATTR_SHOW_RESULTS = "showResults";
 
     public static final String ATTR_REFERENCES_SEQUENCE_IDS = "sequenceIds";
+
+    public static final String ATTR_HAS_MATCHING_RAT_ACTIVITY = "hasMatchingRatActivity";
     
     //flux management
     public static final String ANSWERS_UPDATED_SINK_NAME = "scratchie learner answers updated";
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -rf0ff6bc30e8fa7e5d4201b7b9571194845ad3a83 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision f0ff6bc30e8fa7e5d4201b7b9571194845ad3a83)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -23,28 +23,8 @@
 
 package org.lamsfoundation.lams.tool.scratchie.web.controller;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -86,8 +66,26 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @author Andrey Balan
@@ -163,12 +161,12 @@
 	}
 
 	//prepare advanced option allowing to overwrite default preset marks
-	ScratchieConfigItem defaultPresetMarksConfigItem = scratchieService
-		.getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS);
-	String defaultPresetMarks = defaultPresetMarksConfigItem == null ? ""
-		: defaultPresetMarksConfigItem.getConfigValue();
-	boolean presetMarksOverwritten = scratchie.getPresetMarks() != null
-		&& !scratchie.getPresetMarks().equals(defaultPresetMarks);
+	ScratchieConfigItem defaultPresetMarksConfigItem = scratchieService.getConfigItem(
+		ScratchieConfigItem.KEY_PRESET_MARKS);
+	String defaultPresetMarks =
+		defaultPresetMarksConfigItem == null ? "" : defaultPresetMarksConfigItem.getConfigValue();
+	boolean presetMarksOverwritten =
+		scratchie.getPresetMarks() != null && !scratchie.getPresetMarks().equals(defaultPresetMarks);
 	sessionMap.put(ScratchieConstants.ATTR_IS_PRESET_MARKS_OVERWRITTEN, presetMarksOverwritten);
 	sessionMap.put(ScratchieConstants.ATTR_DEFAULT_PRESET_MARKS, defaultPresetMarks);
 
@@ -191,8 +189,8 @@
 	}
 
 	//display confidence providing activities
-	Set<ToolActivity> confidenceLevelsActivities = scratchieService
-		.getActivitiesProvidingConfidenceLevels(contentId);
+	Set<ToolActivity> confidenceLevelsActivities = scratchieService.getActivitiesProvidingConfidenceLevels(
+		contentId);
 	sessionMap.put(ScratchieConstants.ATTR_ACTIVITIES_PROVIDING_CONFIDENCE_LEVELS, confidenceLevelsActivities);
 
 	//display activities providing VSA answers
@@ -213,6 +211,9 @@
 	boolean questionEtherpadEnabled = StringUtils.isNotBlank(Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY));
 	sessionMap.put(ScratchieConstants.ATTR_IS_QUESTION_ETHERPAD_ENABLED, questionEtherpadEnabled);
 
+	boolean hasMatchingRatActivity = lamsToolService.findMatchingRatActivity(contentId) != null;
+	sessionMap.put(ScratchieConstants.ATTR_HAS_MATCHING_RAT_ACTIVITY, hasMatchingRatActivity);
+
 	return "pages/authoring/start";
     }
 
@@ -239,7 +240,7 @@
      */
     @RequestMapping(path = "/update", method = RequestMethod.POST)
     private String updateContent(@ModelAttribute("authoringForm") ScratchieForm authoringForm,
-	    HttpServletRequest request) throws Exception {
+	    @RequestParam(required = false) boolean syncRatQuestions, HttpServletRequest request) throws Exception {
 	// get back sessionMAP
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(authoringForm.getSessionMapID());
@@ -250,7 +251,8 @@
 	Scratchie scratchiePO = scratchieService.getScratchieByContentId(authoringForm.getScratchie().getContentId());
 
 	//allow using old and modified questions together
-	Set<ScratchieItem> oldItems = (scratchiePO == null) ? new HashSet<>()
+	Set<ScratchieItem> oldItems = (scratchiePO == null)
+		? new HashSet<>()
 		: new HashSet<>(scratchiePO.getScratchieItems());
 	String oldPresetMarks = null;
 
@@ -313,11 +315,11 @@
 		scratchieService.deleteScratchieItem(item.getUid());
 	    }
 	}
-
-	List<Long> newQuestionUids = scratchiePO.getScratchieItems().stream()
-		.collect(Collectors.mapping(q -> q.getQbQuestion().getUid(), Collectors.toList()));
-	lamsToolService.syncRatQuestions(scratchiePO.getContentId(), newQuestionUids);
-
+	if (syncRatQuestions) {
+	    List<Long> newQuestionUids = scratchiePO.getScratchieItems().stream()
+		    .collect(Collectors.mapping(q -> q.getQbQuestion().getUid(), Collectors.toList()));
+	    lamsToolService.syncRatQuestions(scratchiePO.getContentId(), newQuestionUids);
+	}
 	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
@@ -334,9 +336,8 @@
 	form.setSessionMapID(sessionMap.getSessionID());
 
 	List<QbOption> optionList = new ArrayList<>();
-	int initialOptionsNumber = questionType == QbQuestion.TYPE_MULTIPLE_CHOICE
-		? ScratchieConstants.INITIAL_MCQ_OPTIONS_NUMBER
-		: 2;
+	int initialOptionsNumber =
+		questionType == QbQuestion.TYPE_MULTIPLE_CHOICE ? ScratchieConstants.INITIAL_MCQ_OPTIONS_NUMBER : 2;
 	for (int i = 0; i < initialOptionsNumber; i++) {
 	    QbOption option = new QbOption();
 	    option.setDisplayOrder(i + 1);
@@ -351,7 +352,8 @@
 	form.setContentFolderID(contentFolderID);
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 
-	return questionType == QbQuestion.TYPE_MULTIPLE_CHOICE ? "pages/authoring/parts/addMcq"
+	return questionType == QbQuestion.TYPE_MULTIPLE_CHOICE
+		? "pages/authoring/parts/addMcq"
 		: "pages/authoring/parts/addVsa";
     }
 
@@ -513,7 +515,8 @@
 	    if (isDefaultQuestion) {
 		String questionContentFolderID = FileUtil.generateUniqueContentFolderID();
 		qbQuestion.setContentFolderId(questionContentFolderID);
-		qbQuestion.setQuestionId(qbService.generateNextQuestionId()); // generate a new question ID right away, so another user won't "take it"
+		qbQuestion.setQuestionId(
+			qbService.generateNextQuestionId()); // generate a new question ID right away, so another user won't "take it"
 	    }
 	}
 
@@ -541,7 +544,8 @@
 	List<QbOption> options = new ArrayList<>(optionList);
 	qbQuestion.setQbOptions(options);
 
-	int isQbQuestionModified = isDefaultQuestion ? IQbService.QUESTION_MODIFIED_ID_BUMP
+	int isQbQuestionModified = isDefaultQuestion
+		? IQbService.QUESTION_MODIFIED_ID_BUMP
 		: qbQuestion.isQbQuestionModified(oldQbQuestion);
 	if (isQbQuestionModified < IQbService.QUESTION_MODIFIED_VERSION_BUMP && enforceNewVersion) {
 	    isQbQuestionModified = IQbService.QUESTION_MODIFIED_VERSION_BUMP;
@@ -556,7 +560,7 @@
 		updatedQuestion.setCreateDate(new Date());
 		updatedQuestion.setUuid(UUID.randomUUID());
 	    }
-		break;
+	    break;
 	    case IQbService.QUESTION_MODIFIED_ID_BUMP: {
 		// new question gets created
 		updatedQuestion = qbQuestion.clone();
@@ -566,12 +570,12 @@
 		updatedQuestion.setCreateDate(new Date());
 		updatedQuestion.setUuid(UUID.randomUUID());
 	    }
-		break;
+	    break;
 	    case IQbService.QUESTION_MODIFIED_NONE: {
 		// save the old question anyway, as it may contain some minor changes (like title or description change)
 		updatedQuestion = qbQuestion;
 	    }
-		break;
+	    break;
 	}
 	userManagementService.save(updatedQuestion);
 	item.setQbQuestion(updatedQuestion);
@@ -585,8 +589,8 @@
 	//take care about question's collections. add to collection first
 	Long oldCollectionUid = form.getOldCollectionUid();
 	Long newCollectionUid = form.getNewCollectionUid();
-	if (isAddingQuestion || isDefaultQuestion
-		|| (newCollectionUid != null && !newCollectionUid.equals(oldCollectionUid))) {
+	if (isAddingQuestion || isDefaultQuestion || (newCollectionUid != null && !newCollectionUid.equals(
+		oldCollectionUid))) {
 	    qbService.addQuestionToCollection(newCollectionUid, updatedQuestion.getQuestionId(), false);
 	}
 	//remove from the old collection, if needed
@@ -648,8 +652,8 @@
 
 	Set<ScratchieItem> updatedItemList = new TreeSet<>(new ScratchieItemComparator());
 	for (ScratchieItem item : itemList) {
-	    String newSequenceId = sequenceIdsParamMap
-		    .get(ScratchieConstants.PARAM_SEQUENCE_ID + item.getDisplayOrder());
+	    String newSequenceId = sequenceIdsParamMap.get(
+		    ScratchieConstants.PARAM_SEQUENCE_ID + item.getDisplayOrder());
 	    item.setDisplayOrder(Integer.valueOf(newSequenceId));
 	    updatedItemList.add(item);
 	}
@@ -791,6 +795,7 @@
     // *************************************************************************************
     // Private method
     // *************************************************************************************
+
     /**
      * List save current scratchie items.
      *
@@ -828,13 +833,13 @@
      *
      * @param request
      * @param isForSaving
-     *            whether the blank options will be preserved or not
-     *
+     * 	whether the blank options will be preserved or not
      */
     private TreeSet<QbOption> getOptionsFromRequest(HttpServletRequest request, boolean isMcqQuestion,
 	    boolean isForSaving) {
 	Map<String, String> paramMap = splitRequestParameter(request, QbConstants.ATTR_OPTION_LIST);
-	Integer correctOptionIndex = (paramMap.get(QbConstants.ATTR_OPTION_CORRECT) == null) ? null
+	Integer correctOptionIndex = (paramMap.get(QbConstants.ATTR_OPTION_CORRECT) == null)
+		? null
 		: NumberUtils.toInt(paramMap.get(QbConstants.ATTR_OPTION_CORRECT));
 
 	int count = NumberUtils.toInt(paramMap.get(QbConstants.ATTR_OPTION_COUNT));
@@ -882,7 +887,7 @@
      *
      * @param request
      * @param parameterName
-     *            parameterName
+     * 	parameterName
      */
     private Map<String, String> splitRequestParameter(HttpServletRequest request, String parameterName) {
 	String list = request.getParameter(parameterName);
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -51,6 +51,9 @@
 	</style>
 	
 	<script>
+		const hasMatchingRatActivity = ${not empty sessionMap.hasMatchingRatActivity and sessionMap.hasMatchingRatActivity};
+		let questionsEdited = false;
+
         function init(){
             var tag = document.getElementById("currentTab");
 		    if (tag.value != "") {
@@ -77,6 +80,9 @@
 				$('#relativeTimeLimit').val(0);
 			}
 
+			$('#syncRatQuestions').val(hasMatchingRatActivity && questionsEdited &&
+					confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.authoring.rat.questions.sync'/></spring:escapeBody>"));
+
 			return true;
         }
     </script>
@@ -90,6 +96,7 @@
 		<form:hidden path="sessionMapID" />
 		<form:hidden path="contentFolderID" />
 		<input type="hidden" name="mode" value="${mode}"/>
+		<input type="hidden" id="syncRatQuestions" name="syncRatQuestions" value="false">
 		<form:hidden path="currentTab" id="currentTab" />
 		<input type="hidden" name="itemList" id="itemList" />
 
@@ -133,4 +140,4 @@
 	</form:form>
 
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -r79123cc650a4028c6dfa0e931d9a074b07234be3 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -18,6 +18,7 @@
 					toolContentId: ${sessionMap.toolContentID}
 				},
 				function() {
+					questionsEdited = true;
 					$(this).removeClass("contains-nothing");
 				}
 			);
@@ -29,6 +30,7 @@
 		var	deletionConfirmed = confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='warning.msg.authoring.do.you.want.to.delete'/></spring:escapeBody>");
 		
 		if (deletionConfirmed) {
+			questionsEdited = true;
 			var url = "<c:url value="/authoring/removeItem.do"/>?<csrf:token/>";
 			$(itemTargetDiv).load(
 				url,
@@ -48,6 +50,7 @@
 		if (oldQbQuestionUid == newQbQuestionUid) {
 			return;
 		}
+		questionsEdited = true;
 		
 		var url = "<c:url value="/authoring/changeItemQuestionVersion.do"/>";
 		$(itemTargetDiv).load(
@@ -75,6 +78,7 @@
 	}
 	
 	function initNewItemHref() {
+		questionsEdited = true;
 		var itemTypeDropdown = document.getElementById("item-type");
 		var itemType = itemTypeDropdown.value;
 		
@@ -95,6 +99,7 @@
   	
   	// this method is called by QTI questionChoice.jsp 
     function saveQTI(formHTML, formName) {
+		questionsEdited = true;
     	var form = $($.parseHTML(formHTML));
     	// first, save questions in the QB
 		$.ajax({
@@ -180,4 +185,4 @@
 			</div>
 		</div>
 	</div>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r79123cc650a4028c6dfa0e931d9a074b07234be3 -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
@@ -37,6 +37,7 @@
 			break;
 	}
 	if (qbMessage) {
+		questionsEdited = true;
 		alert(qbMessage);
 	}
 	
@@ -50,6 +51,7 @@
 			    direction: 'vertical',
 				store: {
 					set: function (sortable) {
+						questionsEdited = true;
 						//update all sequenceIds
 						for (var i = 0; i < sortable.el.rows.length; i++) {
 						 	var tr = sortable.el.rows[i];
@@ -190,4 +192,4 @@
 			</tr>
 		</c:forEach>
 	</table>
-</div>
+</div>
\ No newline at end of file