Merge "Fix NodeServlet Vulnerabilities"