Merge "Fix misspelled on the comment" into sc-dev