Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/PrintQuestionsController.java
===================================================================
diff -u -rc2b79a48e116ee67d7de18bfb4b793fda02b58e7 -ra2ba5772ecb96d0d5436043ba0da03b6b1a5cdc2
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/PrintQuestionsController.java	(.../PrintQuestionsController.java)	(revision c2b79a48e116ee67d7de18bfb4b793fda02b58e7)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/PrintQuestionsController.java	(.../PrintQuestionsController.java)	(revision a2ba5772ecb96d0d5436043ba0da03b6b1a5cdc2)
@@ -1,13 +1,19 @@
 package org.lamsfoundation.lams.web.qb;
 
-import org.lamsfoundation.lams.util.imgscalr.Scalr;
+import org.lamsfoundation.lams.qb.model.QbOption;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.support.RequestContextUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -19,9 +25,28 @@
 	// read Flash Attributes set by another module and put them in the model
 	Map<String, ?> inputFlashMap = RequestContextUtils.getInputFlashMap(request);
 	if (inputFlashMap != null) {
+
+	    Map<Long, List<String>> randomisedOptions = new HashMap<>();
+	    model.addAttribute("printRandomisedOptions", randomisedOptions);
 	    for (String key : inputFlashMap.keySet()) {
 		if (key.startsWith("print")) {
 		    model.addAttribute(key, inputFlashMap.get(key));
+
+		    if (key.equals("printQuestions")) {
+			Collection<QbQuestion> questions = (Collection<QbQuestion>) inputFlashMap.get(key);
+			for (QbQuestion question : questions) {
+			    if (question.getType().equals(QbQuestion.TYPE_MATCHING_PAIRS) || question.getType()
+				    .equals(QbQuestion.TYPE_ORDERING)) {
+				// randomise the order of options when correct answers are hidden
+				List<String> optionNames = new ArrayList<>();
+				for (QbOption option : question.getQbOptions()) {
+				    optionNames.add(option.getName());
+				}
+				Collections.shuffle(optionNames);
+				randomisedOptions.put(question.getUid(), optionNames);
+			    }
+			}
+		    }
 		}
 	    }
 	}
Index: lams_central/web/qb/printQuestions.jsp
===================================================================
diff -u -r740df184f8cb7d5b0da48c84f15ca0f5ab0bcdbd -ra2ba5772ecb96d0d5436043ba0da03b6b1a5cdc2
--- lams_central/web/qb/printQuestions.jsp	(.../printQuestions.jsp)	(revision 740df184f8cb7d5b0da48c84f15ca0f5ab0bcdbd)
+++ lams_central/web/qb/printQuestions.jsp	(.../printQuestions.jsp)	(revision a2ba5772ecb96d0d5436043ba0da03b6b1a5cdc2)
@@ -26,6 +26,10 @@
 				color: var(--bs-success);
 			}
 
+			.reveal-answers {
+				display: none;
+			}
+
 			.hide-answers .option-feedback,
 			.hide-answers .option-correct-label {
 				display: none;
@@ -36,6 +40,10 @@
 				color: initial;
 			}
 
