Index: lams_admin/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r56ec8d9806c22331d9483e197f0e270b638471be -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 56ec8d9806c22331d9483e197f0e270b638471be)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_gradebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_learning/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r56ec8d9806c22331d9483e197f0e270b638471be -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 56ec8d9806c22331d9483e197f0e270b638471be)
+++ lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_learning/web/includes/javascript/learnerPage.js
===================================================================
diff -u -rff5898738229a10e41410750ca5c082e1a5eb770 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_learning/web/includes/javascript/learnerPage.js	(.../learnerPage.js)	(revision ff5898738229a10e41410750ca5c082e1a5eb770)
+++ lams_learning/web/includes/javascript/learnerPage.js	(.../learnerPage.js)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -88,91 +88,48 @@
 }
 
 function initCommandWebsocket(lessonId) {
-    let commandWebsocketInitTime = Date.now(),
-        commandWebsocket = null,
-        commandWebsocketPingTimeout = null,
-        commandWebsocketPingFunc = null,
-        commandWebsocketReconnectAttempts = 0,
-        commandWebsocketHookTrigger = null,
-        commandWebsocketHook = null;
-
-    commandWebsocketPingFunc = function (skipPing) {
-        if (commandWebsocket.readyState == commandWebsocket.CLOSING
-            || commandWebsocket.readyState == commandWebsocket.CLOSED) {
-            return;
-        }
-
-        // check and ping every 3 minutes
-        commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3 * 60 * 1000);
-        // initial set up does not send ping
-        if (!skipPing) {
-            commandWebsocket.send("ping");
-        }
-    };
-
-    // it is not an obvious place to init the websocket, but we need lesson ID
-    commandWebsocket = new WebSocket(LAMS_URL .replace('http', 'ws')
-        + 'learning/commandWebsocket?lessonID=' + lessonId);
-
-    commandWebsocket.onclose = function (e) {
-        // check reason and whether the close did not happen immediately after websocket creation
-        // (possible access denied, user logged out?)
-        if (e.code === 1006 &&
-            Date.now() - commandWebsocketInitTime > 1000 &&
-            commandWebsocketReconnectAttempts < 20) {
-            commandWebsocketReconnectAttempts++;
-            // maybe iPad went into sleep mode?
-            // we need this websocket working, so init it again after delay
-            setTimeout(initCommandWebsocket, 3000);
-        }
-    };
-
-    // set up timer for the first time
-    commandWebsocketPingFunc(true);
-
-    // when the server pushes new commands
-    commandWebsocket.onmessage = function (e) {
-        // read JSON object
-        var command = JSON.parse(e.data);
-        if (command.message) {
-            // some tools implement autosave feature
-            // if it is such a tool, trigger it
-            if (command.message === 'autosave') {
-                // the name of this function is same in all tools
-                if (typeof learnerAutosave == 'function') {
-                    learnerAutosave(true);
+    initWebsocket('commandWebsocket', LAMS_URL.replace('http', 'ws')
+        + 'learning/commandWebsocket?lessonID=' + lessonId,
+        function (e) {
+            // read JSON object
+            var command = JSON.parse(e.data);
+            if (command.message) {
+                // some tools implement autosave feature
+                // if it is such a tool, trigger it
+                if (command.message === 'autosave') {
+                    // the name of this function is same in all tools
+                    if (typeof learnerAutosave == 'function') {
+                        learnerAutosave(true);
+                    }
+                } else {
+                    alert(command.message);
                 }
-            } else {
-                showToast(command.message);
             }
-        }
 
-        // if learner's currently displayed page has hookTrigger same as in the JSON
-        // then a function also defined on that page will run
-        if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
-            && typeof commandWebsocketHook === 'function') {
-            commandWebsocketHook(command.hookParams);
-        }
+            // if learner's currently displayed page has hookTrigger same as in the JSON
+            // then a function also defined on that page will run
+            if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+                && typeof commandWebsocketHook === 'function') {
+                commandWebsocketHook(command.hookParams);
+            }
 
-        if (command.redirectURL) {
-            window.location.href = command.redirectURL;
-        }
+            if (command.redirectURL) {
+                window.location.href = command.redirectURL;
+            }
 
-        if (command.discussion) {
-            var discussionCommand = $('#discussion-sentiment-command');
-            if (discussionCommand.length === 0) {
-                discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+            if (command.discussion) {
+                var discussionCommand = $('#discussion-sentiment-command');
+                if (discussionCommand.length === 0) {
+                    discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+                }
+                discussionCommand.load(LAMS_URL + "learning/discussionSentiment/" + command.discussion + ".do", {
+                    lessonId : lessonId
+                });
             }
-            discussionCommand.load(LAMS_URL + "learning/discussionSentiment/" + command.discussion + ".do", {
-                lessonId: lessonId
-            });
-        }
+            // reset ping timer
+            websocketPing('commandWebsocket', true);
+        });
 
-        // reset ping timer
-        clearTimeout(commandWebsocketPingTimeout);
-        commandWebsocketPingFunc(true);
-    };
-
     // check if there is a running discussion; if so, a websocket command will come to display the widget
     $.ajax({
         url: LAMS_URL + "learning/discussionSentiment/checkLearner.do",
Index: lams_monitoring/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -rb31ac55045b51d2098eb4b66772e3d6e2a5a89b6 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision b31ac55045b51d2098eb4b66772e3d6e2a5a89b6)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -7,7 +7,7 @@
 <%-- If the view is horizontal or vertical --%>
 <c:set var="horizontal" value="${sessionMap.learningView=='horizontal'}" />
 <%-- To display A) B) C) in answer options instead of 1) 2) 3) --%>
