Merge "Fix spelling mistakes in comments"