Re-commit for Yann
Conflit solved