Index: lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/dao/hibernate/DiscussionSentimentDAO.java
===================================================================
diff -u -r0d458a161ee50dd2db8283520b80b5cc559705bf -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/dao/hibernate/DiscussionSentimentDAO.java	(.../DiscussionSentimentDAO.java)	(revision 0d458a161ee50dd2db8283520b80b5cc559705bf)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/dao/hibernate/DiscussionSentimentDAO.java	(.../DiscussionSentimentDAO.java)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -16,7 +16,7 @@
     private static final String FIND_ACTIVE_DISCUSSION = "FROM " + DiscussionSentimentVote.class.getName()
 	    + " WHERE lessonId = :lessonId AND userId IS NULL";
 
-    private static final String FIND_ALL_LESSON_DISCUSSIONS = "SELECT toolQuestionUid FROM "
+    private static final String FIND_ALL_LESSON_DISCUSSIONS = "SELECT toolQuestionUid, burningQuestionUid FROM "
 	    + DiscussionSentimentVote.class.getName() + " WHERE lessonId = :lessonId GROUP BY toolQuestionUid";
 
     @Override
@@ -28,12 +28,13 @@
     @Override
     @SuppressWarnings("unchecked")
     public Set<DiscussionSentimentVote> getDiscussions(long lessonId) {
-	List<Long> queryResult = getSession().createQuery(FIND_ALL_LESSON_DISCUSSIONS)
+	List<Object[]> queryResult = getSession().createQuery(FIND_ALL_LESSON_DISCUSSIONS)
 		.setParameter("lessonId", lessonId).getResultList();
 	Set<DiscussionSentimentVote> result = new HashSet<>();
 
-	for (Long toolQuestionUid : queryResult) {
-	    DiscussionSentimentVote token = new DiscussionSentimentVote(lessonId, toolQuestionUid, null);
+	for (Object[] discussionDetails : queryResult) {
+	    DiscussionSentimentVote token = new DiscussionSentimentVote(lessonId, (Long) discussionDetails[0],
+		    (Long) discussionDetails[1]);
 	    result.add(token);
 	}
 	return result;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/service/DiscussionSentimentService.java
===================================================================
diff -u -r0d458a161ee50dd2db8283520b80b5cc559705bf -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/service/DiscussionSentimentService.java	(.../DiscussionSentimentService.java)	(revision 0d458a161ee50dd2db8283520b80b5cc559705bf)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/service/DiscussionSentimentService.java	(.../DiscussionSentimentService.java)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -93,13 +93,13 @@
 		userId);
 	if (learnerVote != null) {
 	    discussionSentimentDAO.delete(learnerVote);
+	    discussionSentimentDAO.flush();
 	}
 
 	// add the vote
 	// it is different to discussion token as it contains user ID
 	learnerVote = new DiscussionSentimentVote(lessonId, cachedActiveDiscussionToken.getToolQuestionUid(),
 		cachedActiveDiscussionToken.getBurningQuestionUid());
-	learnerVote.setBurningQuestionUid(cachedActiveDiscussionToken.getBurningQuestionUid());
 	learnerVote.setUserId(userId);
 	learnerVote.setSelectedOption(selectedOption);
 
Index: lams_learning/web/discussion/monitor.jsp
===================================================================
diff -u -rf54e28a0fccea0011b2e580ff5afb9abd4acc96b -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_learning/web/discussion/monitor.jsp	(.../monitor.jsp)	(revision f54e28a0fccea0011b2e580ff5afb9abd4acc96b)
+++ lams_learning/web/discussion/monitor.jsp	(.../monitor.jsp)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -1,4 +1,5 @@
 <%@include file="/common/taglibs.jsp"%>
+<c:set var="idSuffix" value='${param.toolQuestionUid}${empty param.burningQuestionUid ? "" : "-".concat(param.burningQuestionUid)}' />
 
 <style>
 	.discussion-sentiment-chart-panel .panel-title .fa-comments {
@@ -49,68 +50,71 @@
 </style>
 
 <script>
-	function stopDiscussionSentiment(toolQuestionUid) {
+	function stopDiscussionSentiment(toolQuestionUid, burningQuestionUid) {
 		// stop discussion on server and reflect it on widget
 		$.ajax({
 			url : '<lams:LAMSURL />learning/discussionSentiment/stopMonitor.do',
 			data : {
-				toolQuestionUid : toolQuestionUid
+				toolQuestionUid : toolQuestionUid,
+				burningQuestionUid : burningQuestionUid
 			},
 			type : 'post',
 			success : function(){
-				 onStopDiscussionSentiment(toolQuestionUid);
+				 onStopDiscussionSentiment(toolQuestionUid, burningQuestionUid);
 			}
 		});
 	}
 
-	function onStopDiscussionSentiment(toolQuestionUid) {
+	function onStopDiscussionSentiment(toolQuestionUid, burningQuestionUid) {
 		// stop auto refresh for this widget and make it look like disabled
-		 var widget = $('#discussion-sentiment-chart-panel-content-' + toolQuestionUid)
+		 var widget = $('#discussion-sentiment-chart-panel-content-' + toolQuestionUid + (burningQuestionUid ? '-' + burningQuestionUid : ''))
 		 		.data('stop', true)
 				.closest('.discussion-sentiment-chart-panel').addClass('disabled');
 		$('.discussion-sentiment-stop-button', widget).remove();	
 		$('.discussion-sentiment-start-button', widget).show();	
 	}
 
-	function getDiscussionSentimentMonitorData(toolQuestionUid) {
+	function getDiscussionSentimentMonitorData(toolQuestionUid, burningQuestionUid) {
 		$.ajax({
 			url : '<lams:LAMSURL />learning/discussionSentiment/getMonitorData.do',
 			data : {
-				toolQuestionUid : toolQuestionUid
+				toolQuestionUid : toolQuestionUid,
+				burningQuestionUid : burningQuestionUid
 			},
 			dataType : 'json',
 			success : function(response) {
 				if (!response.isActive) {
 					 // probably another teacher stopped this discussion
-					 onStopDiscussionSentiment(toolQuestionUid);
+					 onStopDiscussionSentiment(toolQuestionUid, burningQuestionUid);
 				}
 
 				// process raw data in response, which is "option" -> "number of votes"
 				var data = response.votes, 
 					stayVotes  = 0,
-					moveVotes  = 0;
+					moveVotes  = 0,
+					idSuffix = toolQuestionUid + (burningQuestionUid ? '-' + burningQuestionUid : '');
 				for (var optionNumber = 1; optionNumber <= 4; optionNumber++) {
 					var votes = data[optionNumber];
 					if (votes) {
 						stayVotes += votes;
 					}
 				}
-				$('#discussion-sentiment-table-stay-header-votes-' + toolQuestionUid).text(stayVotes);
+				$('#discussion-sentiment-table-stay-header-votes-' + idSuffix).text(stayVotes);
 
 				for (var optionNumber = 11; optionNumber <= 14; optionNumber++) {
 					var votes = data[optionNumber];
 					if (votes) {
 						moveVotes += votes;
 					}
 				}
-				$('#discussion-sentiment-table-move-header-votes-' + toolQuestionUid).text(moveVotes);
+				$('#discussion-sentiment-table-move-header-votes-' + idSuffix).text(moveVotes);
 				
 				var totalVotes = stayVotes + moveVotes;
-				$('#discussion-sentiment-votes-' + toolQuestionUid).text(totalVotes);
+				$('#discussion-sentiment-votes-' + idSuffix).text(totalVotes);
 				var stayPercent = totalVotes === 0 ? 0 : Math.round(stayVotes / totalVotes * 100);
-				$('#discussion-sentiment-table-stay-header-value-' + toolQuestionUid).text(stayPercent + '%');
+				$('#discussion-sentiment-table-stay-header-value-' + idSuffix).text(stayPercent + '%');
 				var movePercent = totalVotes === 0 ? 0 : Math.round(moveVotes / totalVotes * 100);
-				$('#discussion-sentiment-table-move-header-value-' + toolQuestionUid).text(movePercent + '%');
+				$('#discussion-sentiment-table-move-header-value-' + idSuffix).text(movePercent + '%');
 
 				for (var optionNumber = 1; optionNumber <= 14; optionNumber++) {
 					if (optionNumber > 4 && optionNumber < 11) {
@@ -119,7 +123,7 @@
 					}
 					
 					var votes = data[optionNumber],
-						optionRow = $('#discussion-sentiment-table-option-row-' + toolQuestionUid + '-' + optionNumber);
+						optionRow = $('#discussion-sentiment-table-option-row-' + idSuffix + '-' + optionNumber);
 					if (votes && totalVotes > 0) {
 						optionRow.css('display', 'table-row')
 								 .find('.discussion-sentiment-table-option-value')
@@ -130,7 +134,7 @@
 					}
 				}
 
-				var chartCell = $('#discussion-sentiment-chart-cell-' + toolQuestionUid);
+				var chartCell = $('#discussion-sentiment-chart-cell-' + idSuffix);
 				if (totalVotes === 0) {
 					// no votes, no chart
 					chartCell.empty();
@@ -206,64 +210,67 @@
 	
 	$(document).ready(function(){
 		var toolQuestionUid = ${param.toolQuestionUid},
+			burningQuestionUid = '${param.burningQuestionUid}',
+			idSuffix = toolQuestionUid + (burningQuestionUid ? '-' + burningQuestionUid : ''),
 			// how often to refresh the chart
 			dataRefreshInterval = 5 * 1000;
-		getDiscussionSentimentMonitorData(toolQuestionUid);
+		getDiscussionSentimentMonitorData(toolQuestionUid, burningQuestionUid);
 		
 	
 		var dataRefresh = window.setInterval(function(){
-			var panelContent = $('#discussion-sentiment-chart-panel-content-' + toolQuestionUid),
+			var panelContent = $('#discussion-sentiment-chart-panel-content-' + idSuffix),
 				// If in TBL monitor the tab with the chart got refreshed, then old interval is still ticking.
 				// We need to clear it so only the new interval does it job.
 				existingDataRefresh = panelContent.data('dataRefresh');
 			if (panelContent.length == 0 || panelContent.data('stop') || existingDataRefresh != dataRefresh) {
 				window.clearInterval(dataRefresh);
 				return;
 			}
-			getDiscussionSentimentMonitorData(toolQuestionUid);
+			getDiscussionSentimentMonitorData(toolQuestionUid, burningQuestionUid);
 		}, dataRefreshInterval);
 	
-		$('#discussion-sentiment-chart-panel-content-' + toolQuestionUid).data('dataRefresh', dataRefresh);
+		$('#discussion-sentiment-chart-panel-content-' + idSuffix).data('dataRefresh', dataRefresh);
 	});
 </script>
 
+
 <div class="panel panel-default discussion-sentiment-chart-panel">
 	<div class="panel-heading"
-		 id="discussion-sentiment-chart-panel-heading-${param.toolQuestionUid}">
+		 id="discussion-sentiment-chart-panel-heading-${idSuffix}">
        	<div class="panel-title">
 	    	<i class="fa fa-comments"></i>
 	    	<fmt:message key="label.discussion.header" />
-	       	(<span id="discussion-sentiment-votes-${param.toolQuestionUid}"></span>
+	       	(<span id="discussion-sentiment-votes-${idSuffix}"></span>
 	       	 <fmt:message key="label.discussion.votes.of.students">
 	       		<fmt:param value="${learnerCount}" />
 	       	 </fmt:message>
 	       	)
      	</div>
-     	<div class="btn btn-default discussion-sentiment-start-button" onClick="javascript:startDiscussionSentiment(${param.toolQuestionUid}, true)">
+     	<div class="btn btn-default discussion-sentiment-start-button" onClick="javascript:startDiscussionSentiment(${param.toolQuestionUid}, '${param.burningQuestionUid}', true)">
 			<fmt:message key="label.discussion.restart"/>
 		</div>
-  		<div class="btn btn-default discussion-sentiment-stop-button" onClick="javascript:stopDiscussionSentiment(${param.toolQuestionUid})">
+  		<div class="btn btn-default discussion-sentiment-stop-button" onClick="javascript:stopDiscussionSentiment(${param.toolQuestionUid}, '${param.burningQuestionUid}')">
 			<fmt:message key="label.discussion.stop"/>
 		</div>
     </div>
 
-    <div id="discussion-sentiment-chart-panel-content-${param.toolQuestionUid}" class="panel-body container-fluid" role="tabpanel"
-       	 aria-labelledby="discussion-sentiment-chart-panel-heading-${param.toolQuestionUid}">
+    <div id="discussion-sentiment-chart-panel-content-${idSuffix}" class="panel-body container-fluid" role="tabpanel"
+       	 aria-labelledby="discussion-sentiment-chart-panel-heading-${idSuffix}">
 		<div class="row">
-			<div class="col-xs-12 col-sm-6" id="discussion-sentiment-chart-cell-${param.toolQuestionUid}">
+			<div class="col-xs-12 col-sm-6" id="discussion-sentiment-chart-cell-${idSuffix}">
 			</div>
 			<div class="col-xs-12 col-sm-6">
 				<table class="table">
 			       	 <tr class="discussion-sentiment-table-header-row discussion-sentiment-table-stay-header-row">
 			       	 	<td>
 			       	 		<fmt:message key="label.discussion.stay.header" />
-			       	 		(<span id="discussion-sentiment-table-stay-header-votes-${param.toolQuestionUid}"></span>&nbsp;<fmt:message key="label.discussion.votes" />)
+			       	 		(<span id="discussion-sentiment-table-stay-header-votes-${idSuffix}"></span>&nbsp;<fmt:message key="label.discussion.votes" />)
 			       	 	</td>
-			       	 	<td id="discussion-sentiment-table-stay-header-value-${param.toolQuestionUid}">
+			       	 	<td id="discussion-sentiment-table-stay-header-value-${idSuffix}">
 			       	 	</td>
 			       	 </tr>
 			       	 <c:forEach begin="1" end="4" var="optionNumber">
-				       	 <tr id="discussion-sentiment-table-option-row-${param.toolQuestionUid}-${optionNumber}" class="discussion-sentiment-table-option-row">
+				       	 <tr id="discussion-sentiment-table-option-row-${idSuffix}-${optionNumber}" class="discussion-sentiment-table-option-row">
 				       	 	<td>
 				       	 		<fmt:message key="label.discussion.stay.option.${optionNumber}" />
 				       	 	</td>
@@ -275,13 +282,13 @@
 			       	 <tr class="discussion-sentiment-table-header-row discussion-sentiment-table-move-header-row">
 			       	 	<td>
 			       	 		<fmt:message key="label.discussion.move.header" />
-			       	 		(<span id="discussion-sentiment-table-move-header-votes-${param.toolQuestionUid}"></span>&nbsp;<fmt:message key="label.discussion.votes" />)
+			       	 		(<span id="discussion-sentiment-table-move-header-votes-${idSuffix}"></span>&nbsp;<fmt:message key="label.discussion.votes" />)
 			       	 	</td>
-			       	 	<td id="discussion-sentiment-table-move-header-value-${param.toolQuestionUid}">
+			       	 	<td id="discussion-sentiment-table-move-header-value-${idSuffix}">
 			       	 	</td>
 			       	 </tr>
 			       	 <c:forEach begin="11" end="14" var="optionNumber">
-				       	 <tr id="discussion-sentiment-table-option-row-${param.toolQuestionUid}-${optionNumber}" class="discussion-sentiment-table-option-row">
+				       	 <tr id="discussion-sentiment-table-option-row-${idSuffix}-${optionNumber}" class="discussion-sentiment-table-option-row">
 				       	 	<td>
 				       	 		<fmt:message key="label.discussion.move.option.${optionNumber}" />
 				       	 	</td>
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -77,7 +77,9 @@
 	}
 
 	<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
-		function startDiscussionSentiment(toolQuestionUid, markAsActive) {
+		function startDiscussionSentiment(toolQuestionUid, burningQuestionUid, markAsActive) {
+			// burningQuestionUid is not used in Assessment, but must be added for function signature consistency
+			
 			$('#discussion-sentiment-chart-panel-container-' + toolQuestionUid).load(
 				'${lams}learning/discussionSentiment/startMonitor.do',
 				{
@@ -111,18 +113,20 @@
 				};
 		</c:if>
 
-		$.ajax({
-			url : '${lams}learning/discussionSentiment/checkMonitor.do',
-			data : {
-				toolContentId : ${assessment.contentId}
-			},
-			dataType : 'json',
-			success : function(result){
-				result.forEach(function(discussion){
-					startDiscussionSentiment(discussion.toolQuestionUid, false);
-				});
-			}
-		});
+		<c:if test="${param.embedded and empty toolSessionID and assessment.allowDiscussionSentiment}">
+			$.ajax({
+				url : '${lams}learning/discussionSentiment/checkMonitor.do',
+				data : {
+					toolContentId : ${assessment.contentId}
+				},
+				dataType : 'json',
+				success : function(result){
+					result.forEach(function(discussion){
+						startDiscussionSentiment(discussion.toolQuestionUid, null, false);
+					});
+				}
+			});
+		</c:if>
 	});
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
@@ -158,7 +162,7 @@
 				<c:if test="${assessment.allowDiscussionSentiment}">
 					<div id="discussion-sentiment-start-button-${question.uid}"
 					     class="btn btn-xs btn-default pull-right discussion-sentiment-start-button"
-					     onClick="javascript:startDiscussionSentiment(${question.uid}, true)">
+					     onClick="javascript:startDiscussionSentiment(${question.uid}, null, true)">
 						<i class="fa fa-comments"></i><fmt:message key="label.monitoring.discussion.start"/>
 					</div>
 				</c:if>
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rfda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -312,3 +312,4 @@
 label.monitoring.summary.time.limit.finish.now.confirm = Are you sure you want to make all groups finish their work right now?
 label.monitoring.summary.time.limit.individual.placeholder = Type name
 label.monitoring.summary.time.limit.expired = Expired
+label.monitoring.discussion.start = Start discussion
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -r01914e84eaec252cea509f1990122a58b555cbd5 -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision 01914e84eaec252cea509f1990122a58b555cbd5)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -193,6 +193,8 @@
 	}
 
 	request.setAttribute("isTbl", true);
+	request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, scratchie.getContentId());
+	request.setAttribute("discussionSentimentEnabled", scratchie.isDiscussionSentimentEnabled());
 
 	return "pages/monitoring/parts/burningQuestions";
     }
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r973a921a8f59a78026f54c84d6b04e2378bac517 -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 973a921a8f59a78026f54c84d6b04e2378bac517)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -217,22 +217,41 @@
 						} else {
 							alert(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 (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');
+						}
+						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+							lessonId : lessonId
+						});
+					}
+
 					// 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 : LEARNING_URL + "discussionSentiment/checkLearner.do",
+					data: {
+						lessonId : lessonId
+					}
+				});
 			}
 			
 			$(document).ready(function() {
Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp
===================================================================
diff -u -r67eb97d89e2400b6dfba6b978f608c376a25a00d -rca273b5530c1fead65c271da891dcdd3cb5709f7
--- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision 67eb97d89e2400b6dfba6b978f608c376a25a00d)
+++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(.../burningQuestions.jsp)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
@@ -1,4 +1,20 @@
 <%@ include file="/common/taglibs.jsp"%>
+
+<style>
+
+	.discussion-sentiment-start-button-cell {
+		width: 50px;
+		text-align: right;
+	}	
+	
+	.discussion-sentiment-start-button .fa-comments {
+		color: black !important;
+	}
+	
+	.discussion-sentiment-chart-row {
+		display: none;
+	}
+</style>
 <script>
 	$(document).ready(function(){
 		//handler for expand/collapse all button
@@ -49,7 +65,42 @@
 			div.toggleClass("in");
 			$(this).toggleClass("collapsed");
 		});
+		
+		<c:if test="${isTbl and discussionSentimentEnabled}">
+			$.ajax({
+				url : '<lams:LAMSURL />learning/discussionSentiment/checkMonitor.do',
+				data : {
+					toolContentId : ${toolContentID}
+				},
+				dataType : 'json',
+				success : function(result){
+					result.forEach(function(discussion){
+						startDiscussionSentiment(discussion.toolQuestionUid, discussion.burningQuestionUid, false);
+					});
+				}
+			});
+		</c:if>
 	});
