Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd87fa4703f8064bb3cdbda13875e1f9f01f09fff -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d87fa4703f8064bb3cdbda13875e1f9f01f09fff)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -100,6 +100,8 @@
 label.authoring.advance.gallery.walk.read.only.tooltip = Students will not be able to comment or rate other teams' work.
 monitoring.summary.gallery.walk.start = Start Gallery Walk
 monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk? You will not be able to return to collaboration phase.
+monitoring.summary.gallery.walk.skip = Skip Gallery Walk
+monitoring.summary.gallery.walk.skip.confirm = Are you sure you want to cancel Gallery Walk? Students will finish the activity as if Gallery Walk was not enabled.
 monitoring.summary.gallery.walk.finish = Finish Gallery Walk
 monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk? You will not be able to restart Gallery Walk.
 label.gallery.walk = Gallery Walk
@@ -157,4 +159,4 @@
 monitoring.summary.gallery.walk.cluster.view.button = View Gallery Walk groups of groups
 authoring.info.teacher.set.restriction = The teacher has set a restriction for submission from {0}.
 label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details.
-label.comment.textarea.tip = Type your comment here then click on the green tick
+label.comment.textarea.tip = Type your comment here then click on the green tick
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -r113c5a32c6fa73227ff541d4d197b1d6fe43a5b9 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 113c5a32c6fa73227ff541d4d197b1d6fe43a5b9)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -52,7 +52,13 @@
 import org.lamsfoundation.lams.rating.service.IRatingService;
 import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
-import org.lamsfoundation.lams.tool.*;
+import org.lamsfoundation.lams.tool.ToolCompletionStatus;
+import org.lamsfoundation.lams.tool.ToolContentManager;
+import org.lamsfoundation.lams.tool.ToolOutput;
+import org.lamsfoundation.lams.tool.ToolOutputDefinition;
+import org.lamsfoundation.lams.tool.ToolSession;
+import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
+import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants;
 import org.lamsfoundation.lams.tool.dokumaran.dao.DokumaranDAO;
 import org.lamsfoundation.lams.tool.dokumaran.dao.DokumaranSessionDAO;
@@ -75,10 +81,17 @@
 import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.security.InvalidParameterException;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -650,7 +663,7 @@
     }
 
     @Override
-    public void startGalleryWalk(long toolContentId) throws IOException {
+    public void startGalleryWalk(long toolContentId) {
 	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
 	if (!dokumaran.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
@@ -671,10 +684,34 @@
     }
 
     @Override
-    public void finishGalleryWalk(long toolContentId) throws IOException {
+    public void skipGalleryWalk(long toolContentId) {
 	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
 	if (!dokumaran.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is not enabled for Dokumaran with tool content ID "
+			    + toolContentId);
+	}
+	if (dokumaran.isGalleryWalkStarted()) {
+	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is already started for Dokumaran with tool content ID "
+			    + toolContentId);
+	}
+	if (dokumaran.isGalleryWalkFinished()) {
+	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is already finished for Dokumaran with tool content ID "
+			    + toolContentId);
+	}
+	dokumaran.setGalleryWalkEnabled(false);
+	dokumaranDao.saveObject(dokumaran);
+
+	sendGalleryWalkRefreshRequest(dokumaran);
+    }
+
+    @Override
+    public void finishGalleryWalk(long toolContentId) {
+	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
+	if (!dokumaran.isGalleryWalkEnabled()) {
+	    throw new IllegalArgumentException(
 		    "Can not finish Gallery Walk as it is not enabled for Dokumaran with tool content ID "
 			    + toolContentId);
 	}
@@ -685,7 +722,7 @@
     }
 
     @Override
-    public void enableGalleryWalkLearnerEdit(long toolContentId) throws IOException {
+    public void enableGalleryWalkLearnerEdit(long toolContentId) {
 	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
 	if (!dokumaran.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
===================================================================
diff -u -r305246a229ea020cd0677daa6fc7953772f7ed54 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision 305246a229ea020cd0677daa6fc7953772f7ed54)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -233,10 +233,12 @@
      */
     DokumaranUser getUser(Long uid);
 
-    void startGalleryWalk(long toolContentId) throws IOException;
+    void startGalleryWalk(long toolContentId);
 
-    void finishGalleryWalk(long toolContentId) throws IOException;
+    void skipGalleryWalk(long toolContentId);
 
+    void finishGalleryWalk(long toolContentId);
+
     void enableGalleryWalkLearnerEdit(long toolContentId) throws IOException;
 
     void assignSessionsForGalleryWalk(long toolContentId);
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
===================================================================
diff -u -r305246a229ea020cd0677daa6fc7953772f7ed54 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 305246a229ea020cd0677daa6fc7953772f7ed54)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -312,6 +312,15 @@
 	updateTimeLimit(toolContentId, 0, 0, null);
     }
 
