I modify some point and validation
Merge branch 'ph6_dev' into ph6_review