Merge "Fix security issues"