[fr] Follow fcaaf853e5d99f91996e626b14c019ef9490d2e7

Merge branch '2.4'