Merge "Fix header sanitization."