Merge "Fix SubscriberReport vulnerabilities"