Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r026648a2ed7ec2ea16018905e87fd37717ed252d -r06f1e38880dbcfae6f115c7d9c9236fc4a377ce3
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 026648a2ed7ec2ea16018905e87fd37717ed252d)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 06f1e38880dbcfae6f115c7d9c9236fc4a377ce3)
@@ -407,6 +407,7 @@
 message.disclose.groups.answers = Please confirm that you want to disclose the groups' answers for this question. Note that after you confirm this, this action cannot be reversed. Are you sure you want to do this?
 message.disclose.all.correct.answers = Please confirm that you want to disclose ALL the correct answers for ALL questions. Note that after you confirm this, this action cannot be reversed. Are you sure you want to do this?
 message.disclose.all.groups.answers = Please confirm that you want to disclose the answers of ALL groups for ALL the questions. Note that after you confirm this, this action cannot be reversed. Are you sure you want to do this?
+message.disclose.correct.before.groups.answers = Usually other groups' answers are disclosed before correct answers so students can discuss their choices. Are you sure you want continue?
 label.monitoring.summary.completion = Completion
 label.monitoring.summary.completion.possible = Not started
 label.monitoring.summary.completion.started = In progress
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r262aeb03fd125991274edab2ce2f6dcb2b1b4714 -r06f1e38880dbcfae6f115c7d9c9236fc4a377ce3
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 262aeb03fd125991274edab2ce2f6dcb2b1b4714)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 06f1e38880dbcfae6f115c7d9c9236fc4a377ce3)
@@ -220,6 +220,12 @@
 	    	if (!confirm("<fmt:message key='message.disclose.correct.answers' />")) {
 	    		return;
 	    	};
+
+			// check if correct answers are disclosed before groups' answers
+			if (!groupsButton.is('.disabled') &&
+				!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+				return;
+			}
 	    	
 			$.ajax({
                 type: 'POST',
@@ -256,7 +262,12 @@
 	    	if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
 	    		return;
 	    	};
-
+	    	
+			if (!groupsAllButton.is('.disabled') &&
+				!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+				return;
+			}
+			
 	    	let nonDisclosedQuestions = $('option[correctDisclosed="false"]', questionUidSelect),
 	    		lastQuestionUid = nonDisclosedQuestions.last().val();	
 	    	nonDisclosedQuestions.each(function(index){
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -rf385b321deab184e83386b706ba1fe7c0aea9d06 -r06f1e38880dbcfae6f115c7d9c9236fc4a377ce3
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision f385b321deab184e83386b706ba1fe7c0aea9d06)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 06f1e38880dbcfae6f115c7d9c9236fc4a377ce3)
@@ -36,6 +36,13 @@
 												: "<fmt:message key='message.disclose.groups.answers' />")) {
 						return;
 					}
+
+					// check if correct answers are disclosed before groups' answers
+					if (isCorrectButton &&
+						!button.closest('.disclose-button-group').find('.disclose-groups-button').is('[disabled]') &&
+						!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+						return;
+					}
 					
 					discloseAnswers(button, resultsPane);
 				});
@@ -51,6 +58,12 @@
 						if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
 							return;
 						}
+
+						// check if correct answers are disclosed before groups' answers
+						if (!$('.disclose-all-groups-button', assessmentPane).is('[disabled]') &&
+							!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+							return;
+						}
 						
 						let nonDisclosedQuestions = $('.disclose-correct-button', assessmentPane).not('[disabled]'),
 			    			lastQuestionUid = nonDisclosedQuestions.last().closest('.disclose-button-group').attr('questionUid');