+
+
+	<c:if test="${isTbl and discussionSentimentEnabled}">
+		function startDiscussionSentiment(toolQuestionUid, burningQuestionUid, markAsActive) {
+			var idSuffix = toolQuestionUid + '-' + burningQuestionUid,
+				chartRow = $('#discussion-sentiment-chart-row-' + idSuffix).css('display', 'table-row');
+			
+			$('#discussion-sentiment-chart-panel-container-' + idSuffix, chartRow).load(
+				'<lams:LAMSURL />learning/discussionSentiment/startMonitor.do',
+				{
+					toolQuestionUid    : toolQuestionUid,
+					burningQuestionUid : burningQuestionUid,
+					markAsActive       : markAsActive
+				},
+				function(){
+					$('#discussion-sentiment-start-button-' + idSuffix).closest('td').remove();
+				}
+			)
+		}
+	</c:if>
 </script>
 
 <!-- Header -->
@@ -78,14 +129,21 @@
 		<c:set var="burningQsCount" value="${fn:length(burningQuestionItemDto.burningQuestionDtos)}"/>
 		<c:if test="${burningQsCount > 0}">
 			<c:set var="item" value="${burningQuestionItemDto.scratchieItem}"/>
+			<%-- toolQuestionUid, i.e. item UID, is required for discussion token.
+				 It is missing for general burning questions as they are not bound to any question.
+				 In this case we use first question's UID, as burning question UID will uniquely identify the discussion anyway
+			 --%>
+			<c:set var="generalBurningQuestionDiscussionItemUid"
+				   value="${empty generalBurningQuestionDiscussionItemUid and not empty item.uid ? item.uid : generalBurningQuestionDiscussionItemUid}" />
+			<c:set var="discussionItemUid" value="${empty item.uid ? generalBurningQuestionDiscussionItemUid : item.uid}" />
 
 			<div class="panel panel-default">
 				<div class="panel-heading">
 					<h4 class="panel-title panel-collapse">
 						<a data-toggle="collapse" data-itemuid="${item.uid}" class="collapsed burning-question-title">
 							<!-- Don't display number prior to general burning question -->
 							<c:choose>
