Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 -r615d6c1aa82d59734e67f1995f30ff82cfe86a07
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision f0e4b56f3140e3387e9653b56c947132eb87a2a0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 615d6c1aa82d59734e67f1995f30ff82cfe86a07)
@@ -793,7 +793,8 @@
      */
     protected Long createAssessmentToolContent(UserDTO user, String title, String instructions,
 	    String reflectionInstructions, boolean selectLeaderToolOutput, boolean enableNumbering,
-	    boolean enableConfidenceLevels, boolean allowDiscloseAnswers, ArrayNode questions) throws IOException {
+	    boolean enableConfidenceLevels, boolean allowDiscloseAnswers, boolean allowAnswerJustification,
+	    ArrayNode questions) throws IOException {
 
 	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions, null, null,
 		user);
@@ -802,6 +803,8 @@
 	toolContentJSON.put("numbered", enableNumbering);
 	toolContentJSON.put("displaySummary", Boolean.TRUE);
 	toolContentJSON.put("allowDiscloseAnswers", allowDiscloseAnswers);
+	toolContentJSON.put("allowAnswerJustification", allowAnswerJustification);
+
 	toolContentJSON.set(RestTags.QUESTIONS, questions);
 
 	ArrayNode references = JsonNodeFactory.instance.arrayNode();
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
===================================================================
diff -u -rf379c87b9568703ac5feb17512f62df761b5f38b -r615d6c1aa82d59734e67f1995f30ff82cfe86a07
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision f379c87b9568703ac5feb17512f62df761b5f38b)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java	(.../TBLTemplateController.java)	(revision 615d6c1aa82d59734e67f1995f30ff82cfe86a07)
@@ -155,7 +155,7 @@
 
 	    Long iRAToolContentId = createAssessmentToolContent(userDTO, activityTitle,
 		    data.getText("boilerplate.ira.instructions"), null, false, true, data.confidenceLevelEnable, false,
-		    testQuestionsArray);
+		    false, testQuestionsArray);
 	    ObjectNode iraActivityJSON = createAssessmentActivity(maxUIID, order++, currentActivityPosition,
 		    iRAToolContentId, data.contentFolderID, groupingUIID, null, null, activityTitle);
 	    activities.add(iraActivityJSON);
@@ -228,7 +228,7 @@
 		    assessmentNumber++;
 		}
 		Long aetoolContentId = createAssessmentToolContent(userDTO, applicationExerciseTitle,
-			data.getText("boilerplate.ae.instructions"), null, true, false, false, true,
+			data.getText("boilerplate.ae.instructions"), null, true, false, false, 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 -rc393d2b92ec8c8bdc5916ac5f53e0adcaeee0ce3 -r615d6c1aa82d59734e67f1995f30ff82cfe86a07
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision c393d2b92ec8c8bdc5916ac5f53e0adcaeee0ce3)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 615d6c1aa82d59734e67f1995f30ff82cfe86a07)
@@ -3444,6 +3444,9 @@
 	assessment.setRelativeTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0));
 	assessment.setUseSelectLeaderToolOuput(
 		JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
+	assessment.setAllowAnswerJustification(
+		JsonUtil.optBoolean(toolContentJSON, "allowAnswerJustification", Boolean.FALSE));
+
 	// submission deadline set in monitoring
 
 	if (toolContentJSON.has("overallFeedback")) {