Modified a lot of file
Merge remote-tracking branch 'origin/master' into Remy-mod