Merge "Fix RouteServlet Vulnerabilities"