-								<c:when test="${empty burningQuestionItemDto.scratchieItem.uid}">
+								<c:when test="${empty item.uid}">
 									<c:out value="${item.qbQuestion.name}" escapeXml="false"/>
 								</c:when>
 								<c:otherwise>
@@ -142,7 +200,24 @@
 										<td class="text-nowrap">
 											<span class="badge">${burningQuestionDto.likeCount}</span> &nbsp; <i class="fa fa-thumbs-o-up" style="color:darkblue"></i>
 										</td>
+										<c:if test="${isTbl and discussionSentimentEnabled and not empty discussionItemUid}">
+											<td class="discussion-sentiment-start-button-cell">
+												<div id="discussion-sentiment-start-button-${discussionItemUid}-${burningQuestionDto.burningQuestion.uid}"
+												     class="btn btn-xs btn-default discussion-sentiment-start-button"
+												     onClick="javascript:startDiscussionSentiment(${discussionItemUid}, ${burningQuestionDto.burningQuestion.uid}, true)">
+													<i class="fa fa-comments"></i><fmt:message key="label.monitoring.discussion.start"/>
+												</div>
+											</td>
+										</c:if>
 									</tr>
+									<c:if test="${isTbl and discussionSentimentEnabled and not empty discussionItemUid}">
+										<tr id="discussion-sentiment-chart-row-${discussionItemUid}-${burningQuestionDto.burningQuestion.uid}"
+										    class="discussion-sentiment-chart-row">
+											<td colspan="3">
+												<div id="discussion-sentiment-chart-panel-container-${discussionItemUid}-${burningQuestionDto.burningQuestion.uid}"></div>
+											</td>
+										</tr>
+									</c:if>
 								</c:forEach>
 							</tbody>
 						</table>