+			.hide-answers .reveal-answers {
+				display: block;
+			}
+
 			@media print {
 				.hide-print {
 					display: none;
@@ -84,26 +92,108 @@
 			<li class="mb-4 question-item">
 				<p class="fw-bold"><c:out value="${question.name}" /></p>
 				<c:out value="${question.description}" escapeXml="false" />
-				<ol type="a">
-					<c:forEach var="option" items="${question.qbOptions}">
-						<li>
-							<div class="option-name ${option.maxMark > 0 ? "option-correct-name" : ""}">
-								<c:out value="${option.name}" escapeXml="false" />
-								<c:if test="${option.maxMark > 0}">
-									<span class="option-correct-label">
-										(<fmt:message key="label.correct" />)
+				<c:choose>
+					<c:when test="${question.type eq 1 or question.type eq 3 or question.type eq 8}">
+						<!-- Multiple choice and Short Answers and Mark Hedging -->
+						<ol type="a">
+							<c:forEach var="option" items="${question.qbOptions}">
+								<li>
+									<div class="${option.maxMark > 0 ? "option-correct-name" : ""}">
+										<c:out value="${option.name}" escapeXml="false" />
+										<c:if test="${option.maxMark > 0}">
+											<span class="option-correct-label">
+												(<fmt:message key="label.correct" />)
+											</span>
+										</c:if>
+									</div>
+									<c:if test="${not empty option.feedback}">
+										<span class="text-muted option-feedback"
+											  title="<fmt:message key="label.authoring.basic.option.feedback" />">
+											<c:out value="${option.feedback}" escapeXml="false" />
+										</span>
+									</c:if>
+								</li>
+							</c:forEach>
+						</ol>
+					</c:when>
+					<c:when test="${question.type eq 2}">
+						<!-- Matching pairs -->
+						<ol type="a">
+							<c:forEach var="option" items="${question.qbOptions}">
+								<li>
+									<c:out value="${option.matchingPair}" escapeXml="false" />
+									<span class="option-correct-name option-correct-label">
+										(<c:out value="${option.name}" escapeXml="false" />)
 									</span>
-								</c:if>
-							</div>
-							<c:if test="${not empty option.feedback}">
-								<span class="text-muted option-feedback"
-									  title="<fmt:message key="label.authoring.basic.option.feedback" />">
-									<c:out value="${option.feedback}" escapeXml="false" />
-								</span>
-							</c:if>
-						</li>
-					</c:forEach>
-				</ol>
+								</li>
+							</c:forEach>
+						</ol>
+						<ol type="A" class="reveal-answers mt-4">
+							<c:forEach var="matchingAnswer" items="${printRandomisedOptions[question.uid]}">
+								<li>
+									<c:out value="${matchingAnswer}" escapeXml="false" />
+								</li>
+							</c:forEach>
+						</ol>
+					</c:when>
+					<c:when test="${question.type eq 4}">
+						<!-- Numerical -->
+						<ol type="a">
+							<c:forEach var="option" items="${question.qbOptions}">
+								<li>
+									<div class="${option.maxMark > 0 ? "option-correct-name" : ""}">
+										<c:out value="${option.numericalOption}" escapeXml="false" />
+										<c:if test="${option.maxMark > 0}">
+											<span class="option-correct-label">
+												(<fmt:message key="label.correct" />)
+											</span>
+										</c:if>
+									</div>
+									<p>
+										<fmt:message key="label.authoring.basic.option.accepted.error" />:
+										<c:out value="${option.acceptedError}" escapeXml="false" />
+									</p>
+									<c:if test="${not empty option.feedback}">
+										<span class="text-muted option-feedback"
+											  title="<fmt:message key="label.authoring.basic.option.feedback" />">
+											<c:out value="${option.feedback}" escapeXml="false" />
+										</span>
+									</c:if>
+								</li>
+							</c:forEach>
+						</ol>
+					</c:when>
+					<c:when test="${question.type eq 5}">
+						<!-- True/False -->
+						<p class="option-correct-name option-correct-label">
+							<c:choose>
+								<c:when test="${question.correctAnswer}">
+									(<fmt:message key="label.authoring.true.false.true" />)
+								</c:when>
+								<c:otherwise>
+									(<fmt:message key="label.authoring.true.false.false" />)
+								</c:otherwise>
+							</c:choose>
+						</p>
+					</c:when>
+					<c:when test="${question.type eq 7}">
+						<!-- Ordering -->
+						<ol type="a" class="option-correct-label">
+							<c:forEach var="option" items="${question.qbOptions}">
+								<li>
+									<c:out value="${option.name}" escapeXml="false" />
+								</li>
+							</c:forEach>
+						</ol>
+						<ol type="a" class="reveal-answers">
+							<c:forEach var="randomisedOption" items="${printRandomisedOptions[question.uid]}">
+								<li>
+									<c:out value="${randomisedOption}" escapeXml="false" />
+								</li>
+							</c:forEach>
+						</ol>
+					</c:when>
+				</c:choose>
 			</li>
 		</c:forEach>
 	</ol>