Merge "Fix LogRecord vulnerabilities"