Merge "Fix SubscribeServlet Vulnerabilities"