Merge "Fix vulnerability report part1"