Merge pull request #626 from hcavarsan/fix/security-alerts-75-78