+    @RequestMapping("/skipGalleryWalk")
+    @ResponseBody
+    @ResponseStatus(HttpStatus.OK)
+    private void skipGalleryWalk(HttpServletRequest request) throws IOException {
+	Long toolContentId = WebUtil.readLongParam(request, DokumaranConstants.ATTR_TOOL_CONTENT_ID, false);
+
+	dokumaranService.skipGalleryWalk(toolContentId);
+    }
+
     @RequestMapping("/finishGalleryWalk")
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ree80ff0990f0cd62c18b96ac0b46c60670627da2 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -60,6 +60,10 @@
 		margin-bottom: 20px;
 	}
 
+	.doku-monitoring-summary #gallery-walk-skip {
+		margin-top: 20px;
+	}
+
 	.doku-monitoring-summary #gallery-walk-rating-table th {
 		font-weight: bold;
 		font-style: normal;
@@ -372,6 +376,30 @@
 		});
 	}
 
+	function skipGalleryWalk(){
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.skip.confirm" /></spring:escapeBody>')) {
+			return;
+		}
+
+		$.ajax({
+			'url' : '<c:url value="/monitoring/skipGalleryWalk.do"/>',
+			'data': {
+				toolContentID : ${dokumaran.contentId}
+			},
+			'success' : function(){
+				<c:choose>
+				<c:when test="${isTbl}">
+				// reload current tab with Doku summary
+				loadTab(null, null, false);
+				</c:when>
+				<c:otherwise>
+				location.reload();
+				</c:otherwise>
+				</c:choose>
+			}
+		});
+	}
+
 	function finishGalleryWalk(){
 		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.finish.confirm" /></spring:escapeBody>')) {
 			return;
@@ -539,6 +567,13 @@
 
 				<br>
 
+				<button id="gallery-walk-skip" type="button"
+						class="btn btn-danger
+						        	   ${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'hidden'}"
+						onClick="javascript:skipGalleryWalk()">
+					<fmt:message key="monitoring.summary.gallery.walk.skip" />
+				</button>
+
 				<button id="gallery-walk-show-clusters" type="button"
 						class="btn btn-default
 							${dokumaran.galleryWalkClusterSize > 0 and dokumaran.galleryWalkStarted ? '' : 'hidden'}"
Index: lams_tool_doku/web/pages/monitoring/summary5.jsp
===================================================================
diff -u -ree80ff0990f0cd62c18b96ac0b46c60670627da2 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
+++ lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -58,6 +58,10 @@
 		margin-bottom: 20px;
 	}
 
+	.doku-monitoring-summary #gallery-walk-skip {
+		margin-top: 20px;
+	}
+
 	.doku-monitoring-summary #gallery-walk-rating-table th {
 		font-weight: bold;
 		font-style: normal;
@@ -327,6 +331,23 @@
 		});
 	}
 