-<c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
+<c:set var="ordinal"><spring:escapeBody javaScriptEscape='true'><fmt:message key="label.authoring.basic.answeroption.ordinal"/></spring:escapeBody></c:set>
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
 <div id="addRecordDiv">
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -rb31ac55045b51d2098eb4b66772e3d6e2a5a89b6 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b31ac55045b51d2098eb4b66772e3d6e2a5a89b6)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -64,15 +64,10 @@
 		var UPLOAD_FILE_MAX_SIZE = '${UPLOAD_FILE_MAX_SIZE}';
 	 	var EXE_STRING = '${EXE_STRING}';
 	 	
-		<fmt:message key="errors.maxfilesize" var="LABEL_MAX_FILE_SIZE_VAR"><param>{0}</param></fmt:message>
-		var LABEL_MAX_FILE_SIZE = '<c:out value="${LABEL_MAX_FILE_SIZE_VAR}" />';
-		
-		<fmt:message key="error.attachment.executable" var="LABEL_NOT_ALLOWED_EXE_VAR"/>
-		var LABEL_NOT_ALLOWED_EXE = '<c:out value="${LABEL_NOT_ALLOWED_EXE_VAR}" />';	
+		var LABEL_MAX_FILE_SIZE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message></spring:escapeBody>';
+		var LABEL_NOT_ALLOWED_EXE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.executable"/></spring:escapeBody>';
+		var LABEL_NOT_ALLOWED_FORMAT = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.must.be.image"/></spring:escapeBody>';
 
-		<fmt:message key="error.attachment.must.be.image" var="LABEL_NOT_ALLOWED_FORMAT_VAR"/>
-		var LABEL_NOT_ALLOWED_FORMAT = '<c:out value="${LABEL_NOT_ALLOWED_FORMAT_VAR}" />';	
-
 		$(document).on('load', function(){
 			init();
 		});
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
diff -u -rb31ac55045b51d2098eb4b66772e3d6e2a5a89b6 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision b31ac55045b51d2098eb4b66772e3d6e2a5a89b6)
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -2,222 +2,223 @@
 <c:if test="${not empty param.sessionMapID}"><c:set var="sessionMapID" value="${param.sessionMapID}" /></c:if>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:if test="${empty recordList}">
