modify some point
Merge branch 'ph6_dev' into ph6_review