Merge "Update typos in Components List" into guilin