-	<%-- In some cases record list is passed as an attribute, in other - in session map. --%>
-	<c:set var="recordList" value="${sessionMap.recordList}" />
+    <%-- In some cases record list is passed as an attribute, in other - in session map. --%>
+    <c:set var="recordList" value="${sessionMap.recordList}" />
 </c:if>
 <%-- This page modifies its content depending on the page it was included from. --%>
 <c:if test="${empty includeMode}"><c:set var="includeMode" value="learning" /></c:if>
 <c:set var="daco" value="${sessionMap.daco}" />
 <c:set var="questionSummaries" value="${sessionMap.questionSummaries}" />
-<c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
+<c:set var="ordinal"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></spring:escapeBody></c:set>
+
 <c:set var="userRecordCount" value="${includeMode=='monitoring' ? sessionMap.recordCount : fn:length(recordList)}" />
 <c:set var="groupRecordCount" value="${sessionMap.totalRecordCount}" />
 
 <div id="questionSummariesDiv">
 
-<!--  summary panel  -->
-	<div class="card-subheader">
-		<fmt:message key="label.learning.tableheader.questions" />
-	</div>
+    <!--  summary panel  -->
+    <div class="card-subheader">
+        <fmt:message key="label.learning.tableheader.questions" />
+    </div>
 
-	<div class="ltable table-sm" id="summaryTable">
-		<div class="row table-active">
-			<div class="col-6 offset-6 singleSummaryCell"><fmt:message key="label.learning.tableheader.summary" /></div>
-		</div>
-		
-		<div class="row table-active">
-				<div class="col-3 offset-6 singleSummaryCell">
-					<c:choose>
-						<c:when test="${empty userFullName}">
-							<fmt:message key="label.learning.tableheader.summary.learner" />
-						</c:when>
-						<c:otherwise>
-							<c:out value="${userFullName}" escapeXml="true"/>
-						</c:otherwise>
-					</c:choose>
-				</div>
-				<div class="col-3 singleSummaryCell"><fmt:message key="label.learning.tableheader.summary.group" /></div>
-		</div>
-		
-		<div class="row table-active">
-			<div class="col-6">
-				<fmt:message key="label.learning.heading.recordcount" />
-			</div>
-			<div class="col-3 singleSummaryCell">
-				${userRecordCount }
-			</div>
-			<div class="col-3 singleSummaryCell">
-				${groupRecordCount }
-			</div>
-		</div>
-	</div>
-	
-	<div class="ltable table-striped table-sm no-header" id="summaryTable">
-		<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
-			<c:set var="questionSummary" value="${questionSummaries[questionStatus.index]}" />
-			<div class="row">
-				<div class="col-6">
-					<!-- <div class="bigNumber">${questionStatus.index+1}</div> -->
-					<c:out value="${question.description}" escapeXml="false"/>
-					
-					<div class="hint">
-						<c:choose>
-							<c:when test="${question.summary==1}">
-								<fmt:message key="label.common.summary.sum" /> 
-							</c:when>
-							<c:when test="${question.summary==2}">
-								<fmt:message key="label.common.summary.average" /> 
-							</c:when>
-							<c:when test="${question.summary==3}">
-								<fmt:message key="label.common.summary.count" /> 
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="label.common.summary.none" /> 
-							</c:otherwise>
-						</c:choose>
-					</div>
-				</div>
-				
-				<c:choose>
-					<c:when test="${question.type==3 && not empty question.summary}">
-						<c:choose>
-							<%-- Part of the content is displayed depending on the summary type --%>
-							<c:when test="${question.summary==1 || question.summary==2}">
-								<c:choose>
-									<%-- If no records were provided --%>
-									<c:when test="${(question.summary==1 and empty questionSummary.userSummary[0].sum) 
+    <div class="ltable table-sm" id="summaryTable">
+        <div class="row table-active">
+            <div class="col-6 offset-6 singleSummaryCell"><fmt:message key="label.learning.tableheader.summary" /></div>
+        </div>
+
+        <div class="row table-active">
+            <div class="col-3 offset-6 singleSummaryCell">
+                <c:choose>
+                    <c:when test="${empty userFullName}">
+                        <fmt:message key="label.learning.tableheader.summary.learner" />
+                    </c:when>
+                    <c:otherwise>
+                        <c:out value="${userFullName}" escapeXml="true"/>
+                    </c:otherwise>
+                </c:choose>
+            </div>
+            <div class="col-3 singleSummaryCell"><fmt:message key="label.learning.tableheader.summary.group" /></div>
+        </div>
+
+        <div class="row table-active">
+            <div class="col-6">
+                <fmt:message key="label.learning.heading.recordcount" />
+            </div>
+            <div class="col-3 singleSummaryCell">
+                ${userRecordCount }
+            </div>
+            <div class="col-3 singleSummaryCell">
+                ${groupRecordCount }
+            </div>
+        </div>
+    </div>
+
+    <div class="ltable table-striped table-sm no-header" id="summaryTable">
+        <c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
+            <c:set var="questionSummary" value="${questionSummaries[questionStatus.index]}" />
+            <div class="row">
+                <div class="col-6">
+                    <!-- <div class="bigNumber">${questionStatus.index+1}</div> -->
+                    <c:out value="${question.description}" escapeXml="false"/>
+
+                    <div class="hint">
+                        <c:choose>
+                            <c:when test="${question.summary==1}">
+                                <fmt:message key="label.common.summary.sum" />
+                            </c:when>
+                            <c:when test="${question.summary==2}">
+                                <fmt:message key="label.common.summary.average" />
+                            </c:when>
+                            <c:when test="${question.summary==3}">
+                                <fmt:message key="label.common.summary.count" />
+                            </c:when>
+                            <c:otherwise>
+                                <fmt:message key="label.common.summary.none" />
+                            </c:otherwise>
+                        </c:choose>
+                    </div>
+                </div>
+
+                <c:choose>
+                    <c:when test="${question.type==3 && not empty question.summary}">
+                        <c:choose>
+                            <%-- Part of the content is displayed depending on the summary type --%>
+                            <c:when test="${question.summary==1 || question.summary==2}">
+                                <c:choose>
+                                    <%-- If no records were provided --%>
+                                    <c:when test="${(question.summary==1 and empty questionSummary.userSummary[0].sum)
 												 || (question.summary==2 and empty questionSummary.userSummary[0].average)}">
