Revert "Revert "Merge branch 'master' into moufida-chariet""

This reverts commit e521005c54461b43c576c8c7a37dc4e8e7d9b8ae.
Resolution de conlift