Merge "Fix some typo in JavaDoc" into sc-dev