Merge "Fixes for opensource vulnerabilities"