Merge "Fix LogfileLoader vulnerabilities"