+	function startGalleryWalk(){
+		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.skip.confirm" /></spring:escapeBody>')) {
+			return;
+		}
+
+		$.ajax({
+			'url' : '<c:url value="/monitoring/skipGalleryWalk.do"/>',
+			'data': {
+				toolContentID : ${dokumaran.contentId}
+			},
+			'success' : function(){
+				// reload current tab with Doku summary
+				loadTab(null, null, false);
+			}
+		});
+	}
+
 	function finishGalleryWalk(){
 		if (!confirm('<spring:escapeBody javaScriptEscape='true'><fmt:message key="monitoring.summary.gallery.walk.finish.confirm" /></spring:escapeBody>')) {
 			return;
@@ -487,6 +508,13 @@
 
 						<br>
 
+						<button id="gallery-walk-skip" type="button"
+								class="btn btn-danger
+						        	   ${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'd-none'}"
+								onClick="javascript:skipGalleryWalk()">
+							<fmt:message key="monitoring.summary.gallery.walk.skip" />
+						</button>
+
 						<button id="gallery-walk-show-clusters" type="button"
 								class="btn btn-primary
 						        	   ${dokumaran.galleryWalkClusterSize > 0 and dokumaran.galleryWalkStarted ? '' : 'd-none'}"
Index: lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r97b9227e4f759db2510bc57ef24be3a3ef714bfc -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 97b9227e4f759db2510bc57ef24be3a3ef714bfc)
+++ lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -109,6 +109,8 @@
 label.authoring.advance.gallery.walk.read.only.tooltip = Students will not be able to comment or rate other teams' work.
 monitoring.summary.gallery.walk.start = Start Gallery Walk
 monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk? You will not be able to return to collaboration phase.
+monitoring.summary.gallery.walk.skip = Skip Gallery Walk
+monitoring.summary.gallery.walk.skip.confirm = Are you sure you want to cancel Gallery Walk? Students will finish the activity as if Gallery Walk was not enabled.
 monitoring.summary.gallery.walk.finish = Finish Gallery Walk
 monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk? You will not be able to restart Gallery Walk.
 label.gallery.walk = Gallery Walk
@@ -130,4 +132,4 @@
 label.gallery.walk.state.started = started
 label.gallery.walk.state.finished = finished
 label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
-button.print = Print
+button.print = Print
\ No newline at end of file
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
===================================================================
diff -u -r065d718671157674c7665d3f6d68aab25eeabbe7 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java	(.../IMindmapService.java)	(revision 065d718671157674c7665d3f6d68aab25eeabbe7)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java	(.../IMindmapService.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -23,9 +23,7 @@
 
 package org.lamsfoundation.lams.tool.mindmap.service;
 
-import java.io.IOException;
-import java.util.List;
-
+import com.thoughtworks.xstream.XStream;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.mindmap.dto.MindmapDTO;
 import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
@@ -38,7 +36,8 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.MessageService;
 
-import com.thoughtworks.xstream.XStream;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * Defines the services available to the web layer from the Mindmap Service
@@ -141,9 +140,11 @@
 
     void createGalleryWalkRatingCriterion(long toolContentId);
 
-    void startGalleryWalk(long toolContentId) throws IOException;
+    void startGalleryWalk(long toolContentId);
 
-    void finishGalleryWalk(long toolContentId) throws IOException;
+    void skipGalleryWalk(long toolContentId);
 
+    void finishGalleryWalk(long toolContentId);
+
     void enableGalleryWalkLearnerEdit(long toolContentId) throws IOException;
 }
\ No newline at end of file
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
diff -u -r065d718671157674c7665d3f6d68aab25eeabbe7 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 065d718671157674c7665d3f6d68aab25eeabbe7)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -23,18 +23,11 @@
 
 package org.lamsfoundation.lams.tool.mindmap.service;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
+import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
@@ -86,11 +79,17 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.StaxDriver;
-import com.thoughtworks.xstream.security.AnyTypePermission;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * An implementation of the IMindmapService interface. As a requirement, all LAMS tool's service bean must implement
@@ -133,8 +132,9 @@
     @Override
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	if (MindmapService.logger.isDebugEnabled()) {
-	    MindmapService.logger.debug("entering method createToolSession:" + " toolSessionId = " + toolSessionId
-		    + " toolSessionName = " + toolSessionName + " toolContentId = " + toolContentId);
+	    MindmapService.logger.debug(
+		    "entering method createToolSession:" + " toolSessionId = " + toolSessionId + " toolSessionName = "
+			    + toolSessionName + " toolContentId = " + toolContentId);
 	}
 
 	MindmapSession session = new MindmapSession();
