Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r4a3f535791663e116bc76960f4fc1a4933eacabd -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 4a3f535791663e116bc76960f4fc1a4933eacabd)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
@@ -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,
-	    ArrayNode questions) throws IOException {
+	    boolean allowDiscussionSentiment, ArrayNode questions) throws IOException {
 
 	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions,
 		reflectionInstructions, null, null, user);
@@ -1640,6 +1640,7 @@
 	toolContentJSON.put("displaySummary", Boolean.TRUE);
 	toolContentJSON.put("allowDiscloseAnswers", allowDiscloseAnswers);
 	toolContentJSON.put("allowAnswerJustification", allowAnswerJustification);
+	toolContentJSON.put("allowDiscussionSentiment", allowDiscussionSentiment);
 
 	if (questions != null) {
 	    toolContentJSON.set(RestTags.QUESTIONS, questions);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
===================================================================
diff -u -r59044e7541aada72fb2b0c82589b55c61379106a -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java	(.../IAuthoringFullService.java)	(revision 59044e7541aada72fb2b0c82589b55c61379106a)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java	(.../IAuthoringFullService.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
@@ -148,5 +148,6 @@
 
     Long createTblAssessmentToolContent(UserDTO user, String title, String instructions, String reflectionInstructions,
 	    boolean selectLeaderToolOutput, boolean enableNumbering, boolean enableConfidenceLevels,
-	    boolean allowDiscloseAnswers, boolean allowAnswerJustification, ArrayNode questions) throws IOException;
+	    boolean allowDiscloseAnswers, boolean allowAnswerJustification, boolean allowDiscussionSentiment,
+	    ArrayNode questions) throws IOException;
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
===================================================================
diff -u -refb4c246f9823c08963864043992e40ee7d6a13a -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision efb4c246f9823c08963864043992e40ee7d6a13a)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
@@ -163,7 +163,7 @@
 
 	    Long iRAToolContentId = authoringService.createTblAssessmentToolContent(userDTO, activityTitle,
 		    data.getText("boilerplate.ira.instructions"), null, false, true, data.confidenceLevelEnable, false,
-		    false, testQuestionsArray);
+		    false, false, testQuestionsArray);
 	    ObjectNode iraActivityJSON = createAssessmentActivity(maxUIID, order++, currentActivityPosition,
 		    iRAToolContentId, data.contentFolderID, groupingUIID, null, null, activityTitle);
 	    activities.add(iraActivityJSON);
@@ -248,7 +248,7 @@
 
 		    Long aetoolContentId = authoringService.createTblAssessmentToolContent(userDTO,
 			    applicationExerciseTitle, data.getText("boilerplate.ae.instructions"), null, true, false,
-			    false, true, true, questionsJSONArray);
+			    false, true, true, true, questionsJSONArray);
 		    activities.add(createAssessmentActivity(maxUIID, order++, currentActivityPosition, aetoolContentId,
 			    data.contentFolderID, groupingUIID, null, null, applicationExerciseTitle));
 		}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rfcd3028b8d92289519cc8471428df1deb028477a -r4733ba3c8f2a146e2fd1b5e456d6d66c185546a0
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision fcd3028b8d92289519cc8471428df1deb028477a)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 4733ba3c8f2a146e2fd1b5e456d6d66c185546a0)
@@ -3622,6 +3622,8 @@
 		JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
 	assessment.setAllowAnswerJustification(
 		JsonUtil.optBoolean(toolContentJSON, "allowAnswerJustification", Boolean.FALSE));
+	assessment.setAllowDiscussionSentiment(
+		JsonUtil.optBoolean(toolContentJSON, "allowDiscussionSentiment", Boolean.FALSE));
 
 	// submission deadline set in monitoring