Merge "chore(cm): fix some typos in comments" into integration