Merge "Fix Vulnerabilities in SubscriptionServlet"