Merge "Remove security vulnerability"