@@ -222,8 +222,9 @@
     public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
 
 	if (MindmapService.logger.isDebugEnabled()) {
-	    MindmapService.logger.debug("entering method copyToolContent:" + " fromContentId=" + fromContentId
-		    + " toContentId=" + toContentId);
+	    MindmapService.logger.debug(
+		    "entering method copyToolContent:" + " fromContentId=" + fromContentId + " toContentId="
+			    + toContentId);
 	}
 
 	if (toContentId == null) {
@@ -290,7 +291,7 @@
 	List childMindmapNodes = getMindmapNodeByParentId(fromMindmapNode.getNodeId(), fromContent.getUid());
 
 	if ((childMindmapNodes != null) && (childMindmapNodes.size() > 0)) {
-	    for (Iterator iterator = childMindmapNodes.iterator(); iterator.hasNext();) {
+	    for (Iterator iterator = childMindmapNodes.iterator(); iterator.hasNext(); ) {
 		MindmapNode childMindmapNode = (MindmapNode) iterator.next();
 		cloneMindmapNodesForRuntime(childMindmapNode, toMindmapNode, fromContent, toContent);
 	    }
@@ -342,7 +343,7 @@
 	List mindmapNodes = getMindmapNodeByParentId(rootNodeId, mindmapId);
 
 	if ((mindmapNodes != null) && (mindmapNodes.size() > 0)) {
-	    for (Iterator iterator = mindmapNodes.iterator(); iterator.hasNext();) {
+	    for (Iterator iterator = mindmapNodes.iterator(); iterator.hasNext(); ) {
 		MindmapNode mindmapNode = (MindmapNode) iterator.next();
 
 		String mindmapUserName = null;
@@ -361,8 +362,9 @@
 		    edit = mindmapUser.equals(mindmapNode.getUser()) ? 1 : 0;
 		}
 
-		NodeModel nodeModel = new NodeModel(new NodeConceptModel(mindmapNode.getUniqueId(),
-			mindmapNode.getText(), mindmapNode.getColor(), mindmapUserName, edit));
+		NodeModel nodeModel = new NodeModel(
+			new NodeConceptModel(mindmapNode.getUniqueId(), mindmapNode.getText(), mindmapNode.getColor(),
+				mindmapUserName, edit));
 
 		rootNodeModel.addNode(nodeModel);
 		getMindmapXMLFromDatabase(mindmapNode.getNodeId(), mindmapId, nodeModel, mindmapUser, isMonitor,
@@ -376,7 +378,7 @@
     @Override
     public void getChildMindmapNodes(List<NodeModel> branches, MindmapNode rootMindmapNode, MindmapUser mindmapUser,
 	    Mindmap mindmap, MindmapSession mindmapSession) {
-	for (Iterator<NodeModel> iterator = branches.iterator(); iterator.hasNext();) {
+	for (Iterator<NodeModel> iterator = branches.iterator(); iterator.hasNext(); ) {
 	    NodeModel nodeModel = iterator.next();
 	    NodeConceptModel nodeConceptModel = nodeModel.getConcept();
 	    // saving branch
@@ -438,14 +440,14 @@
     @SuppressWarnings("unchecked")
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
 	if (MindmapService.logger.isDebugEnabled()) {
-	    MindmapService.logger
-		    .debug("Removing Mindmap content for user ID " + userId + " and toolContentId " + toolContentId);
+	    MindmapService.logger.debug(
+		    "Removing Mindmap content for user ID " + userId + " and toolContentId " + toolContentId);
 	}
 
 	Mindmap mindmap = mindmapDAO.getByContentId(toolContentId);
 	if (mindmap == null) {
-	    MindmapService.logger
-		    .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    MindmapService.logger.warn(
+		    "Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
 	    return;
 	}
 
@@ -457,8 +459,8 @@
 	    for (MindmapNode node : nodes) {
 		List<MindmapNode> descendants = new LinkedList<>();
 		if ((node.getUser() != null) && node.getUser().getUserId().equals(userId.longValue())
-			&& !nodesToDelete.contains(node)
-			&& userOwnsChildrenNodes(node, userId.longValue(), descendants)) {
+			&& !nodesToDelete.contains(node) && userOwnsChildrenNodes(node, userId.longValue(),
+			descendants)) {
 		    // reverse so leafs are first and nodes closer to root are last
 		    descendants.add(node);
 		    nodesToDelete.addAll(descendants);
@@ -490,8 +492,9 @@
 	List<MindmapNode> children = mindmapNodeDAO.getMindmapNodeByParentIdMindmapIdSessionId(node.getNodeId(),
 		node.getMindmap().getUid(), node.getSession().getSessionId());
 	for (MindmapNode child : children) {
-	    boolean userOwnsChild = (child.getUser() != null) && child.getUser().getUserId().equals(userId)
-		    && userOwnsChildrenNodes(child, userId, descendants);
+	    boolean userOwnsChild =
+		    (child.getUser() != null) && child.getUser().getUserId().equals(userId) && userOwnsChildrenNodes(
+			    child, userId, descendants);
 	    if (!userOwnsChild) {
 		return false;
 	    }
@@ -504,9 +507,9 @@
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      *
      * @throws DataMissingException
-     *             if no tool content matches the toolSessionId
+     * 	if no tool content matches the toolSessionId
      * @throws ToolException
-     *             if any other error occurs
+     * 	if any other error occurs
      */
     @Override
     public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
@@ -526,8 +529,9 @@
 
 	    String rootMindmapUser = getMindmapMessageService().getMessage("node.instructor.label");
 
-	    NodeModel rootNodeModel = new NodeModel(new NodeConceptModel(rootMindmapNode.getUniqueId(),
-		    rootMindmapNode.getText(), rootMindmapNode.getColor(), rootMindmapUser, 1));
+	    NodeModel rootNodeModel = new NodeModel(
+		    new NodeConceptModel(rootMindmapNode.getUniqueId(), rootMindmapNode.getText(),
+			    rootMindmapNode.getColor(), rootMindmapUser, 1));
 	    NodeModel currentNodeModel = getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(), mindmap.getUid(),
 		    rootNodeModel, null, false, false, false);
 
@@ -550,7 +554,7 @@
      * Import the XML fragment for the tool's content, along with any files needed for the content.
      *
      * @throws ToolException
-     *             if any other error occurs
+     * 	if any other error occurs
      */
     @Override
     public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
@@ -741,7 +745,8 @@
     @Override
     public MindmapUser getUserByLoginAndSessionId(String login, long toolSessionId) {
 	List<User> user = mindmapUserDAO.findByProperty(User.class, "login", login);
-	return user.isEmpty() ? null
+	return user.isEmpty()
+		? null
 		: mindmapUserDAO.getByUserIdAndSessionId(user.get(0).getUserId().longValue(), toolSessionId);
     }
 
@@ -1015,7 +1020,8 @@
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
 	}
 
-	return new ToolCompletionStatus(learner.isFinishedActivity() ? ToolCompletionStatus.ACTIVITY_COMPLETED
+	return new ToolCompletionStatus(learner.isFinishedActivity()
+		? ToolCompletionStatus.ACTIVITY_COMPLETED
 		: ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
     }
     // ****************** REST methods *************************
@@ -1118,8 +1124,8 @@
 	}
 
 	if (criteria.isEmpty()) {
-	    ToolActivityRatingCriteria criterion = (ToolActivityRatingCriteria) RatingCriteria
-		    .getRatingCriteriaInstance(RatingCriteria.TOOL_ACTIVITY_CRITERIA_TYPE);
+	    ToolActivityRatingCriteria criterion = (ToolActivityRatingCriteria) RatingCriteria.getRatingCriteriaInstance(
+		    RatingCriteria.TOOL_ACTIVITY_CRITERIA_TYPE);
 	    criterion.setTitle(mindmapMessageService.getMessage("label.pad.rating.title"));
 	    criterion.setOrderId(1);
 	    criterion.setRatingStyle(RatingCriteria.RATING_STYLE_STAR);
@@ -1132,7 +1138,7 @@
     }
 
     @Override
-    public void startGalleryWalk(long toolContentId) throws IOException {
+    public void startGalleryWalk(long toolContentId) {
 	Mindmap mindmap = getMindmapByContentId(toolContentId);
 	if (!mindmap.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
@@ -1151,10 +1157,33 @@
     }
 
     @Override
-    public void finishGalleryWalk(long toolContentId) throws IOException {
+    public void skipGalleryWalk(long toolContentId) {
 	Mindmap mindmap = getMindmapByContentId(toolContentId);
 	if (!mindmap.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is not enabled for Mindmap with tool content ID " + toolContentId);
+	}
+	if (mindmap.isGalleryWalkStarted()) {
+	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is already started for Mindmap with tool content ID "
+			    + toolContentId);
+	}
+	if (mindmap.isGalleryWalkFinished()) {
+	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is already finished for Mindmap with tool content ID "
+			    + toolContentId);
+	}
+	mindmap.setGalleryWalkEnabled(false);
+	mindmapDAO.update(mindmap);
+
+	sendGalleryWalkRefreshRequest(mindmap);
+    }
+
+    @Override
+    public void finishGalleryWalk(long toolContentId) {
+	Mindmap mindmap = getMindmapByContentId(toolContentId);
+	if (!mindmap.isGalleryWalkEnabled()) {
+	    throw new IllegalArgumentException(
 		    "Can not finish Gallery Walk as it is not enabled for Mindmap with tool content ID "
 			    + toolContentId);
 	}
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java
===================================================================
diff -u -r12fea6ceba38f9359f46c1a7ae37793b764f712f -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 12fea6ceba38f9359f46c1a7ae37793b764f712f)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -23,14 +23,6 @@
 
 package org.lamsfoundation.lams.tool.mindmap.web.controller;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.TimeZone;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -52,6 +44,13 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.Date;
+import java.util.TimeZone;
+
 /**
  * @author Ruslan Kazakov
  */
@@ -189,6 +188,13 @@
 	mindmapService.startGalleryWalk(toolContentId);
     }
 
+    @RequestMapping("/skipGalleryWalk")
+    public void skipGalleryWalk(HttpServletRequest request) throws IOException {
+	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, false);
+
+	mindmapService.skipGalleryWalk(toolContentId);
+    }
+
     @RequestMapping("/finishGalleryWalk")
     public void finishGalleryWalk(HttpServletRequest request) throws IOException {
 	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, false);
@@ -203,4 +209,4 @@
 	mindmapService.enableGalleryWalkLearnerEdit(toolContentId);
     }
 
-}
+}
\ No newline at end of file
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r8efca897f0ce254dfca5b8c0cf2f8d87b01945e5 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8efca897f0ce254dfca5b8c0cf2f8d87b01945e5)
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -21,6 +21,10 @@
 		margin-top: 20px;
 		margin-bottom: 20px;
 	}
+
+	#gallery-walk-skip {
+		margin-top: 20px;
+	}
 	
 	#gallery-walk-rating-table th {
 		font-weight: bold;
@@ -112,7 +116,23 @@
 			}
 		});
 	}