-										<div class="col-3 singleSummaryCell hint">
-											<fmt:message key="label.learning.heading.norecords" />
-										</div>
-										<div class="col-3 singleSummaryCell hint">
-											<fmt:message key="label.learning.heading.norecords" />
-										</div>
-									</c:when>
-									
-									<c:otherwise>
-										<%-- First column shows the summaries for the learner,
-											second one for the whole group (session) --%>
-										<div class="col-3 singleSummaryCell">
-											<c:choose>
-												<c:when test="${question.summary==1}">
-													${questionSummary.userSummary[0].sum}
-												</c:when>
-												<c:otherwise>
-													${questionSummary.userSummary[0].average}
-												</c:otherwise>
-											</c:choose>
-										</div>
-										<div class="col-3 singleSummaryCell">
-											<c:choose>
-												<c:when test="${question.summary==1}">
-													${questionSummary.groupSummary[0].sum}
-												</c:when>
-												<c:otherwise>
-													${questionSummary.groupSummary[0].average}
-												</c:otherwise>
-											</c:choose>
-										</div>
-									</c:otherwise>
-								</c:choose>
-							</c:when>
-							
-							<c:when test="${question.summary==3}">
-								<div class="col-3">
-									<div class="ltable no-header alternative-color-inner-table">
-										<c:forEach var="singleAnswer" items="${questionSummary.userSummary}" begin="1">	
-											<div class="row">
-												<c:choose>
-													<c:when test="${empty singleAnswer.answer}">
-														<div class="hint" style="width: 20px;">
-															<fmt:message key="label.learning.summary.emptyanswer" />:
-														</div>
-													</c:when>
-													<c:otherwise>
-														<div style="width: 20px;">
-															${singleAnswer.answer}:
-														</div>
-													</c:otherwise>
-												</c:choose>
-												<div class="col">
-													${singleAnswer.count}
-												</div>
-											</div>
-										</c:forEach>
-									</div>
-								</div>
-								<div class="col-3">
-									<div class="ltable no-header alternative-color-inner-table">
-										<c:forEach var="singleAnswer" items="${questionSummary.groupSummary}" begin="1">	
-											<div class="row">
-												<div style="width: 20px;">
-													${singleAnswer.answer}:
-												</div>
-												<div class="col">
-													${singleAnswer.count}
-												</div>
-											</div>
-										</c:forEach>
-									</div>
-								</div>
-							</c:when>
-						</c:choose>
-					</c:when>
-					
-					<c:when test="${(question.type==7 || question.type==8 || question.type==9)  && not empty question.summary}">
-						<div class="col-3 text-center">
-								<c:forEach var="singleAnswer" items="${questionSummary.userSummary}">
-									<div>
+                                        <div class="col-3 singleSummaryCell hint">
+                                            <fmt:message key="label.learning.heading.norecords" />
+                                        </div>
+                                        <div class="col-3 singleSummaryCell hint">
+                                            <fmt:message key="label.learning.heading.norecords" />
+                                        </div>
+                                    </c:when>
+
+                                    <c:otherwise>
+                                        <%-- First column shows the summaries for the learner,
+                                            second one for the whole group (session) --%>
+                                        <div class="col-3 singleSummaryCell">
+                                            <c:choose>
+                                                <c:when test="${question.summary==1}">
+                                                    ${questionSummary.userSummary[0].sum}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    ${questionSummary.userSummary[0].average}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </div>
+                                        <div class="col-3 singleSummaryCell">
+                                            <c:choose>
+                                                <c:when test="${question.summary==1}">
+                                                    ${questionSummary.groupSummary[0].sum}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    ${questionSummary.groupSummary[0].average}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </div>
+                                    </c:otherwise>
+                                </c:choose>
+                            </c:when>
+
+                            <c:when test="${question.summary==3}">
+                                <div class="col-3">
+                                    <div class="ltable no-header alternative-color-inner-table">
+                                        <c:forEach var="singleAnswer" items="${questionSummary.userSummary}" begin="1">
+                                            <div class="row">
+                                                <c:choose>
+                                                    <c:when test="${empty singleAnswer.answer}">
+                                                        <div class="hint" style="width: 20px;">
+                                                            <fmt:message key="label.learning.summary.emptyanswer" />:
+                                                        </div>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <div style="width: 20px;">
+                                                                ${singleAnswer.answer}:
+                                                        </div>
+                                                    </c:otherwise>
+                                                </c:choose>
+                                                <div class="col">
+                                                        ${singleAnswer.count}
+                                                </div>
+                                            </div>
+                                        </c:forEach>
+                                    </div>
+                                </div>
+                                <div class="col-3">
+                                    <div class="ltable no-header alternative-color-inner-table">
+                                        <c:forEach var="singleAnswer" items="${questionSummary.groupSummary}" begin="1">
+                                            <div class="row">
+                                                <div style="width: 20px;">
+                                                        ${singleAnswer.answer}:
+                                                </div>
+                                                <div class="col">
+                                                        ${singleAnswer.count}
+                                                </div>
+                                            </div>
+                                        </c:forEach>
+                                    </div>
+                                </div>
+                            </c:when>
+                        </c:choose>
+                    </c:when>
+
+                    <c:when test="${(question.type==7 || question.type==8 || question.type==9)  && not empty question.summary}">
+                        <div class="col-3 text-center">
+                            <c:forEach var="singleAnswer" items="${questionSummary.userSummary}">
+                                <div>
 										<span class="me-2">
 											${fn:substring(ordinal,singleAnswer.answer-1,singleAnswer.answer)})
 										</span>
