Merge "Fix final 10 vulnerabilities in policy/engine"