Merge "Fix dependency vulnerabilities"