Merge "Improve IO performance during redaction"