Review 'Merging' Branch

Dernière branche a passer la review.