Merge "Fix FeedServlet Vulnerabilities"