Fix typo bugs
Merge branch 'Branch_Latest'