Merge branch 'taoran' into default