Merge "Whitespace and typo fix"