-	
+
+	function skipGalleryWalk(){
+		if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.summary.gallery.walk.skip.confirm" /></spring:escapeBody>')) {
+			return;
+		}
+
+		$.ajax({
+			'url' : '<c:url value="/monitoring/skipGalleryWalk.do"/>',
+			'data': {
+				toolContentID : ${dto.toolContentId}
+			},
+			'success' : function(){
+				location.reload();
+			}
+		});
+	}
+
 	function finishGalleryWalk(){
 		if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.summary.gallery.walk.finish.confirm" /></spring:escapeBody>')) {
 			return;
@@ -202,7 +222,14 @@
 			</button>
 			
 			<br>
-						
+
+			<button id="gallery-walk-skip" type="button"
+					  class="btn btn-danger
+							   ${not mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'hidden'}"
+					  onClick="javascript:skipGalleryWalk()">
+				  <fmt:message key="monitoring.summary.gallery.walk.skip" />
+			</button>
+
 			<button id="gallery-walk-learner-edit" type="button"
 			        class="btn btn-default ${not mindmapDTO.galleryWalkEditEnabled and (mindmapDTO.galleryWalkStarted or mindmapDTO.galleryWalkFinished) ? '' : 'hidden'}"
 			        onClick="javascript:enableGalleryWalkLearnerEdit()">
Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re23d6d2510df4f92779e180556b4f0c21402898e -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e23d6d2510df4f92779e180556b4f0c21402898e)
+++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -91,6 +91,8 @@
 label.authoring.advance.gallery.walk.read.only.tooltip = Students will not be able to comment or rate other teams' work.
 monitoring.summary.gallery.walk.start = Start Gallery Walk
 monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk? You will not be able to return to collaboration phase.