-										<span>
+                                    <span>
 											<c:choose>
-												<c:when test="${question.summary==1}">
-													${singleAnswer.sum}
-												</c:when>
-												<c:otherwise>
-													${singleAnswer.average}
-												</c:otherwise>
-											</c:choose>
+                                                <c:when test="${question.summary==1}">
+                                                    ${singleAnswer.sum}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    ${singleAnswer.average}
+                                                </c:otherwise>
+                                            </c:choose>
 										</span>
-									</div>
-								</c:forEach>
-						</div>
-						
-						<div class="col-3 text-center">
-								<c:forEach var="singleAnswer" items="${questionSummary.groupSummary}">
-									<div>
+                                </div>
+                            </c:forEach>
+                        </div>
+
+                        <div class="col-3 text-center">
+                            <c:forEach var="singleAnswer" items="${questionSummary.groupSummary}">
+                                <div>
 										<span class="me-2">
 											${fn:substring(ordinal,singleAnswer.answer-1,singleAnswer.answer)})
 										</span>
-										<span>
+                                    <span>
 											<c:choose>
-												<c:when test="${question.summary==1}">
-													${singleAnswer.sum}
-												</c:when>
-												<c:otherwise>
-													${singleAnswer.average}
-												</c:otherwise>
-											</c:choose>
+                                                <c:when test="${question.summary==1}">
+                                                    ${singleAnswer.sum}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    ${singleAnswer.average}
+                                                </c:otherwise>
+                                            </c:choose>
 										</span>
