gwc
Merge branch 'personal/laoyao/bug1' into group/gwc