+monitoring.summary.gallery.walk.skip = Skip Gallery Walk
+monitoring.summary.gallery.walk.skip.confirm = Are you sure you want to cancel Gallery Walk? Students will finish the activity as if Gallery Walk was not enabled.
 monitoring.summary.gallery.walk.finish = Finish Gallery Walk
 monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk? You will not be able to restart Gallery Walk.
 label.gallery.walk = Gallery Walk
@@ -141,4 +143,4 @@
 monitor.summary.date.restriction.set = Date restriction has been set
 monitor.summary.date.restriction.removed = Date restriction has been removed
 authoring.info.teacher.set.restriction = The teacher has set a restriction for submission from {0}.
-label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details.
+label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details.
\ No newline at end of file
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java
===================================================================
diff -u -rfc1e0b9d9e66313d54b4f1fad291a8e9d0054767 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java	(.../IWhiteboardService.java)	(revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java	(.../IWhiteboardService.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -23,10 +23,6 @@
 
 package org.lamsfoundation.lams.tool.whiteboard.service;
 
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.List;
-
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.service.ICommonToolService;
@@ -38,6 +34,10 @@
 import org.lamsfoundation.lams.tool.whiteboard.model.WhiteboardUser;
 import org.lamsfoundation.lams.usermanagement.User;
 
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.List;
+
 public interface IWhiteboardService extends ICommonToolService {
 
     /**
@@ -127,10 +127,12 @@
      */
     WhiteboardUser getUser(Long uid);
 
-    void startGalleryWalk(long toolContentId) throws IOException;
+    void startGalleryWalk(long toolContentId);
 
-    void finishGalleryWalk(long toolContentId) throws IOException;
+    void skipGalleryWalk(long toolContentId);
 
+    void finishGalleryWalk(long toolContentId);
+
     void enableGalleryWalkLearnerEdit(long toolContentId) throws IOException;
 
     void changeLeaderForGroup(long toolSessionId, long leaderUserId);
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java
===================================================================
diff -u -r113c5a32c6fa73227ff541d4d197b1d6fe43a5b9 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision 113c5a32c6fa73227ff541d4d197b1d6fe43a5b9)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -490,7 +490,7 @@
     }
 
     @Override
-    public void startGalleryWalk(long toolContentId) throws IOException {
+    public void startGalleryWalk(long toolContentId) {
 	Whiteboard whiteboard = getWhiteboardByContentId(toolContentId);
 	if (!whiteboard.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
@@ -509,10 +509,34 @@
     }
 
     @Override
-    public void finishGalleryWalk(long toolContentId) throws IOException {
+    public void skipGalleryWalk(long toolContentId) {
 	Whiteboard whiteboard = getWhiteboardByContentId(toolContentId);
 	if (!whiteboard.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is not enabled for Whiteboard with tool content ID "
+			    + toolContentId);
+	}
+	if (whiteboard.isGalleryWalkStarted()) {
+	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is already started for Whiteboard with tool content ID "
+			    + toolContentId);
+	}
+	if (whiteboard.isGalleryWalkFinished()) {
+	    throw new IllegalArgumentException(
+		    "Can not skip Gallery Walk as it is already finished for Whiteboard with tool content ID "
+			    + toolContentId);
+	}
+	whiteboard.setGalleryWalkEnabled(false);
+	whiteboardDao.update(whiteboard);
+
+	sendGalleryWalkRefreshRequest(whiteboard);
+    }
+
+    @Override
+    public void finishGalleryWalk(long toolContentId) {
+	Whiteboard whiteboard = getWhiteboardByContentId(toolContentId);
+	if (!whiteboard.isGalleryWalkEnabled()) {
+	    throw new IllegalArgumentException(
 		    "Can not finish Gallery Walk as it is not enabled for Whiteboard with tool content ID "
 			    + toolContentId);
 	}
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java
===================================================================
diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -23,28 +23,9 @@
 
 package org.lamsfoundation.lams.tool.whiteboard.web.controller;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidParameterException;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.TreeMap;
-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.log4j.Logger;
 import org.lamsfoundation.lams.flux.FluxRegistry;
 import org.lamsfoundation.lams.gradebook.GradebookUserActivity;
@@ -65,7 +46,12 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.*;
+import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.DateUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -80,9 +66,26 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-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.security.InvalidParameterException;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/monitoring")
@@ -195,10 +198,12 @@
 	// identify sorting type
 	int sorting = LEARNER_MARKS_SORTING_FIRST_NAME_ASC;
 	if (isSortFirstName != null) {
-	    sorting = isSortFirstName.equals(1) ? LEARNER_MARKS_SORTING_FIRST_NAME_DESC
+	    sorting = isSortFirstName.equals(1)
+		    ? LEARNER_MARKS_SORTING_FIRST_NAME_DESC
 		    : LEARNER_MARKS_SORTING_FIRST_NAME_ASC;
 	} else if (isSortLastName != null) {
-	    sorting = isSortLastName.equals(1) ? LEARNER_MARKS_SORTING_LAST_NAME_DESC
+	    sorting = isSortLastName.equals(1)
+		    ? LEARNER_MARKS_SORTING_LAST_NAME_DESC
 		    : LEARNER_MARKS_SORTING_LAST_NAME_ASC;
 	}
 
@@ -223,9 +228,8 @@
 	    responsedata.put("total_rows", users.size());
 
 	    ToolSession toolSession = toolService.getToolSessionById(toolSessionId);
-	    Map<Integer, Double> gradebookUserActivities = gradebookService
-		    .getGradebookUserActivities(toolSession.getToolActivity().getActivityId()).stream()
-		    .filter(g -> g.getMark() != null)
+	    Map<Integer, Double> gradebookUserActivities = gradebookService.getGradebookUserActivities(
+			    toolSession.getToolActivity().getActivityId()).stream().filter(g -> g.getMark() != null)
 		    .collect(Collectors.toMap(g -> g.getLearner().getUserId(), GradebookUserActivity::getMark));
 
 	    WhiteboardUser leader = users.get(0).getSession().getGroupLeader();
@@ -286,6 +290,13 @@
 	whiteboardService.startGalleryWalk(toolContentId);
     }
 
+    @RequestMapping("/skipGalleryWalk")
+    private void skipGalleryWalk(HttpServletRequest request) throws IOException {
+	Long toolContentId = WebUtil.readLongParam(request, WhiteboardConstants.ATTR_TOOL_CONTENT_ID, false);
+
+	whiteboardService.skipGalleryWalk(toolContentId);
+    }
+
     @RequestMapping("/finishGalleryWalk")
     private void finishGalleryWalk(HttpServletRequest request) throws IOException {
 	Long toolContentId = WebUtil.readLongParam(request, WhiteboardConstants.ATTR_TOOL_CONTENT_ID, false);
@@ -347,8 +358,8 @@
 	if (grouping != null) {
 	    Set<Group> groups = grouping.getGroups();
 	    for (Group group : groups) {
-		if (!group.getUsers().isEmpty()
-			&& group.getGroupName().toLowerCase().contains(searchString.toLowerCase())) {
+		if (!group.getUsers().isEmpty() && group.getGroupName().toLowerCase()
+			.contains(searchString.toLowerCase())) {
 		    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		    groupJSON.put("label", groupLabel + group.getGroupName() + "\"");
 		    groupJSON.put("value", "group-" + group.getGroupId());
Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rc9298df4709c3246e59314283ae580cc159cd275 -r8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d
--- lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c9298df4709c3246e59314283ae580cc159cd275)
+++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8c6ccd715c5bbd55bacc9a0f112d2ee9a870aa3d)
@@ -61,6 +61,10 @@
 		margin-bottom: 20px;
 	}
 
+	.whiteboard-monitoring-summary #gallery-walk-skip {
+		margin-top: 20px;
+	}
+
 	.whiteboard-monitoring-summary #gallery-walk-rating-table th {
 		font-weight: bold;
 		font-style: normal;
@@ -379,6 +383,30 @@
 		});
 	}
 
