Merge "Update dependencies to resolve vulnerabilities"