Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r0332cf66eb85c07c1eba295241d820c524d5907e -r64df420a185734c95854c5ea0573c3c3133fb72b
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 0332cf66eb85c07c1eba295241d820c524d5907e)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 64df420a185734c95854c5ea0573c3c3133fb72b)
@@ -643,5 +643,7 @@
 label.type.config.change  =Configuration change
 
 sysadmin.alternative.user.id.name  =Use alternative parameter name "lis_person_sourcedid" to get user id
+config.header.privacy.settings  =Privacy settings
+config.restricted.displaying.user.names.in.groupings  =Groupings: only display names for learners within own group
 
 #======= End labels: Exported 634 labels for en AU =====
Index: lams_central/web/main.jsp
===================================================================
diff -u -r7ba17e82a4cd08db748536b39aef80a4f1c03027 -r64df420a185734c95854c5ea0573c3c3133fb72b
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 7ba17e82a4cd08db748536b39aef80a4f1c03027)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 64df420a185734c95854c5ea0573c3c3133fb72b)
@@ -1,6 +1,4 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
-<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
@@ -312,10 +310,6 @@
 	<footer>
 		<div class="">
 			<p class="text-muted text-center">
-				<fmt:message key="msg.LAMS.version" />&nbsp;<%=Configuration.get(ConfigurationKeys.VERSION)%>
-				<a href="<lams:LAMSURL/>/www/copyright.jsp" target='copyright' onClick="openCopyRight()">
-					&copy; <fmt:message key="msg.LAMS.copyright.short" /> 
-				</a>
 				<span class="text-danger text-center" id="timezoneWarning"></span>
 			</p>
 		</div>
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r64df420a185734c95854c5ea0573c3c3133fb72b
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 64df420a185734c95854c5ea0573c3c3133fb72b)
@@ -247,6 +247,8 @@
     public static String USER_VALIDATION_REQUIRED_FIRST_LAST_NAME = "UserValidationFirstLastName";
 
     public static String USER_VALIDATION_REQUIRED_EMAIL = "UserValidationEmail";
+    
+    public static String RESTRICTED_DISPLAYING_OF_USER_NAMES_IN_GROUPS = "RestrictedGroupUserNames";
 
     // LDEV-2747
     public static String ENABLE_SERVER_REGISTRATION = "EnableServerRegistration";
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r9f4048209accdf9125561d81be16ad32c833c812 -r64df420a185734c95854c5ea0573c3c3133fb72b
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9f4048209accdf9125561d81be16ad32c833c812)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 64df420a185734c95854c5ea0573c3c3133fb72b)
@@ -191,6 +191,6 @@
 outcome.authoring.existing.none  =none
 outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
 button.kumalive.poll.chart.switch  =Switch chart
+label.learners  ={0} learners
 
-
 #======= End labels: Exported 184 labels for en AU =====
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
===================================================================
diff -u -rbe74862925361d836bef1df4c5959105c9695a87 -r64df420a185734c95854c5ea0573c3c3133fb72b
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(.../GroupingController.java)	(revision be74862925361d836bef1df4c5959105c9695a87)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(.../GroupingController.java)	(revision 64df420a185734c95854c5ea0573c3c3133fb72b)
@@ -46,13 +46,14 @@
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.usermanagement.dto.UserBasicDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  *
@@ -94,19 +95,11 @@
     /**
      * Perform the grouping for the users who are currently running the lesson. If force is set to true, then we should
      * be in preview mode, and we want to override the chosen grouping to make it group straight away.
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
      */
     @RequestMapping("/performGrouping")
     public String performGrouping(@ModelAttribute GroupingForm groupingForm, HttpServletRequest request)
 	    throws IOException, ServletException {
-
+	Integer currentUserId = LearningWebUtil.getUserId();
 	boolean forceGroup = WebUtil.readBooleanParam(request, GroupingController.PARAM_FORCE_GROUPING, false);
 
 	// initialize service object
@@ -120,85 +113,73 @@
 	}
 	Long lessonId = learnerProgress.getLesson().getLessonId();
 	boolean groupingDone = learnerService.performGrouping(lessonId, activity.getActivityId(),
-		LearningWebUtil.getUserId(), forceGroup);
+		currentUserId, forceGroup);
 
 	groupingForm.setPreviewLesson(learnerProgress.getLesson().isPreviewLesson());
 	groupingForm.setTitle(activity.getTitle());
 	groupingForm.setActivityID(activity.getActivityId());
-
 	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
