Description updated
Merge branch 'mingshu' into sprint8