Merge "Fix vulnerability report"