diff --git a/access/access-impl/impl/pom.xml b/access/access-impl/impl/pom.xml
index f11887697b94..7a8c8217db48 100644
--- a/access/access-impl/impl/pom.xml
+++ b/access/access-impl/impl/pom.xml
@@ -43,7 +43,6 @@
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.velocity</groupId>
diff --git a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java
index e57c26974130..8fa835c4d328 100644
--- a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java
+++ b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java
@@ -71,7 +71,11 @@ public interface AssignmentService extends EntityProducer {
      */
     public List<User> allowReceiveSubmissionNotificationUsers(String context);
 
-    Collection getGroupsAllowRemoveAssignment(String context);
+    /**
+     * @param context
+     * @return
+     */
+    public Collection<Group> getGroupsAllowRemoveAssignment(String context);
 
     /**
      * Check permissions for adding an Assignment.
@@ -116,7 +120,7 @@ public interface AssignmentService extends EntityProducer {
      *                Describes the portlet context - generated with DefaultId.getChannel().
      * @return The Collection (Group) of groups defined for the context of this site that the end user has add assignment permissions in, empty if none.
      */
-    Collection getGroupsAllowAddAssignment(String context);
+    public Collection<Group> getGroupsAllowAddAssignment(String context);
 
     /**
      * Get the collection of Groups defined for the context of this site that the end user has grade assignment permissions in.
@@ -125,7 +129,7 @@ public interface AssignmentService extends EntityProducer {
      *                Describes the portlet context - generated with DefaultId.getChannel().
      * @return The Collection (Group) of groups defined for the context of this site that the end user has grade assignment permissions in, empty if none.
      */
-    Collection getGroupsAllowGradeAssignment(String context, String assignmentReference);
+    public Collection<Group> getGroupsAllowGradeAssignment(String context, String assignmentReference);
 
     /**
      * Check permissions for updating an Assignment.
@@ -184,7 +188,7 @@ public interface AssignmentService extends EntityProducer {
      * @param context the context string
      * @return the list of user (ids)
      */
-    public List allowAddAnySubmissionUsers(String context);
+    public List<String> allowAddAnySubmissionUsers(String context);
 
     /**
      * Get the List of Users who can add assignment
@@ -193,7 +197,7 @@ public interface AssignmentService extends EntityProducer {
      *                Describes the portlet context - generated with DefaultId.getChannel().
      * @return the List (User) of users who can add assignment
      */
-    public List allowAddAssignmentUsers(String context);
+    public List<User> allowAddAssignmentUsers(String context);
 
     /**
      * Check permissions for reading a Submission.
@@ -317,11 +321,25 @@ public interface AssignmentService extends EntityProducer {
      */
     public void removeSubmission(AssignmentSubmission submission) throws PermissionException;
 
-    void updateAssignment(Assignment assignment) throws PermissionException;
+    /**
+     * @param assignment
+     * @throws PermissionException
+     */
+    public void updateAssignment(Assignment assignment) throws PermissionException;
 
-    void updateSubmission(AssignmentSubmission submission) throws PermissionException;
+    /**
+     * @param submission
+     * @throws PermissionException
+     */
+    public void updateSubmission(AssignmentSubmission submission) throws PermissionException;
 
-    Assignment getAssignment(Reference reference) throws IdUnusedException, PermissionException;
+    /**
+     * @param reference
+     * @return
+     * @throws IdUnusedException
+     * @throws PermissionException
+     */
+    public Assignment getAssignment(Reference reference) throws IdUnusedException, PermissionException;
 
     /**
      * Access the Assignment with the specified id.
@@ -404,7 +422,8 @@ public interface AssignmentService extends EntityProducer {
      *               The User who's Submission you would like.
      * @return AssignmentSubmission The user's submission for that Assignment, or null if one does not exist.
      */
-    public AssignmentSubmission getSubmission(List submissions, User person);
+    @Deprecated
+    public AssignmentSubmission getSubmission(List<AssignmentSubmission> submissions, User person);
 
     /**
      * Get the submissions for an assignment.
@@ -415,14 +434,22 @@ public interface AssignmentService extends EntityProducer {
      */
     public Set<AssignmentSubmission> getSubmissions(Assignment assignment);
 
-    String getAssignmentStatus(String assignmentId);
+    /**
+     * @param assignmentId
+     * @return
+     */
+    public String getAssignmentStatus(String assignmentId);
 
-    String getSubmissionStatus(String submissionId);
+    /**
+     * @param submissionId
+     * @return
+     */
+    public String getSubmissionStatus(String submissionId);
 
     /**
      * Return a sorted list of users representing a group.
      */
-    public List getSortedGroupUsers(Group g);
+    public List<User> getSortedGroupUsers(Group g);
 
     /**
      * Get the number of submissions which has been submitted.
@@ -507,15 +534,30 @@ public interface AssignmentService extends EntityProducer {
 
     /**
      * Whether a specific user can submit
+     * @param context
+     * @param a
+     * @param userId
+     * @return
      */
     public boolean canSubmit(String context, Assignment a, String userId);
 
     /**
      * Whether the current user can submit
+     * @param context
+     * @param a
+     * @return
      */
     public boolean canSubmit(String context, Assignment a);
 
 
+    /**
+     * @param searchFilterOnly
+     * @param allOrOneGroup
+     * @param searchString
+     * @param aRef
+     * @param contextString
+     * @return
+     */
     public Collection<Group> getSubmitterGroupList(String searchFilterOnly, String allOrOneGroup, String searchString, String aRef, String contextString);
 
     /**
@@ -547,9 +589,13 @@ public interface AssignmentService extends EntityProducer {
      */
     public Map<User, AssignmentSubmission> getSubmitterMap(String searchFilterOnly, String allOrOneGroup, String search, String aRef, String contextString);
 
+    /**
+     * @param accentedString
+     * @return
+     */
     public String escapeInvalidCharsEntry(String accentedString);
 
-    /*
+    /**
      * If the assignment uses anonymous grading returns true, else false
      *
      * Params: AssignmentSubmission s
@@ -563,7 +609,7 @@ public interface AssignmentService extends EntityProducer {
      */
     public Integer getScaleFactor();
 
-    /*
+    /**
      * This method allows you to know if there are submissions submitted
      *
      * Params: AssignmentSubmission s
@@ -602,17 +648,45 @@ public String getDeepLinkWithPermissions(String context, String assignmentId, bo
      */
     public String getCsvSeparator();
 
-    String getXmlAssignment(Assignment assignment);
+    /**
+     * @param assignment
+     * @return
+     */
+    public String getXmlAssignment(Assignment assignment);
 
-    String getGradeForUserInGradeBook(String assignmentId, String userId);
+    /**
+     * @param assignmentId
+     * @param userId
+     * @return
+     */
+    public String getGradeForUserInGradeBook(String assignmentId, String userId);
 
-    String getGradeDisplay(String grade, Assignment.GradeType typeOfGrade, Integer scaleFactor);
+    /**
+     * @param grade
+     * @param typeOfGrade
+     * @param scaleFactor
+     * @return
+     */
+    public String getGradeDisplay(String grade, Assignment.GradeType typeOfGrade, Integer scaleFactor);
 
-    String getMaxPointGradeDisplay(int factor, int maxGradePoint);
+    /**
+     * @param factor
+     * @param maxGradePoint
+     * @return
+     */
+    public String getMaxPointGradeDisplay(int factor, int maxGradePoint);
 
-    Optional<AssignmentSubmissionSubmitter> getSubmissionSubmittee(AssignmentSubmission submission);
+    /**
+     * @param submission
+     * @return
+     */
+    public Optional<AssignmentSubmissionSubmitter> getSubmissionSubmittee(AssignmentSubmission submission);
 
-    Collection<User> getSubmissionSubmittersAsUsers(AssignmentSubmission submission);
+    /**
+     * @param submission
+     * @return
+     */
+    public Collection<User> getSubmissionSubmittersAsUsers(AssignmentSubmission submission);
 
     /**
      * peer assessment is set for this assignment and the current time
@@ -637,9 +711,15 @@ public String getDeepLinkWithPermissions(String context, String assignmentId, bo
      */
     public boolean isPeerAssessmentClosed(Assignment assignment);
 
-    void resetAssignment(Assignment assignment);
+    /**
+     * @param assignment
+     */
+    public void resetAssignment(Assignment assignment);
 
-    void postReviewableSubmissonAttachments(String submissionId);
+    /**
+     * @param submissionId
+     */
+    public void postReviewableSubmissonAttachments(String submissionId);
 
     /**
     * This will return the internationalized title of the tool.
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
index 8d7e3d5a5464..65a6c6e11c18 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
@@ -452,7 +452,7 @@ public boolean allowGetAssignment(String context) {
     }
 
     @Override
-    public Collection getGroupsAllowAddAssignment(String context) {
+    public Collection<Group> getGroupsAllowAddAssignment(String context) {
         return getGroupsAllowFunction(SECURE_ACCESS_ASSIGNMENT, context, null);
     }
 
@@ -472,7 +472,7 @@ public boolean allowRemoveAssignment(String assignmentReference) {
     }
 
     @Override
-    public Collection getGroupsAllowRemoveAssignment(String context) {
+    public Collection<Group> getGroupsAllowRemoveAssignment(String context) {
         return getGroupsAllowFunction(SECURE_REMOVE_ASSIGNMENT, context, null);
     }
 
@@ -546,7 +546,7 @@ public List<User> allowGradeAssignmentUsers(String assignmentReference) {
     }
 
     @Override
-    public List allowAddAnySubmissionUsers(String context) {
+    public List<String> allowAddAnySubmissionUsers(String context) {
         List<String> rv = new ArrayList<>();
 
         try {
@@ -568,7 +568,7 @@ public List allowAddAnySubmissionUsers(String context) {
     }
 
     @Override
-    public List allowAddAssignmentUsers(String context) {
+    public List<User> allowAddAssignmentUsers(String context) {
         String resourceString = AssignmentReferenceReckoner.reckoner().context(context).reckon().getReference();
         return securityService.unlockUsers(SECURE_ADD_ASSIGNMENT, resourceString);
     }
@@ -1220,7 +1220,7 @@ private Map<User, AssignmentSubmission> getUserSubmissionMap(Assignment assignme
 //    }
 
     @Override
-    public AssignmentSubmission getSubmission(List submissions, User person) {
+    public AssignmentSubmission getSubmission(List<AssignmentSubmission> submissions, User person) {
         throw new UnsupportedOperationException("Method is deprecated, remove");
     }
 
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
index 54b115bf45e2..6d7be26f2125 100644
--- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
+++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -1054,6 +1054,7 @@ public String buildMainPanelContext(VelocityPortlet portlet, Context context, Ru
         context.put("tlang", rb);
         context.put("dateFormat", getDateFormatString());
         context.put("cheffeedbackhelper", this);
+        context.put("service", assignmentService);
 
         String contextString = (String) state.getAttribute(STATE_CONTEXT_STRING);
 
@@ -1383,7 +1384,11 @@ private String build_student_view_submission_context(VelocityPortlet portlet, Co
         if (assignment != null) {
             context.put("assignment", assignment);
             context.put("canSubmit", assignmentService.canSubmit(contextString, assignment));
-            // SAK-26322
+
+            Map<String, Reference> assignmentAttachmentReferences = new HashMap<>();
+            assignment.getAttachments().forEach(r -> assignmentAttachmentReferences.put(r, entityManager.newReference(r)));
+            context.put("assignmentAttachmentReferences", assignmentAttachmentReferences);
+
             if (assignment.getContentReview()) {
                 Map<String, String> properties = assignment.getProperties();
                 context.put("plagiarismNote", rb.getFormattedMessage("gen.yoursubwill", contentReviewService.getServiceName()));
@@ -1465,7 +1470,6 @@ private String build_student_view_submission_context(VelocityPortlet portlet, Co
             assignment_resubmission_option_into_context(context, state);
 
             if (assignment.getIsGroup()) {
-                context.put("assignmentService", assignmentService);
                 // get current site
                 Collection<Group> groups = null;
                 Site st = null;
@@ -1890,11 +1894,15 @@ protected String build_student_preview_submission_context(VelocityPortlet portle
         Assignment assignment = getAssignment(aReference, "build_student_preview_submission_context", state);
         if (assignment != null) {
             context.put("assignment", assignment);
+            context.put("assignmentReference", AssignmentReferenceReckoner.reckoner().assignment(assignment).reckon().getReference());
+            context.put("typeOfGradeString", getTypeOfGradeString(assignment.getTypeOfGrade()));
+            context.put("canSubmit", assignmentService.canSubmit((String) state.getAttribute(STATE_CONTEXT_STRING), assignment));
 
             AssignmentSubmission submission = getSubmission(aReference, user, "build_student_preview_submission_context", state);
-            context.put("submission", submission);
-
-            context.put("canSubmit", assignmentService.canSubmit((String) state.getAttribute(STATE_CONTEXT_STRING), assignment));
+            if (submission != null) {
+                context.put("submission", submission);
+                context.put("submissionReference", AssignmentReferenceReckoner.reckoner().submission(submission).reckon().getReference());
+            }
 
             setScoringAgentProperties(context, assignment, submission, false);
 
@@ -1916,7 +1924,6 @@ protected String build_student_preview_submission_context(VelocityPortlet portle
                 context.put("returnedFeedback", Boolean.TRUE);
                 state.removeAttribute(RETURNED_FEEDBACK);
             }
-
         }
 
         context.put("text", state.getAttribute(PREVIEW_SUBMISSION_TEXT));
@@ -1929,8 +1936,7 @@ protected String build_student_preview_submission_context(VelocityPortlet portle
         return template + TEMPLATE_STUDENT_PREVIEW_SUBMISSION;
     } // build_student_preview_submission_context
 
-    private void canViewAssignmentIntoContext(Context context,
-                                              Assignment assignment, AssignmentSubmission submission) {
+    private void canViewAssignmentIntoContext(Context context, Assignment assignment, AssignmentSubmission submission) {
         boolean canViewModelAnswer = assignmentSupplementItemService.canViewModelAnswer(assignment, submission);
         context.put("allowViewModelAnswer", Boolean.valueOf(canViewModelAnswer));
         if (canViewModelAnswer) {
@@ -1998,17 +2004,32 @@ protected String build_student_view_grade_context(VelocityPortlet portlet, Conte
         addDecoUrlMapToContext(session, context, false);
         SecurityAdvisor asgnAdvisor = pushSecurityAdvisor(session, "assignment.security.advisor", false);
 
-        AssignmentSubmission submission = null;
-        Assignment assignment = null;
         String submissionId = (String) state.getAttribute(VIEW_GRADE_SUBMISSION_ID);
-        submission = getSubmission(submissionId, "build_student_view_grade_context", state);
+        AssignmentSubmission submission = getSubmission(submissionId, "build_student_view_grade_context", state);
+        Assignment assignment = null;
         if (submission != null) {
             assignment = submission.getAssignment();
             context.put("assignment", assignment);
+
+            context.put("typeOfGradeString", getTypeOfGradeString(assignment.getTypeOfGrade()));
             if (assignment.getTypeOfSubmission() == Assignment.SubmissionType.NON_ELECTRONIC_ASSIGNMENT_SUBMISSION) {
                 context.put("nonElectronicType", Boolean.TRUE);
             }
+
+            context.put("users", assignmentService.getSubmissionSubmittersAsUsers(submission));
+
+            Map<String, Reference> assignmentAttachmentReferences = new HashMap<>();
+            assignment.getAttachments().forEach(r -> assignmentAttachmentReferences.put(r, entityManager.newReference(r)));
+            context.put("assignmentAttachmentReferences", assignmentAttachmentReferences);
+
             context.put("submission", submission);
+            Map<String, Reference> submissionAttachmentReferences = new HashMap<>();
+            submission.getAttachments().forEach(r -> submissionAttachmentReferences.put(r, entityManager.newReference(r)));
+            context.put("submissionAttachmentReferences", submissionAttachmentReferences);
+
+            Map<String, Reference> submissionFeedbackAttachmentReferences = new HashMap<>();
+            submission.getFeedbackAttachments().forEach(r -> submissionFeedbackAttachmentReferences.put(r, entityManager.newReference(r)));
+            context.put("submissionFeedbackAttachmentReferences", submissionFeedbackAttachmentReferences);
 
             if (assignment.getIsGroup()) {
                 String grade_override = (StringUtils.trimToNull(assignment.getProperties().get(AssignmentServiceConstants.PROP_ASSIGNMENT_ASSOCIATE_GRADEBOOK_ASSIGNMENT)) != null) && (assignment.getTypeOfGrade() == SCORE_GRADE_TYPE) ?
@@ -2119,7 +2140,6 @@ private String build_list_assignments_context(VelocityPortlet portlet, Context c
         String contextString = (String) state.getAttribute(STATE_CONTEXT_STRING);
         context.put("contextString", contextString);
         context.put("user", state.getAttribute(STATE_USER));
-        context.put("service", assignmentService);
         context.put("AuthzGroupService", authzGroupService);
         context.put("LongObject", Instant.now().toEpochMilli());
         context.put("currentTime", Instant.now());
@@ -3140,7 +3160,6 @@ protected String build_instructor_grade_submission_context(VelocityPortlet portl
         context.put("submissionTypeTable", submissionTypeTable());
         context.put("instructorAttachments", state.getAttribute(ATTACHMENTS));
         context.put("contentTypeImageService", contentTypeImageService);
-        context.put("service", assignmentService);
 
         // names
         context.put("name_grade_assignment_id", GRADE_SUBMISSION_ASSIGNMENT_ID);
@@ -3771,7 +3790,6 @@ private String build_instructor_preview_grade_submission_context(VelocityPortlet
         context.put("user", user);
         context.put("submissionTypeTable", submissionTypeTable());
         context.put("contentTypeImageService", contentTypeImageService);
-        context.put("service", assignmentService);
 
         // filter the feedback text for the instructor comment and mark it as red
         String feedbackText = (String) state.getAttribute(GRADE_SUBMISSION_FEEDBACK_TEXT);
@@ -3821,7 +3839,6 @@ private String build_instructor_grade_assignment_context(VelocityPortlet portlet
             return template + TEMPLATE_INSTRUCTOR_VIEW_STUDENTS_DETAILS;
         }
 
-        context.put("service", assignmentService);
         context.put("user", state.getAttribute(STATE_USER));
 
         // sorting related fields
@@ -3998,11 +4015,7 @@ private String build_instructor_grade_assignment_context(VelocityPortlet portlet
 
         context.put("submissionTypeTable", submissionTypeTable());
         context.put("attachments", state.getAttribute(ATTACHMENTS));
-
-
         context.put("contentTypeImageService", contentTypeImageService);
-        context.put("service", assignmentService);
-
         context.put("assignment_expand_flag", state.getAttribute(GRADE_ASSIGNMENT_EXPAND_FLAG));
         context.put("submission_expand_flag", state.getAttribute(GRADE_SUBMISSION_EXPAND_FLAG));
 
@@ -4485,8 +4498,6 @@ private String build_student_review_edit_context(VelocityPortlet portlet, Contex
         context.put("submissionTypeTable", submissionTypeTable());
         context.put("instructorAttachments", state.getAttribute(ATTACHMENTS));
         context.put("contentTypeImageService", contentTypeImageService);
-        context.put("service", assignmentService);
-        // names
         context.put("name_grade_assignment_id", GRADE_SUBMISSION_ASSIGNMENT_ID);
         context.put("name_feedback_comment", GRADE_SUBMISSION_FEEDBACK_COMMENT);
         context.put("name_feedback_text", GRADE_SUBMISSION_FEEDBACK_TEXT);
@@ -4673,8 +4684,6 @@ private String build_instructor_report_submissions(VelocityPortlet portlet, Cont
 
         pagingInfoToContext(state, context);
 
-        context.put("service", assignmentService);
-
         addAdditionalNotesToContext(submissions, context, state);
 
         String template = getContext(data).get("template");
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
index b5c146a5791a..449eb4adce74 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
@@ -205,9 +205,10 @@
 						## get submission instance only if 1) not an instructor type user or 2) is an instructor type user but in student view
 						#set($submission=false)
 						#set($submission=$service.getSubmission($assignment.Id, $user))
-						#set($submissionReturned=$!submission.returned)
-						#set($submissionSubmitted=$!submission.submitted)
-						#set($submissionProperties=$!submission.getProperties())
+						#set($submissionReference=$service.submissionReference($assignment.Context, $submission.Id, $assignment.Id))
+						#set($submissionReturned=$!submission.Returned)
+						#set($submissionSubmitted=$!submission.Submitted)
+						#set($submissionProperties=$!submission.Properties)
 						#set($submitTime=false)
 						#set ($submitTime = $submission.DateSubmitted)
 					#end
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm
index 397b28b4386b..bb3e5daf4be0 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm
@@ -1,192 +1,196 @@
 <!-- start: chef_assignments_student_preview_submission.vm -->
 <div class="portletBody">
+    <h3>
+        $tlang.getString("gen.assig")<span class="highlight"> - $tlang.getString("gen.pre")</span>
+    </h3>
 
-	<h3>
-		$tlang.getString("gen.assig")<span class="highlight"> - $tlang.getString("gen.pre")</span>
-	</h3>	
-
-    #set($allowUpdateAssignment=$!service.allowUpdateAssignment($assignment.Reference))
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $alertMessage</div><div class="clear"></div>#end
-	<table class="itemSummary" summary="$tlang.getString("gen.assdet")" border="0">
-		 <tr>
-			<th>
-				$tlang.getString("gen.title")
-			</th>
-			<td>
-                                #assignmentTitleIcon($assignment)
-				$validator.escapeHtml($assignment.getTitle())
-			</td>
-		</tr>
-		<tr>
-			<th>
-				$tlang.getString("gen.due"):
-			</th>
-			<td>
-
-                #if ($assignment.getContent().getHideDueDate() != "true" || $!allowUpdateAssignment)
-                    $!assignment.dueTime.toStringLocalFull()
+    #set($allowUpdateAssignment = $!service.allowUpdateAssignment($assignmentReference))
+    #if ($alertMessage)
+        <div class="alertMessage">$tlang.getString("gen.alert") $alertMessage</div>
+        <div class="clear"></div>#end
+    <table class="itemSummary" summary="$tlang.getString("gen.assdet")" border="0">
+        <tr>
+            <th>
+                $tlang.getString("gen.title")
+            </th>
+            <td>
+                #assignmentTitleIcon($assignment)
+				$validator.escapeHtml($assignment.Title)
+            </td>
+        </tr>
+        <tr>
+            <th>
+                $tlang.getString("gen.due"):
+            </th>
+            <td>
+                #if (!$!assignment.HideDueDate || $!allowUpdateAssignment)
+                    $!assignment.DueDate.toString()
                 #end
-			</td>
-		</tr>
-		#if($assignment.getContent().getTypeOfSubmission() != 4)
-			##resubmit number
-			#if($!resubmitNumber)
-				<tr>
-					<th>
-						$tlang.getString("allow.resubmit.number")
-					</th>
-					<td>
-						$resubmitNumber
-					</td>
-				</tr>
-			#end
-			## resubmit close time
-			#if ($!resubmitCloseTime)
-				<tr>
-					<th>
-						$tlang.getString("allow.resubmit.closeTime")
-					</th>
-					<td>
-						$resubmitCloseTime
-					</td>
-				</tr>
-			#end
-		#end
-		#if ($withGrade)	
-			<tr>
-				<th>
-					$tlang.getString("gen.status")
-				</th>
-				<td>
-					#if ($!submission)
-						$!submission.Status
+            </td>
+        </tr>
+        #if($assignment.TypeOfSubmission.ordinal() != 4)
+            ##resubmit number
+            #if($!resubmitNumber)
+                <tr>
+                    <th>
+                        $tlang.getString("allow.resubmit.number")
+                    </th>
+                    <td>
+                        $resubmitNumber
+                    </td>
+                </tr>
+            #end
+            ## resubmit close time
+            #if ($!resubmitCloseTime)
+                <tr>
+                    <th>
+                        $tlang.getString("allow.resubmit.closeTime")
+                    </th>
+                    <td>
+                        $resubmitCloseTime
+                    </td>
+                </tr>
+            #end
+        #end
+        #if ($withGrade)
+            <tr>
+                <th>
+                    $tlang.getString("gen.status")
+                </th>
+                <td>
+                    #if ($!submission)
+						$!service.getSubmissionStatus($!submission)
 					#else
-						$tlang.getString("gen.notsta")
-					#end
-				</td>
-			</tr>	
-			<tr>
-				<th>
-					$tlang.getString("gen.grasca")
-				</th>
-				<td>
-					#set ($gradeScale = $assignment.getContent().getTypeOfGradeString())
-					$gradeScale
-					#if ($gradeTypeTable.get($assignment.getContent().getTypeOfGrade()) == $!tlang.getString("points"))
-						($tlang.getString("stupresub.max") $assignment.getContent().getMaxGradePointDisplay())
-					#end
-					
-					<!--for grading via an external scoring service, if enabled for an associated gradebook item -->
-					#if($scoringComponentEnabled)
-						#parse ("/vm/assignment/chef_assignments_scoring_agent.vm")	
-					#end
+                        $tlang.getString("gen.notsta")
+                    #end
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    $tlang.getString("gen.grasca")
+                </th>
+                <td>
+                    #set ($gradeScale = $!typeOfGradeString)
+                    $gradeScale
+                    #if ($!assignment.TypeOfGrade.ordinal() == 3)
+                        ($tlang.getString("stupresub.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint))
+                    #end
+
+                    ## for grading via an external scoring service, if enabled for an associated gradebook item
+                    #if($scoringComponentEnabled)
+                        #parse ("/vm/assignment/chef_assignments_scoring_agent.vm")
+                    #end
 
-				</td>
-			</tr>
-		#end
-		##show alert when assignment is modified and the modified date is after its open date
-		#set($newAssignment="false")
-		#set($newAssignment=$assignment.getProperties().getProperty("newAssignment"))
-		#if ($assignment.getTimeLastModified().after($assignment.getOpenTime()) && !$!newAssignment.equalsIgnoreCase("true"))
-			<tr>
-				<th>
-						$tlang.getString("gen.modbyins")
-				</th>
-				<td>
-						$assignment.getTimeLastModified().toStringLocalFull()
-				</td>
-			</tr>	
-		#end
-	</table>
-	<h4>
-		$tlang.getString("gen.submission")
-	</h4>
-	#if ($!text.length()>0)
-		<div class="textPanel">
-			$validator.escapeHtmlFormattedText($text)
-		</div>	
-	#end
-	#set ($size = 0)
-	#set ($props = false)
-	#foreach ($attachment in $attachments) 
-		#set ($props = $attachment.Properties) 
-		#if ($!props)
-			#set ($size = $size + 1)
-		#end
-	#end
-	#if ($size == 0)
-	##							$tlang.getString("gen.noatt")
-	#else
-		<h4>
-			#if ($assignment.getContent().getTypeOfSubmission() == 5)
+                </td>
+            </tr>
+        #end
+        ## show alert when assignment is modified and the modified date is after its open date
+        #set($newAssignment="false")
+        #set($newAssignment=$assignment.getProperties().get("newAssignment"))
+        #if ($!assignment.DateModified.after($assignment.OpenDate) && !$!newAssignment.equalsIgnoreCase("true"))
+            <tr>
+                <th>
+                    $tlang.getString("gen.modbyins")
+                </th>
+                <td>
+                    $assignment.DateModified.toString()
+                </td>
+            </tr>
+        #end
+    </table>
+    <h4>
+        $tlang.getString("gen.submission")
+    </h4>
+    #if ($!text.length() > 0)
+        <div class="textPanel">
+            $validator.escapeHtmlFormattedText($text)
+        </div>
+    #end
+
+    #set ($size = 0)
+    #set ($props = false)
+    #foreach ($attachment in $attachments)
+        #set ($props = $attachment.Properties)
+        #if ($!props)
+            #set ($size = $size + 1)
+        #end
+    #end
+    #if ($size > 0)
+        <h4>
+            #if ($!assignment.TypeOfSubmission.ordinal() == 5)
 				$tlang.getString("gen.att.single")
 			#else
-				$tlang.getString("gen.att")
-			#end
-		</h4>	
-			<ul class="attachList indnt1">
-				#foreach ($attachment in $attachments) 
-					#set ($props = false)
-					#set ($props = $attachment.Properties) 
-					#if ($!props)
-						<li>
-							#if ($props.getBooleanProperty($props.NamePropIsCollection))
-								<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-							#else
-								<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-							#end
-							<a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>						
-							#propertyDetails($props)
-						</li>
-					#end
-				#end
-			</ul>
-	#end	
-<p></p>
-	#if ($assignment.getContent().honorPledge!=1) 
-		#if ($honor_pledge_yes.equals("true"))
-			<p class="checkbox highlightPanel">
-				<label for="yes">$honor_pledge_text</label>
-				<input name="Yes" type="checkbox" value="" checked="checked" id="yes"  disabled="disabled" />
-			</p>	
-		#else
-			<div class="alertMessage indnt1" style="width:40%">
-				$tlang.getString("gen.honple2val")
-			</div>
-				<p class="checkbox highlightPanel">
-					<label for="yes">$honor_pledge_text</label>
-					<input name="Yes" type="checkbox" value="" disabled="disabled" />
-				</p>
+                $tlang.getString("gen.att")
+            #end
+        </h4>
+        <ul class="attachList indnt1">
+            #foreach ($attachment in $attachments)
+                #set ($props = false)
+                #set ($props = $attachment.Properties)
+                #if ($!props)
+                    <li>
+                        #if ($props.getBooleanProperty($props.NamePropIsCollection))
+                            <img src="#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")"/>
+                        #else
+                            <img src="#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")"/>
+                        #end
+                        <a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                        #propertyDetails($props)
+                    </li>
+                #end
+            #end
+        </ul>
+    #end
 
-		#end
-		##	$tlang.getString("gen.title")
-	 #end
-	<form id="addSubmissionForm" name="addSubmissionForm" action="#toolForm("AssignmentAction")" method="post" onsubmit="return true;">
-		<input type="hidden" name="assignmentId" value="$assignment.Id" />
-		<input type="hidden" name="eventSubmit_doRead_add_submission_form" value="x" />
-		<input type="hidden" name="option" id="option" value="cancel" />
-		## submission information
-		#set($timeSubmitted=false)
-		#set($timeSubmitted=$submission.TimeSubmitted)
-		#set($submitted=false)
-		#set($submitted=$submission.getSubmitted())
-		<div class="act">
-			#if (!$!canSubmit)
-					<input name="eventSubmit_doSave_submission" type="submit" value="$tlang.getString("gen.sav")" disabled="disabled" />
-					<input name="eventSubmit_doPost_submission" type="submit" value="$tlang.getString("gen.subm3")" disabled="disabled" />
-					<input name="eventSubmit_doCancel_show_submission" type="submit" value="$tlang.getString("gen.revi")" disabled="disabled" />
-			#else
-					#if ($submitted && $!timeSubmitted)
-						#set($name=$tlang.getString("resubmit"))
-					#else
-						#set($name=$tlang.getString("gen.subm3"))
-					#end
-				<input type="button" class="active" name="post" accesskey="s" id="post" value="$!name" onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'post', null, null ); return false;" />
-				<input class="disableme" type="button" accesskey="d" name="save" id="save" value="$tlang.getString("gen.savdra")" onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'save', null, null ); return false;" />
-				<input class="disableme" type="button" name="revise" accesskey="r" id="revise" value="$tlang.getString("gen.revi")" onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'revise', null, null ); return false;" />
-			#end
-		</div>
-		<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
-	</form>
+    <p></p>
+    #if ($!assignment.HonorPledge)
+        #if ($honor_pledge_yes.equals("true"))
+            <p class="checkbox highlightPanel">
+                <label for="yes">
+                    <input name="Yes" type="checkbox" value="" checked="checked" id="yes" disabled="disabled"/>
+                    $honor_pledge_text
+                </label>
+            </p>
+        #else
+            <div class="alertMessage indnt1" style="width:40%">
+                $tlang.getString("gen.honple2val")
+            </div>
+            <p class="checkbox highlightPanel">
+                <label for="yes">
+                    <input name="Yes" type="checkbox" value="" disabled="disabled"/>
+                    $honor_pledge_text
+                </label>
+            </p>
+
+        #end
+    #end
+    <form id="addSubmissionForm" name="addSubmissionForm" action="#toolForm("AssignmentAction")" method="post" onsubmit="return true;">
+        <input type="hidden" name="assignmentId" value="$!assignmentReference"/>
+        <input type="hidden" name="eventSubmit_doRead_add_submission_form" value="x"/>
+        <input type="hidden" name="option" id="option" value="cancel"/>
+        ## submission information
+        <div class="act">
+            #if (!$!canSubmit)
+                <input name="eventSubmit_doSave_submission" type="submit" value="$tlang.getString("gen.sav")" disabled="disabled"/>
+                <input name="eventSubmit_doPost_submission" type="submit" value="$tlang.getString("gen.subm3")" disabled="disabled"/>
+                <input name="eventSubmit_doCancel_show_submission" type="submit" value="$tlang.getString("gen.revi")" disabled="disabled"/>
+            #else
+                #if ($!submission.Submitted && $!submission.DateSubmitted)
+                    #set($name=$tlang.getString("resubmit"))
+                #else
+                    #set($name=$tlang.getString("gen.subm3"))
+                #end
+                <input type="button" class="active" name="post" accesskey="s" id="post" value="$!name"
+                       onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'post', null, null ); return false;"/>
+                <input class="disableme" type="button" accesskey="d" name="save" id="save"
+                       value="$tlang.getString("gen.savdra")"
+                       onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'save', null, null ); return false;"/>
+                <input class="disableme" type="button" name="revise" accesskey="r" id="revise"
+                       value="$tlang.getString("gen.revi")"
+                       onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'addSubmissionForm', 'revise', null, null ); return false;"/>
+            #end
+        </div>
+        <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token"/>
+    </form>
 </div>
 <!-- end: chef_assignments_student_preview_submission.vm -->
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm
index 54981f6f5c4d..341e20f63b5a 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm
@@ -1,513 +1,545 @@
 <!-- start: chef_assignments_student_view_grade.vm  -->
 <script type="text/javascript">
-    $(document).ready(function(){
+    $(document).ready(function () {
         ASN.setupToggleAreas('toggleAnchor', 'toggledContent', false, 'fast');
-        $( "#accordion" ).accordion({
-	        	heightStyle: 'content',
-	        	active: 0,
-	        	collapsible: true,
-	        	change: function(event, ui){
-	                    ASN.resizeFrame();
-	            },
-	            activate: function(event, ui){
-	                    ASN.resizeFrame();
-	            }
-            }
+        $("#accordion").accordion({
+                    heightStyle: 'content',
+                    active: 0,
+                    collapsible: true,
+                    change: function (event, ui) {
+                        ASN.resizeFrame();
+                    },
+                    activate: function (event, ui) {
+                        ASN.resizeFrame();
+                    }
+                }
         );
     });
 </script>
 <div class="portletBody">
-	#set ($assignment = $submission.Assignment)
-	#if ($taggable)
-		#if (!$itemHelpers.isEmpty())
-		<ul class="navIntraTool actionToolBar">
-				#set ($first = true)
-				#foreach ($helperInfo in $itemHelpers)
-					#if (!$first)
-						<li  class="firstToolBarItem">
-							<span><a href="#toolLinkParam("$action" "doHelp_item" "itemRef=$validator.escapeUrl($item.reference)&providerId=$validator.escapeUrl($helperInfo.provider.id)")" title="$!helperInfo.description">$!helperInfo.name</a></span>
-						</li>	
-					#else
-						#set ($first = false)
-						<li>	
-						<span><a href="#toolLinkParam("$action" "doHelp_item" "itemRef=$validator.escapeUrl($item.reference)&providerId=$validator.escapeUrl($helperInfo.provider.id)")" title="$!helperInfo.description">$!helperInfo.name</a></span>
-					#end
-				#end
-			</ul>
-		#end
-	#end
-	<h3>
-	$validator.escapeHtml($assignment.getTitle())
-                        #if ($!assignment.isGroup() )
-                           <span> - $tlang.getString("gen.groupassignment") </span>
+    #if ($taggable)
+        #if (!$itemHelpers.isEmpty())
+            <ul class="navIntraTool actionToolBar">
+                #set ($first = true)
+                #foreach ($helperInfo in $itemHelpers)
+                    #if (!$first)
+                        <li class="firstToolBarItem">
+                            <span><a href="#toolLinkParam("$action" "doHelp_item" "itemRef=$validator.escapeUrl($item.reference)&providerId=$validator.escapeUrl($helperInfo.provider.id)")" title="$!helperInfo.description">$!helperInfo.name</a></span>
+                        </li>
+                    #else
+                        #set ($first = false)
+                    <li>
+                        <span><a href="#toolLinkParam("$action" "doHelp_item" "itemRef=$validator.escapeUrl($item.reference)&providerId=$validator.escapeUrl($helperInfo.provider.id)")" title="$!helperInfo.description">$!helperInfo.name</a></span>
+                    #end
+                #end
+            </ul>
+        #end
+    #end
+    <h3>$validator.escapeHtml($assignment.Title)
+        #if ($!assignment.IsGroup)
+            <span> - $tlang.getString("gen.groupassignment") </span>
+        #end
+        #if ($submission.Returned)
+            <span class="highlight"> - $tlang.getString("gen.returned")</span>
+        #elseif (!$submission.Submitted)
+            <span class="highlight"> - $!service.getSubmissionStatus($!submission.Id) </span>
+        #elseif (!$!nonElectronicType && $!submission.UserSubmission)
+            <span class="highlight"> - $tlang.getString("gen.subm4")</span>
+        #end
+    </h3>
+
+    #if ($alertMessage)
+        <div class="alertMessage">$tlang.getString("gen.alert") $alertMessage</div>
+    #end
+
+    #set($submitTime=false)
+    #set($submitTime=$submission.DateSubmitted)
+    #set($returnTime=false)
+    #set($returnTime=$submission.DateReturned)
+    <table class="itemSummary" summary="$tlang.getString("stuviewgrad.thegradet")">
+        <tr>
+            <th>
+                $tlang.getString("gen.title")
+            </th>
+            <td valign="top">
+                #assignmentTitleIcon($assignment) $validator.escapeHtml($assignment.title)
+            </td>
+        </tr>
+        #if ($!assignment.IsGroup)
+            <tr>
+                <th>
+                    $tlang.getString('gen.group')
+                </th>
+                <td>
+                    #set($aGroup = $!site.getGroup($submission.GroupId))
+                    #if ($aGroup)
+                        $aGroup.Title
+                    #else
+                        $tlang.getString("group.submission.not.found")
+                    #end
+                </td>
+            </tr>
+        #end
+        <tr>
+            <th>
+                #if ($!assignment.IsGroup)
+                    $tlang.getString("gen.students")
+                #else
+                    $tlang.getString("gen.student")
+                #end
+            </th>
+            <td>
+                #if (!$privateView)
+                    #foreach ($user in $!users)
+                        $validator.escapeHtml($user.DisplayName)<br/>
+                    #end
+                #end
+            </td>
+        </tr>
+        #if ($!assignment.TypeOfSubmission.ordinal() != 4)
+            ## exclude non-electronic type of submission
+            <tr>
+                <th>
+                    $tlang.getString("gen.subm5")
+                </th>
+                <td>
+                    ## get submit time
+                    #if ($!submitTime)
+                        $submitTime.toString()
+                    #end
+                    <br/>
+                </td>
+            </tr>
+        #end
+        #if ($withGrade)
+            #set ($gradeScale = $!typeOfGradeString)
+            #if ($!submission.Graded && $!submission.GradeReleased)
+                <tr>
+                    <th>
+                        $tlang.getString("gen.gra")
+                    </th>
+                    <td class="highlight">
+                        <strong>
+                            #if ($!assignment.TypeOfGrade.ordinal() != 1)
+                                #if ($!override)
+                                    $override
+                                #else
+                                    $!service.getGradeDisplay($!submission.Grade, $!assignment.TypeOfGrade, $!assignment.ScaleFactor)
+                                #end
+                            #else
+                                $tlang.getString("gen.nograd")
+                            #end
+                            #if ($!assignment.TypeOfGrade.ordinal() == 3)
+                                ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint))
+
+                                ## for grading via an external scoring service, if enabled for an associated gradebook item
+                                #if($scoringComponentEnabled)
+                                    #parse ("/vm/assignment/chef_assignments_scoring_agent.vm")
+                                #end
+                            #end
+                        </strong>
+                    </td>
+                </tr>
+            #else
+                <tr>
+                    <th>
+                        $tlang.getString("gen.grasca")
+                    </th>
+                    <td>
+                        $gradeScale
+                        #if ($!assignment.TypeOfGrade.ordinal() == 3)
+                            ($tlang.getString("grade.max") $!assignment.MaxGradePoint)
+
+                            ## for grading via an external scoring service, if enabled for an associated gradebook item
+                            #if($scoringComponentEnabled)
+                                #parse ("/vm/assignment/chef_assignments_scoring_agent.vm")
+                            #end
                         #end
-			#if ($submission.Returned)
-						<span class="highlight"> - $tlang.getString("gen.returned")</span>
-                        #elseif (!$submission.getSubmitted())
-                                <span class="highlight"> - $submission.getStatus() </span>
-			#elseif (!$!nonElectronicType && $!submission.isUserSubmission())
-				<span class="highlight"> - $tlang.getString("gen.subm4")</span>
-			#end
-		</h3>
+                    </td>
+                </tr>
+            #end
+        #end
 
-		#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $alertMessage</div>#end
-		#set($submitTime=false)
-		#set($submitTime=$submission.getTimeSubmitted())
-		#set($returnTime=false)
-		#set($returnTime=$submission.getTimeReturned())
-			<table class="itemSummary" summary="$tlang.getString("stuviewgrad.thegradet")">
-				<tr>
-					<th>
-						$tlang.getString("gen.title")
-					</th>
-					<td valign="top">
-                                            #assignmentTitleIcon($assignment)
-                                            $validator.escapeHtml($assignment.title)
-					</td>
-				</tr>
-				#if ($!assignment.isGroup())
-				<tr>
-					<th>
-						$tlang.getString('gen.group')
-                                 	</th>
-                                        <td>
-                                        #set($aGroup = $!site.getGroup($submission.getSubmitterId()))
-                                        #if ($aGroup)
-                                                $aGroup.getTitle()
-                                        #else
-                                                $tlang.getString("group.submission.not.found")
-                                        #end
-                                        </td>
-                                </tr>
-				#end
-				<tr>
-					<th>
-                                                #if ($!assignment.isGroup() )
-                                                    $tlang.getString("gen.students")
-                                                #else
-						$tlang.getString("gen.student")
-                                                #end
-				 </th>
-					<td>
-						#if (!$privateView)
-							#set ($submitters = $submission.submitters)
-							#foreach ($submitter in $submitters)
-								$validator.escapeHtml($submitter.DisplayName)<br />
-							#end
-						#end
-					</td>
-				</tr>
-				#if ($!submissionType != 4)
-					## exclude non-electronic type of submission
-					<tr>
-						<th>
-							$tlang.getString("gen.subm5") 
-						</th>
-						<td>
-							## get submit time
-							#if($!submitTime)$submitTime.toStringLocalFull()#end<br />
-						</td>
-					</tr>
-				#end
-				#if ($withGrade)
-					#set ($gradeScale = $assignment.getContent().getTypeOfGradeString())
-					#if ($submission.getGraded() && $submission.getGradeReleased())
-						<tr>	
-							<th>
-								$tlang.getString("gen.gra")
-							</th>
-							<td class="highlight">
-								<strong>
-									#if ($assignment.getContent().TypeOfGrade != 1)
-                                                                               #if($!override)$override#else$submission.GradeDisplay#end
-									#else
-										$tlang.getString("gen.nograd")
-									#end
-									#if ($gradeTypeTable.get($assignment.getContent().getTypeOfGrade()) == $!tlang.getString("points"))
-										($tlang.getString("grade.max") $assignment.getContent().getMaxGradePointDisplay())
-										
-										<!--for grading via an external scoring service, if enabled for an associated gradebook item -->
-										#if($scoringComponentEnabled)
-											#parse ("/vm/assignment/chef_assignments_scoring_agent.vm")	
-								        #end
-								        
-									#end
-								</strong>
-							</td>
-						</tr>
-					#else
-						<tr>	
-							<th>
-								$tlang.getString("gen.grasca")
-							</th>
-							<td>
-								$gradeScale
-								#if ($gradeTypeTable.get($assignment.getContent().getTypeOfGrade()) == $!tlang.getString("points"))
-									($tlang.getString("grade.max") $assignment.getContent().getMaxGradePointDisplay())
-									
-									<!--for grading via an external scoring service, if enabled for an associated gradebook item -->
-									#if($scoringComponentEnabled)
-										#parse ("/vm/assignment/chef_assignments_scoring_agent.vm")	
-								    #end
-							        
-								#end
-							</td>
-						</tr>
-					#end
-				#end
+        ## Display content-review results when appropriate. If the assignment is non-electronic, we show content-review results if they exist
+        ## (happens when accepted submission type switched from something else)
+##      TODO Content Review Service
+##        #if($allowReviewService && $assignment.getContent().AllowReviewService && $assignment.getContent().AllowStudentViewReport && ($assignment.getContent().getTypeOfSubmission() != 4 || $submission.getContentReviewResults().size() > 0))
+##            <tr>
+##                <th>
+##                    $reviewServiceName&nbsp;$tlang.getString("review.report")
+##                </th>
+##                <td>
+##                    #if (!$submission)
+##                        $tlang.getString("review.notavail")
+##                    #else
+##                        #set($reviewResults=$submission.ContentReviewResults)
+##                        #if ($reviewResults.size() >= 3)
+##                            <div class="discTria">
+##                                <input class="disclosureTriangle" type="image"
+##                                       onclick="ASN.handleReportsTriangleDisclosure(this,this.parentNode.parentNode.children[1]); return false;"
+##                                       src="/library/image/sakai/expand.gif"
+##                                       alt="$tlang.getString('review.report.expand')"/>
+##                                ## TODO: reconsider for i18n
+##                                $reviewResults.size() $tlang.getString("review.reports")
+##                            </div>
+##                        <div id="reportsDiv" style="display:none;">
+##                        #end
+##                        #foreach ($reviewResult in $reviewResults)
+##                            <div>
+##                                #set ($props = $reviewResult.getContentResource().Properties)
+##                                <span class="reportIcon">
+##											#if (!$reviewResult.getReviewReport().equals("Error"))<a
+##                                                    href="$reviewResult.getReviewReport()" target="_blank">#end
+##                                    <span class="$reviewResult.getReviewIconCssClass()"
+##                                          title="#if($reviewResult.getReviewReport().equals(
+##                                              "Error"))$reviewResult.getReviewError()#{else}$reviewResult.getReviewScore()#end"></span>
+##                                    #if (!$reviewResult.getReviewReport().equals("Error"))</a>#end
+##										</span>
+##                                #if ($reviewResult.isInline())
+##                                    $tlang.getString("submission.inline")
+##                                #else
+##                                    $validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))
+##                                #end
+##                            </div>
+##                        #end
+##                        #if ($reviewResults.size() >= 3)
+##                        </div>
+##                        #end
+##                    #end
+##                </td>
+##
+##            </tr>
+##        #end
+
+##        TODO Submission Log
+##        #if ($!submission && $!submission.getSubmissionLog().size() > 0)
+##            <tr>
+##                <th>$tlang.getString("gen.history")</th>
+##                <td>
+##                    #foreach ($entry in $submission.getSubmissionLog())
+##                        $entry<br>
+##                    #end
+##                </td>
+##            </tr>
+##        #end
+    </table>
+##    TODO Content Review Service
+##    #if($assignment.getContent().AllowReviewService && $assignment.getContent().AllowStudentViewReport)
+##        <div id="report" style='display:none'>$submission.getReviewReport()</div>
+##    #end
+
+    <h4>
+        $tlang.getString("gen.instr")
+    </h4>
+
+    #if ($!assignment.Instructions.length() > 0)
+        <div class="textPanel">$validator.escapeHtmlFormattedText($!assignment.Instructions)</div>
+    #end
+
+    ## Assignment Attachments
+    #set ($attachments = $assignment.Attachments)
+    #if ($attachments)
+        #set ($size = $attachments.size())
+        #if ($size < 1)
+            $tlang.getString("gen.noatt")
+        #else
+            <h4>
+                $tlang.getString("gen.addres2")
+            </h4>
+            <ul class="attachList indnt1">
+                #foreach ($attachmentReference in $attachments)
+                    #set ($reference = $assignmentAttachmentReferences.get($attachmentReference))
+                    #if ($reference)
+                        #set ($props = false)
+                        #set ($props = $reference.Properties)
+                        #if ($!props)
+                            <li>
+                                #if ($props.getBooleanProperty($props.NamePropIsCollection))
+                                    <img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
+                                #else
+                                    <img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
+                                #end
+                                #if ($decoratedUrlMap)
+                                    <a href="$decoratedUrlMap.get($reference.Url)" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                #else
+                                    <a href="$reference.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                #end
+                                #propertyDetails($props)
+                            </li>
+                        #end
+                    #end
+                #end
+            </ul>
+        #end
+    #end
+
+    ## Assignment Model Answer
+    #if($allowViewModelAnswer)
+        <h4 id="toggleModel" class="toggleAnchor specialLink">
+            <img alt="expand" class="expand" src="/library/image/sakai/expand.gif"/>
+            <img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif"/>
+            $tlang.getString('modelAnswer')
+        </h4>
+        <div class="model toggledContent">
+            <p>$validator.escapeHtml($!assignmentModelAnswerItem.getText())</p>
+            #set ($mAttachments = $!assignmentModelAnswerItem.getAttachmentObjectSet())
+            <ul class="attachList">
+                #set ($size = 0)
+                #set ($props = false)
+                #foreach ($attachment in $!mAttachments)
+                    #set ($props = $attachment.Properties)
+                    #if ($!props)
+                        #set ($size = $size + 1)
+                    #end
+                #end
+                #if ($size == 0)
+                    <<p class="instruction">
+                    #if ($!assignment.TypeOfSubmission.ordinal() == 5)
+                        $tlang.getString("gen.noatt.single")
+                    #else
+                        $tlang.getString("gen.noatt")
+                    #end
+                </p>
+                #else
+                    #foreach ($attachment in $mAttachments)
+                        #set ($props = false)
+                        #set ($props = $attachment.Properties)
+                        #if ($!props)
+                            <li>
+                                #if ($props.getBooleanProperty($props.NamePropIsCollection))
+                                    <img src="#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")"/>
+                                #else
+                                    <img src="#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")"/>
+                                #end
+                                <a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                #propertyDetails($props)
+                            </li>
+                        #end
+                    #end
+                #end
+            </ul>
+        </div>
+    #end
+    #if ($!allowReadAssignmentNoteItem)
+        <h4 id="toggleNotes" class="toggleAnchor specialLink">
+            <img alt="expand" class="expand" src="/library/image/sakai/expand.gif"/>
+            <img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif"/>
+            $tlang.getString('note.label')
+        </h4>
+        <div class="notes toggledContent">
+            $validator.escapeHtml($!assignmentNoteItem.getNote())
+        </div>
+    #end
+
+    ## All Purpose
+    #if ($!allowViewAllPurposeItem)
+        <h4 id="toggleAllPurpose" class="toggleAnchor specialLink">
+            <img alt="expand" class="expand" src="/library/image/sakai/expand.gif"/>
+            <img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif"/>
+            $tlang.getString('allPurpose')
+        </h4>
+        <div class="allPurpose toggledContent">
+            <p>$validator.escapeHtml($!assignmentAllPurposeItem.getTitle())</p>
+            <p>$validator.escapeHtml($!assignmentAllPurposeItem.getText())</p>
+            #set ($aAttachments = $!assignmentAllPurposeItem.getAttachmentObjectSet())
+            <ul class="attachList">
+                #set ($size = 0)
+                #set ($props = false)
+                #foreach ($attachment in $!aAttachments)
+                    #set ($props = $attachment.Properties)
+                    #if ($!props)
+                        #set ($size = $size + 1)
+                    #end
+                #end
+                #if ($size == 0)
+                    <p class="instruction">
+                        #if ($!assignment.TypeOfSubmission.ordinal() == 5)
+                            $tlang.getString("gen.noatt.single")
+                        #else
+                            $tlang.getString("gen.noatt")
+                        #end
+                    </p>
+                #else
+                    #foreach ($attachment in $aAttachments)
+                        #set ($props = false)
+                        #set ($props = $attachment.Properties)
+                        #if ($!props)
+                            <li>
+                                #if ($props.getBooleanProperty($props.NamePropIsCollection))
+                                    <img src="#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")"/>
+                                #else
+                                    <img src="#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")"/>
+                                #end
+                                <a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                #propertyDetails($props)
+                            </li>
+                        #end
+                    #end
+                #end
+            </ul>
+        </div>
+    #end
+    #if ($taggable)
+        #parse ("/vm/assignment/chef_assignments_tags_list.vm")
+    #end
+    <hr class="itemSeparator"/>
+    ## show instructor feedback if the submission is (1) graded and release or (2) returned
+    #if (($submission.Graded && $submission.GradeReleased) || $submission.Returned)
+        ## show feedback text when submission is released or returned
+        #if ($!submission.FeedbackText && ($submission.FeedbackText.length() > 0))
+            <h5>$tlang.getString("gen.orisub2")</h5>
+            <div class="textPanel">$submission.FeedbackText</div>
+        #else
+            #set ($text = $submission.SubmittedText)
+            #if ($!text && $text.length() > 0)
+                <h4>$tlang.getString("gen.orisub")</h4>
+                <div class="textPanel">$submission.SubmittedText</div>
+            #end
+        #end
+    #else
+        #set ($text = $submission.SubmittedText)
+        #if ($!text && $text.length() > 0)
+            <h4>$tlang.getString("gen.orisub")</h4>
+            <div class="textPanel">$submission.SubmittedText</div>
+        #end
+    #end
 
-				## Display content-review results when appropriate. If the assignment is non-electronic, we show content-review results if they exist 
-				## (happens when accepted submission type switched from something else)
-				#if($allowReviewService && $assignment.getContent().AllowReviewService && $assignment.getContent().AllowStudentViewReport && ($assignment.getContent().getTypeOfSubmission() != 4 || $submission.getContentReviewResults().size() > 0))
-					<tr>
-						<th>
-							$reviewServiceName&nbsp;$tlang.getString("review.report")
-						</th>
-							<td>
-							#if (!$submission)
-								$tlang.getString("review.notavail")
-							#else
-								#set($reviewResults=$submission.ContentReviewResults)
-								#if ($reviewResults.size() >= 3)
-									<div class="discTria">
-										<input class="disclosureTriangle" type="image" onclick="ASN.handleReportsTriangleDisclosure(this,this.parentNode.parentNode.children[1]); return false;" src="/library/image/sakai/expand.gif" alt="$tlang.getString('review.report.expand')"/>
-										## TODO: reconsider for i18n
-										$reviewResults.size() $tlang.getString("review.reports")
-									</div>
-									<div id="reportsDiv" style="display:none;">
-								#end
-								#foreach ($reviewResult in $reviewResults)
-									<div>
-										#set ($props = $reviewResult.getContentResource().Properties)
-										<span class="reportIcon">										
-											#if (!$reviewResult.getReviewReport().equals("Error"))<a href="$reviewResult.getReviewReport()" target="_blank">#end
-											<span class="$reviewResult.getReviewIconCssClass()" title="#if($reviewResult.getReviewReport().equals("Error"))$reviewResult.getReviewError()#{else}$reviewResult.getReviewScore()#end"></span>
-											#if (!$reviewResult.getReviewReport().equals("Error"))</a>#end
-										</span>
-										#if ($reviewResult.isInline())
-											$tlang.getString("submission.inline")
-										#else
-											$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))
-										#end
-									</div>
-								#end
-								#if ($reviewResults.size() >= 3)
-									</div>
-								#end
-							#end
-							</td>
-				
-					</tr>
-				#end
-			        #if ($!submission && $!submission.getSubmissionLog().size() > 0)
-                                        <tr>
-                                                <th>$tlang.getString("gen.history")</th>
-                                                <td>
-                                                        #foreach ($entry in $submission.getSubmissionLog())
-                                                                $entry<br>
-                                                        #end
-                                                </td>
-                                        </tr>
+    ## Submission Attachments
+    #set ($attachments = $submission.Attachments)
+    #if ($attachments)
+        #set ($size = $attachments.size())
+        #if ($size < 1)
+            $tlang.getString("gen.noattsubmitted")
+        #else
+            <h4>
+                #if ($assignment.TypeOfSubmission.ordinal() == 5)
+                    $tlang.getString("gen.stuatt.single")
+                #else
+                    $tlang.getString("gen.stuatt")
+                #end
+            </h4>
+            <ul class="attachList indnt1">
+                #foreach ($attachmentReference in $attachments)
+                    #set ($reference = $submissionAttachmentReferences.get($attachmentReference))
+                    #if ($reference)
+                        #set ($props = false)
+                        #set ($props = $reference.Properties)
+                        #if ($!props)
+                            <li>
+                                #if ($props.getBooleanProperty($props.NamePropIsCollection))
+                                    <img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
+                                #else
+                                    <img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
                                 #end
-			</table>
-		#if($assignment.getContent().AllowReviewService && $assignment.getContent().AllowStudentViewReport)
-			<div id="report" style='display:none'>$submission.getReviewReport()</div>
-		#end
-		<h4>
-			$tlang.getString("gen.instr")
-		</h4>				
-							
-		#if ($!assignment.getContent().getInstructions().length()>0)
-			<div class="textPanel">$validator.escapeHtmlFormattedText($!assignment.getContent().getInstructions())</div>
-		#else
-		#end
-		## assignment attachment
-		#set ($attachments = $assignment.getContent().Attachments)
-		#set ($size = 0)
-		#set ($size = 0)
-		#set ($props = false)
-		#foreach ($attachment in $attachments) 
-			#set ($props = $attachment.Properties) 
-			#if ($!props)
-				#set ($size = $size + 1)
-			#end
-		#end
-		#if ($size == 0)
+                                #if ($decoratedUrlMap)
+                                    <a href="$decoratedUrlMap.get($reference.Url)" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                #else
+                                    <a href="$reference.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                #end
+                                #propertyDetails($props)
+                            </li>
+                        #end
+                    #end
+                #end
+            </ul>
+        #end
+    #end
+
+    ## show instructor comment if the submission is (1) graded and release or (2) returned
+    #if (($submission.Graded && $submission.GradeReleased) || $submission.Returned)
+    ## show feedback comment and feedback comment when submission is released or returned
+        #if (($!submission.FeedbackComment) && ($submission.FeedbackComment.length() > 0))
+            <h5>$tlang.getString("gen.addinst")</h5>
+            <div class="textPanel">$validator.escapeHtmlFormattedText($submission.FeedbackComment)</div>
+        #end
+
+        ## Feedback Attachments
+        #set ($attachments = $submission.feedbackAttachments)
+        #if ($attachments)
+            #set ($size = $attachments.size())
+            #if ($size > 0)
+                <h4>
+                    $tlang.getString("gen.addinstatts")
+                </h4>
+                <ul class="attachList indnt1">
+                    #foreach ($attachmentReference in $attachments)
+                        #set ($reference = $submissionFeedbackAttachmentReferences.get($attachmentReference))
+                        #if ($reference)
+                            #set ($props = false)
+                            #set ($props = $reference.Properties)
+                            #if ($!props)
+                                <li>
+                                    #if ($props.getBooleanProperty($props.NamePropIsCollection))
+                                        <img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
+                                    #else
+                                        <img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
+                                    #end
+                                    #if ($decoratedUrlMap)
+                                        <a href="$decoratedUrlMap.get($reference.Url)" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                    #else
+                                        <a href="$reference.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                    #end
+                                    #propertyDetails($props)
+                                </li>
+                            #end
+                        #end
+                    #end
+                </ul>
+            #end
+        #end
 
-		#else
-			<h4>
-				$tlang.getString("gen.addres2")
-			</h4>
-			<ul class="attachList indnt1">
-				#foreach ($attachment in $attachments) 
-					#set ($props = false)
-					#set ($props = $attachment.Properties) 
-					#if ($!props)
-						<li>
-							#if ($props.getBooleanProperty($props.NamePropIsCollection))
-								<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-							#else
-								<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-							#end
-							#if ($decoratedUrlMap)
-								<a href="$decoratedUrlMap.get($attachment.Url)" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-							#else
-								<a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-							#end
-							#propertyDetails($props)
-						</li>
-					#end
-				#end
-			</ul>
-			#end
-			## model answer
-			#if($allowViewModelAnswer)
-			<h4  id="toggleModel" class="toggleAnchor specialLink"><img alt="expand" class="expand" src="/library/image/sakai/expand.gif" /><img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif" />$tlang.getString('modelAnswer')</h4>
-			<div class="model toggledContent">
-					<p>$validator.escapeHtml($!assignmentModelAnswerItem.getText())</p>
-					#set ($mAttachments = $!assignmentModelAnswerItem.getAttachmentObjectSet())
-						<ul class="attachList">
-							#set ($size = 0)
-							#set ($props = false)
-							#foreach ($attachment in $!mAttachments) 
-								#set ($props = $attachment.Properties) 
-								#if ($!props)
-									#set ($size = $size + 1)
-								#end
-							#end
-							#if ($size == 0)
-								<<p class="instruction">
-                                                                    #if ($submissionType == 5)
-                                                                        $tlang.getString("gen.noatt.single")
-                                                                    #else
-                                                                        $tlang.getString("gen.noatt")
-                                                                    #end
-                                                                </p>
-							#else
-								#foreach ($attachment in $mAttachments)
-									#set ($props = false)
-									#set ($props = $attachment.Properties) 
-									#if ($!props)
-									<li>
-										#if ($props.getBooleanProperty($props.NamePropIsCollection))
-											<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-										#else
-											<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-										#end
-										<a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>						
-										#propertyDetails($props)
-									</li>
-									#end
-							#end
-					#end
-					</ul>
-				</div>
-			#end
-			#if ($!allowReadAssignmentNoteItem)
-				<h4  id="toggleNotes" class="toggleAnchor specialLink"><img alt="expand" class="expand" src="/library/image/sakai/expand.gif" /><img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif" />$tlang.getString('note.label')</h4>
-				<div class="notes toggledContent">
-					$validator.escapeHtml($!assignmentNoteItem.getNote())
-				</div>
-			#end
-			##all purpose
-			#if ($!allowViewAllPurposeItem)
-			<h4  id="toggleAllPurpose" class="toggleAnchor specialLink"><img alt="expand" class="expand" src="/library/image/sakai/expand.gif" /><img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif" />$tlang.getString('allPurpose')</h4>
-			<div class="allPurpose toggledContent">
-					<p>$validator.escapeHtml($!assignmentAllPurposeItem.getTitle())</p>
-					<p>$validator.escapeHtml($!assignmentAllPurposeItem.getText())</p>
-					#set ($aAttachments = $!assignmentAllPurposeItem.getAttachmentObjectSet())
-						<ul class="attachList">
-							#set ($size = 0)
-							#set ($props = false)
-							#foreach ($attachment in $!aAttachments) 
-								#set ($props = $attachment.Properties) 
-								#if ($!props)
-									#set ($size = $size + 1)
-								#end
-							#end
-							#if ($size == 0)
-								<p class="instruction">
-                                                                    #if ($submissionType == 5)
-                                                                        $tlang.getString("gen.noatt.single")
-                                                                    #else
-                                                                        $tlang.getString("gen.noatt")
-                                                                    #end
-                                                                </p>
-							#else
-								#foreach ($attachment in $aAttachments)
-									#set ($props = false)
-									#set ($props = $attachment.Properties) 
-									#if ($!props)
-									<li>
-										#if ($props.getBooleanProperty($props.NamePropIsCollection))
-											<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-										#else
-											<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-										#end
-										<a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>						
-										#propertyDetails($props)
-									</li>
-									#end
-							#end
-					#end
-					</ul>
-				</div>
-			#end
-			#if ($taggable)
-    	    	#parse ("/vm/assignment/chef_assignments_tags_list.vm")
-			#end
-			<hr class="itemSeparator" />
-			##show instructor feedback if the submission is (1) graded and release or (2) returned
-			#if (($submission.Graded && $submission.GradeReleased) || $submission.Returned)
-				## show feedback text when submission is released or returned
-				#if ($!submission.FeedbackText && ($submission.FeedbackText.length()>0))
-					<h5>$tlang.getString("gen.orisub2")</h5>
-					<div class="textPanel">$submission.FeedbackFormattedText</div>
-				#else
-					#set ($text = $submission.getSubmittedText())
-					#if ($!text && $text.length() > 0)
-						<h4>$tlang.getString("gen.orisub")</h4>
-						<div class="textPanel">$submission.getSubmittedText()</div>
-					#end
-				 #end
-			#else
-				#set ($text = $submission.getSubmittedText())
-				#if ($!text && $text.length() > 0)
-					<h4>$tlang.getString("gen.orisub")</h4>
-					<div class="textPanel">$submission.getSubmittedText()</div>
-				#end
-			#end
-			#set ($submittedAttachments = $submission.VisibleSubmittedAttachments)
-			#set ($size = 0)
-			#set ($props = false)
-			#foreach ($attachment in $submittedAttachments) 
-				#set ($props = $attachment.Properties) 
-				#if ($!props)
-					#set ($size = $size + 1)
-				#end
-			#end
-			#if ($size == 0)
-				##$tlang.getString("gen.noatt")
-			#else
-				<h5>
-					#if ($assignment.getContent().getTypeOfSubmission() == 5)
-						$tlang.getString("gen.stuatt.single")
-					#else
-						$tlang.getString("gen.stuatt")
-					#end
-				</h5>
-					<ul class="attachList indnt1">
-					#foreach ($attachment in $submittedAttachments) 
-						#set ($props = false)
-						#set ($props = $attachment.Properties) 
-						#if ($!props)
-							<li>
-								#if ($props.getBooleanProperty($props.NamePropIsCollection))
-									<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-								#else
-									<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-								#end
-								#if ($decoratedUrlMap)
-									<a href="$decoratedUrlMap.get($attachment.Url)" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-								#else
-									<a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-								#end
-								#propertyDetails($props)
-							</li>
-						#end
-					#end
-				</ul>
-			#end	
-			##show instructor comment if the submission is (1) graded and release or (2) returned
-			#if (($submission.Graded && $submission.GradeReleased) || $submission.Returned)
-				## show feedback comment and feedback comment when submission is released or returned
-				#if (($!submission.FeedbackComment) && ($submission.FeedbackComment.length()>0))
-					<h5>$tlang.getString("gen.addinst")</h5>	
-					<div class="textPanel">$validator.escapeHtmlFormattedText($submission.FeedbackComment)</div>
-				#end
-				#set ($size = 0)
-				#set ($props = false)
-				#set ($feedbackAttachments = $submission.FeedbackAttachments)
-				#set ($size = 0)
-				#set ($props = false)
-				#foreach ($attachment in $feedbackAttachments) 
-					#set ($props = $attachment.Properties) 
-					#if ($!props)
-						#set ($size = $size + 1)
-					#end
-				#end
-				#if ($size == 0)
-				#else
-					<h5>$tlang.getString("gen.addinstatts") </h5>
-					<ul class="attachList indnt1">
-						#foreach ($attachment in $feedbackAttachments) 
-							#set ($props = false)
-							#set ($props = $attachment.Properties) 
-							#if ($!props)
-								<li>
-									#if ($props.getBooleanProperty($props.NamePropIsCollection))
-										<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-									#else
-										<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-									#end
-									#if ($decoratedUrlMap)
-										<a href="$decoratedUrlMap.get($attachment.Url)" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-									#else
-										<a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-									#end
-									#propertyDetails($props)
-								</li>
-							#end
-						#end
-					</ul>
-				#end
-				
-				##Show reviewer feedback from peer review (if exist and the peer review is closed)
-				#if ($peerReviews)
-					<h3>$tlang.getString("gen.peerReviews") </h3>
-					<div id="accordion">
-					#foreach($review in $peerReviews)
-						<h5>$review.assessorDisplayName</h5>
-						<div>
-						$tlang.getFormattedMessage("gen.score.display", $review.getScoreDisplay())
-						<br/>
-						#if($!review.getComment() && $review.getComment().length()>0)
-							<b>$tlang.getString("gen.comments")</b> 
-							<div class="textPanel">$validator.escapeHtmlFormattedText($review.getComment())</div>
-						#end
+        ## Show reviewer feedback from peer review (if exist and the peer review is closed)
+        #if ($peerReviews)
+            <h3>$tlang.getString("gen.peerReviews")</h3>
+            <div id="accordion">
+                #foreach($review in $peerReviews)
+                    <h5>$review.assessorDisplayName</h5>
+                    <div>
+                        $tlang.getFormattedMessage("gen.score.display", $review.getScoreDisplay())
+                        <br/>
+                        #if($!review.getComment() && $review.getComment().length()>0)
+                            <b>$tlang.getString("gen.comments")</b>
+                            <div class="textPanel">$validator.escapeHtmlFormattedText($review.getComment())</div>
+                        #end
                         <ul class="attachList">
                             <lh><strong>$tlang.getString("gen.attachments")</strong></lh>
-							#foreach($attachment in $review.getAttachmentRefList())
-								#set ($props = false)
-								#set ($props = $attachment.Properties)
-								#if ($!props)
+                            #foreach($attachment in $review.getAttachmentRefList())
+                                #set ($props = false)
+                                #set ($props = $attachment.Properties)
+                                #if ($!props)
                                     <li>
-									#if ($props.getBooleanProperty($props.NamePropIsCollection))
-                                        <img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-									#else
-                                        <img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-									#end
-									#if ($decoratedUrlMap)
-                                        <a href="$decoratedUrlMap.get($attachment.Url)" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-									#else
-                                        <a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
-									#end
-										#propertyDetails($props)
+                                        #if ($props.getBooleanProperty($props.NamePropIsCollection))
+                                            <img src="#imageLink($contentTypeImageService.getContentTypeImage(
+                                                "folder"))" border="0" alt="$tlang.getString("gen.folatt")"/>
+                                        #else
+                                            <img src="#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))"
+                                                 border="0" alt="$tlang.getString("gen.filatt")"/>
+                                        #end
+                                        #if ($decoratedUrlMap)
+                                            <a href="$decoratedUrlMap.get($attachment.Url)"
+                                               target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                        #else
+                                            <a href="$attachment.Url"
+                                               target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+                                        #end
+                                        #propertyDetails($props)
                                     </li>
-								#end
-							#end
+                                #end
+                            #end
                         </ul>
-						</div>
-					#end
-					</div>
-				#end
-			#end
-		<form action="#toolForm("AssignmentAction")" method="post" >
-			<div class="act">
-				<input type="submit" accesskey="x" name="eventSubmit_doCancel_view_grade" value="$tlang.getString("gen.backtolist")" accesskey="x" class="active TB_hideControl"
-					onclick="SPNR.disableControlsAndSpin( this, null );" />
-			</div>
-			<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
-		</form>
-	</div>
+                    </div>
+                #end
+            </div>
+        #end
+    #end
+
+    <form action="#toolForm("AssignmentAction")" method="post">
+        <div class="act">
+            <input type="submit" accesskey="x" name="eventSubmit_doCancel_view_grade"
+                   value="$tlang.getString("gen.backtolist")" accesskey="x" class="active TB_hideControl"
+                   onclick="SPNR.disableControlsAndSpin( this, null );"/>
+        </div>
+        <input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token"/>
+    </form>
+</div>
 <!-- end: chef_assignments_student_view_grade.vm  -->
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
index b45dbff1928b..0589c795b9bc 100644
--- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
+++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
@@ -188,7 +188,7 @@ $(document).ready(function(){
 				#if($!resubmitNumber && !$!resubmitNumber.equals("0") )
 					<div class="row">
 						<div class="col-lg-4 col-sm-6 col-xs-12">
-							<div class="itemSummaryHeader">$tlang.getString("allow.resubmit.closeDate")</div>
+							<div class="itemSummaryHeader">$tlang.getString("allow.resubmit.closeTime")</div>
 						</div>
 						<div class="col-lg-4 col-sm-6 col-xs-12">
 							<div class="itemSummaryValue">
@@ -259,7 +259,7 @@ $(document).ready(function(){
 										$tlang.getString("gen.nograd")
 									#end
 									#if ($gradeTypeTable.get($gradeScale) == $!tlang.getString("points"))
-										($tlang.getString("grade.max") $assignment.MaxGradePoint)
+                                        ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint))
 									#end
 								</strong>
 									
@@ -279,7 +279,7 @@ $(document).ready(function(){
 							<div class="itemSummaryValue">
 								$gradeTypeTable.get($gradeScale)
 								#if ($gradeTypeTable.get($gradeScale) == $!tlang.getString("points"))
-									($tlang.getString("grade.max") $assignment.MaxGradePoint)
+                                    ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint))
 								#end
 								
 								<!--for grading via an external scoring service, if enabled for an associated gradebook item -->
@@ -366,38 +366,40 @@ $(document).ready(function(){
 		#if (!$!assignment.Instructions.isEmpty())
 			<div class="textPanel">$validator.escapeHtmlFormattedText($!assignment.Instructions)</div>
 		#end
-		## assignment attachment
-		#set ($size = 0)
-		#set ($props = false)
-		#foreach ($attachment in $assignment.Attachments)
-			#set ($props = $attachment.Properties) 
-			#if ($!props)
-				#set ($size = $size + 1)
-			#end
-		#end
-		#if ($size > 0)
-			<h4>
-				$tlang.getString("gen.addres2")
-			</h4>	
+
+		## Assignment Attachments
+		#set ($aAttachments = $assignment.Attachments)
+		#if ($aAttachments)
+			#set ($size = $aAttachments.size())
+			#if ($size < 1)
+				$tlang.getString("gen.noatt")
+			#else
+				<h4>
+					$tlang.getString("gen.addres2")
+				</h4>
 				<ul class="attachList indnt1">
-					#foreach ($attachment in $assignment.Attachments)
-						#set ($props = false)
-						#set ($props = $attachment.Properties) 
-						#if ($!props)
-							<li>
-								#if ($props.getBooleanProperty($props.NamePropIsCollection))
-									<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
-								#else
-									<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
-								#end
-									<a href="$attachment.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>						
-								#propertyDetails($props)
-							</li>
+					#foreach ($attachmentReference in $aAttachments)
+						#set ($reference = $assignmentAttachmentReferences.get($attachmentReference))
+						#if ($reference)
+							#set ($props = false)
+							#set ($props = $reference.Properties)
+							#if ($!props)
+								<li>
+									#if ($props.getBooleanProperty($props.NamePropIsCollection))
+										<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />
+									#else
+										<img src = "#imageLink($contentTypeImageService.getContentTypeImage($props.getProperty($props.NamePropContentType)))" border="0" alt="$tlang.getString("gen.filatt")" />
+									#end
+									<a href="$reference.Url" target="_blank">$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))</a>
+									#propertyDetails($props)
+								</li>
+							#end
 						#end
 					#end
 				</ul>
-				##end
+			#end
 		#end
+
 			## model answer
 			#if($allowViewModelAnswer)
 			<h4  id="toggleModel" class="toggleAnchor specialLink"><img alt="expand" class="expand" src="/library/image/sakai/expand.gif" /><img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif" />$tlang.getString('modelAnswer')</h4>
@@ -626,7 +628,7 @@ $(document).ready(function(){
 							</td>
                                                         <td headers="description" width="100%"> ##mozilla does not resize table children dynamically , so set here
 							<span style="font-size: smaller; color: blue;">	
-								#set($gusers = $assignmentService.getSortedGroupUsers($group))
+								#set($gusers = $!service.getSortedGroupUsers($group))
 								#foreach ($user in $gusers)
 									$user.getDisplayName()
 									##$!userDirectoryService.getUser($user).getDisplayName()
diff --git a/common/import-parsers/blackboard_6/impl/pom.xml b/common/import-parsers/blackboard_6/impl/pom.xml
index 6a8fd837faea..e45ed842e63c 100644
--- a/common/import-parsers/blackboard_6/impl/pom.xml
+++ b/common/import-parsers/blackboard_6/impl/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 		  <groupId>org.jsoup</groupId>
 		  <artifactId>jsoup</artifactId>
-		  <version>1.8.1</version>
+		  <version>1.10.3</version>
 		</dependency>
 		<dependency>
 		  <groupId>commons-lang</groupId>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html
index eeef94a7e328..32258e31a8bf 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html
@@ -108,6 +108,20 @@ <h4 class="modal-title" id="customExportModalTitle"><wicket:message key="importE
                                 </div>
                             </div>
                         </div>
+
+                        <div class="row">
+                            <wicket:enclosure>
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="filterByGroup"><wicket:message key="filter.groups" /></label>
+                                        <select id="filterByGroup" wicket:id="groupFilter">
+                                            <option value="1">Section 1</option>
+                                            <option value="2">Section 2</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </wicket:enclosure>
+                        </div>
                     </div>
                     <div class="modal-footer">
                         <button wicket:id="downloadCustomGradebook" type="button" class="button_color pull-left" data-dismiss="modal">
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java
index 029379d6c444..9730055fcea5 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java
@@ -23,7 +23,10 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
+import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.link.DownloadLink;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
@@ -31,8 +34,10 @@
 import org.sakaiproject.gradebookng.business.GbCategoryType;
 import org.sakaiproject.gradebookng.business.model.GbCourseGrade;
 import org.sakaiproject.gradebookng.business.model.GbGradeInfo;
+import org.sakaiproject.gradebookng.business.model.GbGroup;
 import org.sakaiproject.gradebookng.business.model.GbStudentGradeInfo;
 import org.sakaiproject.gradebookng.business.util.FormatHelper;
+import org.sakaiproject.gradebookng.tool.model.GradebookUiSettings;
 import org.sakaiproject.gradebookng.tool.panels.BasePanel;
 import org.sakaiproject.service.gradebook.shared.Assignment;
 import org.sakaiproject.service.gradebook.shared.CourseGrade;
@@ -62,6 +67,7 @@ enum ExportFormat {
 	boolean includeLastLogDate = false;
 	boolean includeCalculatedGrade = false;
 	boolean includeGradeOverride = false;
+	GbGroup group;
 
 	public ExportPanel(final String id) {
 		super(id);
@@ -179,6 +185,34 @@ protected void onUpdate(final AjaxRequestTarget ajaxRequestTarget) {
 			}
 		});
 
+		this.group = new GbGroup(null, getString("groups.all"), null, GbGroup.Type.ALL);
+
+		final List<GbGroup> groups = this.businessService.getSiteSectionsAndGroups();
+		groups.add(0, this.group);
+		add(new DropDownChoice<GbGroup>("groupFilter", Model.of(this.group), groups, new ChoiceRenderer<GbGroup>() {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public Object getDisplayValue(final GbGroup g) {
+				return g.getTitle();
+			}
+
+			@Override
+			public String getIdValue(final GbGroup g, final int index) {
+				return g.getId();
+			}
+		}).add(new AjaxFormComponentUpdatingBehavior("onchange") {
+			@Override
+			protected void onUpdate(AjaxRequestTarget target) {
+				GbGroup value = (GbGroup) ((DropDownChoice) getComponent()).getDefaultModelObject();
+				if (value == null) {
+					ExportPanel.this.group = new GbGroup(null, getString("groups.all"), null, GbGroup.Type.ALL);
+				} else {
+					ExportPanel.this.group = (GbGroup) ((DropDownChoice) getComponent()).getDefaultModelObject();
+				}
+			}
+		}));
+
 		add(new DownloadLink("downloadFullGradebook", new LoadableDetachableModel<File>() {
 			private static final long serialVersionUID = 1L;
 
@@ -268,8 +302,14 @@ private File buildFile(final boolean isCustomExport) {
 
 			csvWriter.writeNext(header.toArray(new String[] {}));
 
+			// apply section/group filter
+			final GradebookUiSettings settings = new GradebookUiSettings();
+			if (isCustomExport && !GbGroup.Type.ALL.equals(this.group.getType())) {
+				settings.setGroupFilter(this.group);
+			}
+
 			// get the grade matrix
-			final List<GbStudentGradeInfo> grades = this.businessService.buildGradeMatrix(assignments);
+			final List<GbStudentGradeInfo> grades = this.businessService.buildGradeMatrix(assignments, settings);
 
 			// add grades
 			grades.forEach(studentGradeInfo -> {
diff --git a/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js b/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js
index b55f35619d53..21c255389a47 100644
--- a/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js
+++ b/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js
@@ -860,12 +860,13 @@ GbGradeTable.renderTable = function (elementId, tableData) {
   var $link;
   $(window).on('show.bs.dropdown', function (event) {
     $link = $(event.target);
-    $dropdownMenu = $(event.target).find('.dropdown-menu');
 
     if ($link.closest("#gradeTable").length == 0) {
       return true;
     }
 
+    $dropdownMenu = $(event.target).find('.dropdown-menu');
+
     $dropdownMenu.addClass("gb-dropdown-menu");
 
     $dropdownMenu.data("cell", $link.closest("td, th"));
diff --git a/gradebookng/tool/src/webapp/styles/gradebook-importexport.css b/gradebookng/tool/src/webapp/styles/gradebook-importexport.css
index 1b72c405d6d0..5ea6d0664aa6 100644
--- a/gradebookng/tool/src/webapp/styles/gradebook-importexport.css
+++ b/gradebookng/tool/src/webapp/styles/gradebook-importexport.css
@@ -81,4 +81,8 @@
 }
 
 
+#customExportModal #filterByGroup {
+  width: 100%;
+}
+
 
diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
index 544c95668b0c..32589b19bbfa 100644
--- a/kernel/kernel-impl/pom.xml
+++ b/kernel/kernel-impl/pom.xml
@@ -263,7 +263,7 @@
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
-      <version>1.9.0</version>
+      <version>1.9.2</version>
     </dependency>
     <dependency>
         <groupId>com.ibm.icu</groupId>
@@ -299,7 +299,7 @@
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
-      <version>1.7.3</version>
+      <version>1.10.3</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
index d814917f3e75..ced84bce11b5 100755
--- a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
+++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
@@ -1984,24 +1984,21 @@ else if (permission == 1)
 					fields[2] = Integer.valueOf(-1);
 					batchList.add(fields);
 				}
-				m_sql.dbWriteBatch(statement, batchList);
-
-				batchList = new ArrayList<>();
 				for (String siteId : unpInserts)
 				{
 					fields = new Object[3];
 					fields[0] = caseId(siteId);
 					fields[1] = userId;
 					fields[2] = Integer.valueOf(0);
+					batchList.add(fields);
 				}
-				m_sql.dbWriteBatch(statement, batchList);
-
-				batchList = new ArrayList<>();
 				for (String siteId : visitInserts)
 				{
+					fields = new Object[3];
 					fields[0] = caseId(siteId);
 					fields[1] = userId;
 					fields[2] = Integer.valueOf(1);
+					batchList.add(fields);
 				}
 				m_sql.dbWriteBatch(statement, batchList);
 			}
diff --git a/mailsender/impl/pom.xml b/mailsender/impl/pom.xml
index 77004f1de5ad..bdb532436276 100644
--- a/mailsender/impl/pom.xml
+++ b/mailsender/impl/pom.xml
@@ -50,19 +50,10 @@
         </dependency>
 
         <!-- java mail -->
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-email</artifactId>
-            <version>1.2</version>
-        </dependency>
 
         <!-- internal -->
         <dependency>
diff --git a/master/pom.xml b/master/pom.xml
index 8302a678ac18..23d3b61c38b8 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -116,7 +116,7 @@
     <sakai.spring.plugin.version>1.2.0.RELEASE</sakai.spring.plugin.version>
     <sakai.spring.test.artifactId>spring-test</sakai.spring.test.artifactId>
     <sakai.spring.test.version>4.3.6.RELEASE</sakai.spring.test.version>
-    <sakai.tika.version>1.14</sakai.tika.version>
+    <sakai.tika.version>1.16</sakai.tika.version>
     <sakai.tomcat.version>8.5.20</sakai.tomcat.version>
     <sakai.velocity.version>1.6.4</sakai.velocity.version>
     <sakai.xerces.impl.version>2.11.0</sakai.xerces.impl.version>
diff --git a/mycalendar/pom.xml b/mycalendar/pom.xml
index ead1bc2fd5ba..8fdcd6aac39d 100644
--- a/mycalendar/pom.xml
+++ b/mycalendar/pom.xml
@@ -16,18 +16,18 @@
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket</artifactId>
-            <version>6.18.0</version>
+            <version>6.26.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-spring</artifactId>
-            <version>6.18.0</version>
+            <version>6.26.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-extensions</artifactId>
-            <version>6.18.0</version>
+            <version>6.26.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/search/search-impl/impl/pom.xml b/search/search-impl/impl/pom.xml
index be8cce11af22..afcfb4d09c32 100644
--- a/search/search-impl/impl/pom.xml
+++ b/search/search-impl/impl/pom.xml
@@ -156,7 +156,7 @@
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
-      <version>1.8.6</version>
+      <version>2.0.6</version>
     </dependency>
     <!-- PDF box uses BouncyCastle for crypotgraphic functions at runtime -->
     <dependency>
diff --git a/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java b/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java
index 04248f95f781..9cb558b3ff0f 100644
--- a/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java
+++ b/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java
@@ -29,9 +29,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.pdfbox.pdfparser.PDFParser;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.sakaiproject.content.api.ContentResource;
 import org.sakaiproject.exception.ServerOverloadException;
 import org.sakaiproject.search.api.SearchUtils;
@@ -50,13 +49,10 @@ public String getContent(ContentResource contentResource)
 		}
 
 		InputStream contentStream = null;
-		PDFParser parser = null;
 		PDDocument pddoc = null;
 		try {
 			contentStream = contentResource.streamContent();
-			parser = new PDFParser(new BufferedInputStream(contentStream));
-			parser.parse();
-			pddoc = parser.getPDDocument();
+			pddoc = PDDocument.load(contentStream);
 			if (pddoc != null) {
 				PDFTextStripper stripper = new PDFTextStripper();
 				stripper.setLineSeparator("\n");		
diff --git a/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java b/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java
index 8ae26bf4b04a..1c9664d0f2ee 100644
--- a/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java
+++ b/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java
@@ -373,6 +373,10 @@ else if ("CreateFolder".equals(commandStr)) {
      }
      
 
+    // Set to be consistent with
+    // org.sakaiproject.content.api.ContentHostingService.MAXIMUM_ATTEMPTS_FOR_UNIQUENESS
+    private static final int MAX_SAVE_RETRIES = 100;
+
      /**
       * Manage the Post requests (FileUpload).<br>
       *
@@ -478,8 +482,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
                     int counter = 1;
                     boolean done = false;
+                    Throwable lastException = null;
 
-                    while(!done) {
+                    for (int retry = 0; !done && retry < MAX_SAVE_RETRIES; retry++) {
                          try {
                              ResourcePropertiesEdit resourceProperties = contentHostingService.newResourceProperties();
                              resourceProperties.addProperty (ResourceProperties.PROP_DISPLAY_NAME, fileName);
@@ -508,6 +513,7 @@ else if (requestStream != null) {
                          }
                          catch (IdUsedException iue) {
                               //the name is already used, so we do a slight rename to prevent the colision
+                              lastException = iue;
                               fileName = nameWithoutExt + "(" + counter + ")" + ext;
                               status = "201";
                               counter++;
@@ -516,10 +522,19 @@ else if (requestStream != null) {
                          catch (Exception ex) {
                               //this user can't write where they are trying to write.
                               done = true;
+                              lastException = ex;
                               ex.printStackTrace();
                               status = "203";
                          }
                     }
+
+                    if (!done) {
+                        // Hit our limit on retries.  This shouldn't happen
+                        // unless the state of things is strange (see SAK-32346
+                        // for an example of that)
+                        throw new RuntimeException("Retry limit exceeded", lastException);
+                    }
+
                }
                catch (Exception ex) {
                     ex.printStackTrace();
@@ -1151,11 +1166,11 @@ private SecurityAdvisor createSubmissionSecurityAdvisor() {
     				 function.equals(contentHostingService.AUTH_RESOURCE_WRITE_OWN) ||
     				 function.equals(contentHostingService.AUTH_RESOURCE_HIDDEN)
     				 ) {
-    			 return SecurityAdvisor.SecurityAdvice.ALLOWED;
+    			 return securityService.unlock(userId, contentHostingService.AUTH_RESOURCE_READ, reference) ? SecurityAdvisor.SecurityAdvice.ALLOWED : SecurityAdvisor.SecurityAdvice.NOT_ALLOWED;
     		 } else if (function.equals(contentHostingService.AUTH_RESOURCE_WRITE_ANY)) {
     			 M_log.info(userId + " requested ability to write to any content on "+ reference+
     					 " which we didn't expect, this should be investigated");
-    			 return SecurityAdvisor.SecurityAdvice.ALLOWED;
+    			 return securityService.unlock(userId, contentHostingService.AUTH_RESOURCE_READ, reference) ? SecurityAdvisor.SecurityAdvice.ALLOWED : SecurityAdvisor.SecurityAdvice.NOT_ALLOWED;
     		 }
     		 return SecurityAdvisor.SecurityAdvice.PASS;
     	 };
diff --git a/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java b/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java
index 5f8d88b2a445..a2b4521364ba 100644
--- a/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java
+++ b/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java
@@ -21,12 +21,14 @@
 import javax.jws.soap.SOAPBinding;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.PhaseInterceptorChain;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
@@ -35,7 +37,6 @@
 import org.sakaiproject.user.api.Authentication;
 import org.sakaiproject.user.api.AuthenticationException;
 import org.sakaiproject.user.api.Evidence;
-import org.sakaiproject.user.api.AuthenticationManager;
 import org.sakaiproject.util.IdPwEvidence;
 
 @WebService
@@ -44,6 +45,9 @@ public class SakaiLogin extends AbstractWebService {
 
     private static final Logger LOG = LoggerFactory.getLogger(SakaiLogin.class);
 
+    //I don't see a simpler way of doing this 
+    //https://stackoverflow.com/a/13408147/3708872
+    
     /**
      * Login with the supplied credentials and return the session string which can be used in subsequent web service calls, ie via SakaiScript
      *
@@ -55,13 +59,44 @@ public class SakaiLogin extends AbstractWebService {
     @Path("/login")
     @Produces("text/plain")
     @GET
-    public java.lang.String login(
+    public java.lang.String loginGET(
             @WebParam(partName = "id", name = "id")
             @QueryParam("id")
             java.lang.String id,
             @WebParam(partName = "pw", name = "pw")
             @QueryParam("pw")
             java.lang.String pw) {
+    	return login(id,pw);
+    }
+
+    /**
+     * Login with the supplied credentials and return the session string which can be used in subsequent web service calls, ie via SakaiScript
+     *
+     * @param id eid, eg jsmith26
+     * @param pw password for the user
+     * @return session string
+     */
+    @WebMethod
+    @Path("/login")
+    @Produces("text/plain")
+    @POST
+    public java.lang.String loginPOST(
+            @WebParam(partName = "id", name = "id")
+            @QueryParam("id")
+            java.lang.String id,
+            @WebParam(partName = "pw", name = "pw")
+            @QueryParam("pw")
+            java.lang.String pw) {
+    	return login (id,pw);
+    }
+    
+    /**
+     * Actual login method
+     * @param id
+     * @param pw
+     * @return
+     */
+    private java.lang.String login(java.lang.String id, java.lang.String pw) {
         Message message = PhaseInterceptorChain.getCurrentMessage();
         HttpServletRequest request = (HttpServletRequest) message.get(AbstractHTTPDestination.HTTP_REQUEST);
         String ipAddress = request.getRemoteAddr();
@@ -72,7 +107,11 @@ public java.lang.String login(
             throw new RuntimeException("Web Services Login Disabled");
         }
 
-	try {
+        try {
+            if ("GET".equals(request.getMethod())) {
+                LOG.info("This endpoint {} should use POST instead of GET, GET will be deprecated in a future release", request.getRequestURI());
+            }
+
             Evidence e = new IdPwEvidence(id, pw, ipAddress);
             Authentication a = authenticationManager.authenticate(e);
 
@@ -112,10 +151,39 @@ public java.lang.String login(
     @Produces("text/plain")
     @GET
     @Path("/logout")
-    public boolean logout(
+    public boolean logoutGET(
+            @QueryParam("sessionid")
+            @WebParam(partName = "sessionid", name = "sessionid")
+            java.lang.String sessionid) {
+    	return logout(sessionid);
+    }
+    
+    /**
+     * Logout of the given session
+     *
+     * @param sessionid sessionid to logout
+     * @return
+     * @throws InterruptedException
+     */
+    @WebMethod
+    @Produces("text/plain")
+    @POST
+    @Path("/logout")
+    public boolean logoutPOST(
             @QueryParam("sessionid")
             @WebParam(partName = "sessionid", name = "sessionid")
             java.lang.String sessionid) {
+    	return logout (sessionid);
+    }
+    
+    /**
+     * Actual logout method
+     *
+     * @param sessionid sessionid to logout
+     * @return
+     * @throws InterruptedException
+     */
+    private boolean logout(java.lang.String sessionid) {
         Session s = sessionManager.getSession(sessionid);
 
         if (s == null) {
@@ -132,7 +200,22 @@ public boolean logout(
     @Produces("text/plain")
     @GET
     @Path("/loginToServer")
-    public java.lang.String loginToServer(
+    public java.lang.String loginToServerGET(
+            @WebParam(partName = "id", name = "id")
+            @QueryParam("id")
+            java.lang.String id,
+            @WebParam(partName = "pw", name = "pw")
+            @QueryParam("pw")
+            java.lang.String pw) {
+        return login(id, pw) + "," + serverConfigurationService.getString("webservices.directurl", serverConfigurationService.getString("serverUrl"));
+    }
+
+
+    @WebMethod
+    @Produces("text/plain")
+    @POST
+    @Path("/loginToServer")
+    public java.lang.String loginToServerPOST(
             @WebParam(partName = "id", name = "id")
             @QueryParam("id")
             java.lang.String id,