Merge branch 'yinghai' into test