Merge "Defer spelling correction with apostrophe" into lmp-dev