Merge "Fix GroupServlet Vulnerabilities"