Merge "Fix typos and misspellings" into integration