-									</div>
-								</c:forEach>
-						</div>
-					</c:when>
-					
-					<c:otherwise>
-						<div class="col-3 singleSummaryCell">-</div>
-						<div class="col-3 singleSummaryCell">-</div>
-					</c:otherwise>
-				</c:choose>
-			</div>
-		</c:forEach>
-	</div>
+                                </div>
+                            </c:forEach>
+                        </div>
+                    </c:when>
 
-	<c:if test='${includeMode=="learning"}'>
-		<button type="button" class="btn btn-secondary btn-icon-refresh btn-disable-on-submit float-end mb-3" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')">
-			<fmt:message key="label.common.summary.refresh" />
-		</button>
-	</c:if>
-</div>
+                    <c:otherwise>
+                        <div class="col-3 singleSummaryCell">-</div>
+                        <div class="col-3 singleSummaryCell">-</div>
+                    </c:otherwise>
+                </c:choose>
+            </div>
+        </c:forEach>
+    </div>
+
+    <c:if test='${includeMode=="learning"}'>
+        <button type="button" class="btn btn-secondary btn-icon-refresh btn-disable-on-submit float-end mb-3" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')">
+            <fmt:message key="label.common.summary.refresh" />
+        </button>
+    </c:if>
+</div>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_images/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_leader/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_preview/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_survey/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_task/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_vote/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},
Index: lams_www/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r23c8911251f291b4110ab047161eb1749e856465 -r9576915785bfd47231fe20f9da6f130d39dc9c34
--- lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 23c8911251f291b4110ab047161eb1749e856465)
+++ lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
@@ -47,13 +47,16 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
         <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
         <lams:JSImport src="learning/includes/javascript/learnerPage.js" />
         <lams:JSImport src="includes/javascript/dialog5.js" />
         <lams:JSImport src="includes/javascript/common.js" />
 
         <script>
             const LAMS_URL = '<lams:LAMSURL/>',
                 decoderDiv = $('<div />');
+            var commandWebsocketHookTrigger = null,
+                commandWebsocketHook = null;
 
             $(document).ready(function (){
                 const toolSessionID = ${empty lessonID ? toolSessionID : 'null'},