+	
+	SortedSet<GroupDTO> groups = new TreeSet<>(GroupDTO.GROUP_NAME_COMPARATOR);
+	Grouping grouping = ((GroupingActivity) activity).getCreateGrouping();
+	if (grouping != null) {
+	    for (Group group : grouping.getGroups()) {
+		GroupDTO groupDTO = new GroupDTO(group, true);
+		groupDTO.getUserList().sort(UserBasicDTO.USER_BASIC_DTO_COMPARATOR);
+		
+		//set isUserBelongsToGroup
+		for (UserBasicDTO userDto : groupDTO.getUserList()) {
+		    if (userDto.getUserID().equals(currentUserId)) {
+			groupDTO.setUserBelongsToGroup(true);
+			break;
+		    }
+		}
+		
+		groups.add(groupDTO);
+	    }
+	}
+	request.setAttribute(GroupingController.GROUPS, groups);
+	request.setAttribute(GroupingController.TITLE, activity.getTitle());
+	request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
+	request.setAttribute(ConfigurationKeys.RESTRICTED_DISPLAYING_OF_USER_NAMES_IN_GROUPS,
+		Configuration.getAsBoolean(ConfigurationKeys.RESTRICTED_DISPLAYING_OF_USER_NAMES_IN_GROUPS));
+	
+	//Load up the grouping information and forward to the jsp page to display all the groups and members.
 	if (groupingDone) {
 	    request.setAttribute(GroupingController.FINISHED_BUTTON, Boolean.TRUE);
-	    return viewGrouping(request, learnerProgress);
-	}
+	    request.setAttribute(GroupingController.LOCAL_FILES, Boolean.FALSE);
+	    ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
+	    request.setAttribute(GroupingController.FINISHED_BUTTON, new Boolean((mode == null) || !mode.isTeacher()));
+
+	    //find activity position within Learning Design and store it as request attribute
+	    ActivityPositionDTO positionDTO = learnerService.getActivityPosition(activityId);
+	    if (positionDTO != null) {
+		request.setAttribute(AttributeNames.ATTR_ACTIVITY_POSITION, positionDTO);
+	    }
+
+	    return "grouping/show";
+
+	} else
 	// forward to group choosing page
 	if (((GroupingActivity) activity).getCreateGrouping().isLearnerChoiceGrouping()) {
 	    Long groupingId = ((GroupingActivity) activity).getCreateGrouping().getGroupingId();
 	    Integer maxNumberOfLeaernersPerGroup = learnerService.calculateMaxNumberOfLearnersPerGroup(lessonId,
 		    groupingId);
 
-	    LearnerChoiceGrouping grouping = (LearnerChoiceGrouping) learnerService.getGrouping(groupingId);
-	    prepareGroupData(request);
+	    LearnerChoiceGrouping groupingDb = (LearnerChoiceGrouping) learnerService.getGrouping(groupingId);
 	    request.setAttribute(GroupingController.MAX_LEARNERS_PER_GROUP, maxNumberOfLeaernersPerGroup);
 	    request.setAttribute(GroupingController.LOCAL_FILES, Boolean.FALSE);
 	    request.setAttribute(GroupingController.VIEW_STUDENTS_BEFORE_SELECTION,
-		    grouping.getViewStudentsBeforeSelection());
+		    groupingDb.getViewStudentsBeforeSelection());
 	    return "grouping/choose";
+	    
+	} else {
+	    return "grouping/wait";
 	}
-	return "grouping/wait";
     }
 
     /**
-     * Load up the grouping information and forward to the jsp page to display all the groups and members.
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
-     */
-//    @RequestMapping("/viewGroup")
-//    public String viewGrouping(HttpServletRequest request) throws IOException, ServletException {
-//	return viewGrouping(request, null);
-//    }
-
-    @RequestMapping("/viewGroup")
-    public String viewGrouping(HttpServletRequest request,
-	    @RequestParam(required = false) LearnerProgress learnerProgress) throws IOException, ServletException {
-	prepareGroupData(request);
-	request.setAttribute(GroupingController.LOCAL_FILES, Boolean.FALSE);
-	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
-	request.setAttribute(GroupingController.FINISHED_BUTTON, new Boolean((mode == null) || !mode.isTeacher()));
-
-	long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
-	//find activity position within Learning Design and store it as request attribute
-	ActivityPositionDTO positionDTO = learnerService.getActivityPosition(activityId);
-	if (positionDTO != null) {
-	    request.setAttribute(AttributeNames.ATTR_ACTIVITY_POSITION, positionDTO);
-	}
-
-	// make sure the lesson id is always in the request for the progress bar.
-	if (request.getAttribute(AttributeNames.PARAM_LESSON_ID) == null) {
-	    if (learnerProgress == null) {
-		learnerProgress = LearningWebUtil.getLearnerProgress(request, learnerService);
-	    }
-	    request.setAttribute(AttributeNames.PARAM_LESSON_ID, learnerProgress.getLesson().getLessonId());
-	}
-	return "grouping/show";
-    }
-
-    /**
      * Complete the current tool activity and forward to the url of next activity in the learning design.
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
      */
     @RequestMapping("/completeActivity")
     public String completeActivity(HttpServletRequest request, HttpServletResponse response)
@@ -214,42 +195,7 @@
     }
 
     /**
-     * Inserts into the request most of the data required by JSP page. This method is common for several pages.
-     *
-     * @param request
-     */
-    @SuppressWarnings("unchecked")
-    @RequestMapping("/prepareGroupData")
-    private void prepareGroupData(HttpServletRequest request) {
-
-	SortedSet<GroupDTO> groups = new TreeSet<>(GroupDTO.GROUP_NAME_COMPARATOR);
-	long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
-	Activity activity = learnerService.getActivity(activityId);
-
-	Grouping grouping = ((GroupingActivity) activity).getCreateGrouping();
-	if (grouping != null) {
-	    for (Group group : grouping.getGroups()) {
-		GroupDTO groupDTO = new GroupDTO(group, true);
-		groupDTO.getUserList().sort(UserBasicDTO.USER_BASIC_DTO_COMPARATOR);
-		groups.add(groupDTO);
-	    }
-	}
-
-	request.setAttribute(GroupingController.GROUPS, groups);
-	request.setAttribute(GroupingController.TITLE, activity.getTitle());
-	request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
-    }
-
-    /**
      * Responds to a learner's group choice. Might forward back to group choice page if the chosen group was full.
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws ServletException
      */
     @RequestMapping("/learnerChooseGroup")
     public String learnerChooseGroup(@ModelAttribute GroupingForm groupingForm, HttpServletRequest request)