Merge "Preserve whitespace in search index text content"