Merge "Fix Group Vulnerabilities"