Merge branch 'default' into taoran
further improvement
Merge branch 'julie' into default