Merge "Fixed typos: when when"