Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0 -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
@@ -1630,7 +1630,7 @@
     public Long createTblAssessmentToolContent(UserDTO user, String title, String instructions,
 	    String reflectionInstructions, boolean selectLeaderToolOutput, boolean enableNumbering,
 	    boolean enableConfidenceLevels, boolean allowDiscloseAnswers, boolean allowAnswerJustification,
-	    boolean allowDiscussionSentiment, ArrayNode questions) throws IOException {
+	    boolean enableDiscussionSentiment, ArrayNode questions) throws IOException {
 
 	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions,
 		reflectionInstructions, null, null, user);
@@ -1640,7 +1640,7 @@
 	toolContentJSON.put("displaySummary", Boolean.TRUE);
 	toolContentJSON.put("allowDiscloseAnswers", allowDiscloseAnswers);
 	toolContentJSON.put("allowAnswerJustification", allowAnswerJustification);
-	toolContentJSON.put("allowDiscussionSentiment", allowDiscussionSentiment);
+	toolContentJSON.put(RestTags.ENABLE_DISCUSSION_SENTIMENT, enableDiscussionSentiment);
 
 	if (questions != null) {
 	    toolContentJSON.set(RestTags.QUESTIONS, questions);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
===================================================================
diff -u -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0 -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java	(.../IAuthoringFullService.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java	(.../IAuthoringFullService.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
@@ -148,6 +148,6 @@
 
     Long createTblAssessmentToolContent(UserDTO user, String title, String instructions, String reflectionInstructions,
 	    boolean selectLeaderToolOutput, boolean enableNumbering, boolean enableConfidenceLevels,
-	    boolean allowDiscloseAnswers, boolean allowAnswerJustification, boolean allowDiscussionSentiment,
+	    boolean allowDiscloseAnswers, boolean allowAnswerJustification, boolean enableDiscussionSentiment,
 	    ArrayNode questions) throws IOException;
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -r0f295260a6f4f68d391ed74f3a7967fbf841af90 -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 0f295260a6f4f68d391ed74f3a7967fbf841af90)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
@@ -1058,8 +1058,8 @@
      * full details of questions). Other fields are optional.
      */
     protected Long createScratchieToolContent(UserDTO user, String title, String instructions,
-	    boolean useSelectLeaderToolOuput, Integer confidenceLevelsActivityUiid, ArrayNode questions)
-	    throws IOException {
+	    boolean useSelectLeaderToolOuput, boolean enableDiscussionSentiment, Integer confidenceLevelsActivityUiid,
+	    ArrayNode questions) throws IOException {
 
 	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null, null, null,
 		null);
@@ -1068,6 +1068,8 @@
 	    toolContentJSON.put(RestTags.CONFIDENCE_LEVELS_ACTIVITY_UIID, confidenceLevelsActivityUiid);
 	}
 
+	toolContentJSON.put(RestTags.ENABLE_DISCUSSION_SENTIMENT, enableDiscussionSentiment);
+
 	for (int i = 0; i < questions.size(); i++) {
 	    ObjectNode question = (ObjectNode) questions.get(i);
 	    question.put("answerRequired", true);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
===================================================================
diff -u -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0 -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
@@ -195,7 +195,7 @@
 		    ? JsonUtil.optInt(iraActivityJSON, AuthoringJsonTags.ACTIVITY_UIID)
 		    : null;
 	    Long tRAToolContentId = createScratchieToolContent(userDTO, activityTitle,
-		    data.getText("boilerplate.tra.instructions"), false, confidenceLevelsActivityUIID,
+		    data.getText("boilerplate.tra.instructions"), false, true, confidenceLevelsActivityUIID,
 		    testQuestionsArray);
 	    activities.add(createScratchieActivity(maxUIID, order++, currentActivityPosition, tRAToolContentId,
 		    data.contentFolderID, groupingUIID, null, null, activityTitle));
Index: lams_common/src/java/org/lamsfoundation/lams/rest/RestTags.java
===================================================================
diff -u -rd4198d73576015c08d18ebf55f3079c84fdf3415 -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150
--- lams_common/src/java/org/lamsfoundation/lams/rest/RestTags.java	(.../RestTags.java)	(revision d4198d73576015c08d18ebf55f3079c84fdf3415)
+++ lams_common/src/java/org/lamsfoundation/lams/rest/RestTags.java	(.../RestTags.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
@@ -54,6 +54,7 @@
     public static String MAXIMUM_RATES = "maximumRates";
     public static String ENABLE_CONFIDENCE_LEVELS = "enableConfidenceLevels";
     public static String CONFIDENCE_LEVELS_ACTIVITY_UIID = "confidenceLevelsActivityUiid";
+    public static String ENABLE_DISCUSSION_SENTIMENT = "enableDiscussionSentiment";
 
     public static String QUESTIONS = "questions";
     public static String QUESTION_TEXT = "questionText";
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0 -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
@@ -3623,7 +3623,7 @@
 	assessment.setAllowAnswerJustification(
 		JsonUtil.optBoolean(toolContentJSON, "allowAnswerJustification", Boolean.FALSE));
 	assessment.setAllowDiscussionSentiment(
-		JsonUtil.optBoolean(toolContentJSON, "allowDiscussionSentiment", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, RestTags.ENABLE_DISCUSSION_SENTIMENT, Boolean.FALSE));
 
 	// submission deadline set in monitoring
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -rfcd3028b8d92289519cc8471428df1deb028477a -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision fcd3028b8d92289519cc8471428df1deb028477a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
@@ -2810,6 +2810,8 @@
 	scratchie.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
 	scratchie.setBurningQuestionsEnabled(JsonUtil.optBoolean(toolContentJSON, "burningQuestionsEnabled", true));
+	scratchie.setDiscussionSentimentEnabled(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.ENABLE_DISCUSSION_SENTIMENT, false));
 	scratchie.setRelativeTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0));
 	scratchie.setExtraPoint(JsonUtil.optBoolean(toolContentJSON, "extraPoint", false));
 	scratchie.setReflectOnActivity(