+	function skipGalleryWalk(){
+        if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.summary.gallery.walk.skip.confirm" /></spring:escapeBody>')) {
+			return;
+		}
+
+		$.ajax({
+			'url' : '<c:url value="/monitoring/skipGalleryWalk.do"/>',
+			'data': {
+				toolContentID : ${whiteboard.contentId}
+			},
+			'success' : function(){
+				<c:choose>
+				<c:when test="${isTbl}">
+				// reload current tab with Whiteboard summary
+				loadTab(null, null, false);
+				</c:when>
+				<c:otherwise>
+				location.reload();
+				</c:otherwise>
+				</c:choose>
+			}
+		});
+	}
+
 	function finishGalleryWalk(){
 		if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.summary.gallery.walk.finish.confirm" /></spring:escapeBody>')) {
 			return;
@@ -539,6 +567,13 @@
 
 				<br>
 
+				<button id="gallery-walk-skip" type="button"
+						class="btn btn-danger
+				        	   ${not whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished ? '' : 'hidden'}"
+						onClick="javascript:skipGalleryWalk()">
+					<fmt:message key="monitoring.summary.gallery.walk.skip" />
+				</button>
+
 				<button id="gallery-walk-learner-edit" type="button"
 						class="btn btn-default ${not whiteboard.galleryWalkEditEnabled and (whiteboard.galleryWalkStarted or whiteboard.galleryWalkFinished) ? '' : 'hidden'}"
 						onClick="javascript:enableGalleryWalkLearnerEdit()">