[fr] Follow 6122d7eccfa3695ed4b75665bc265b5e39ed021d

2.5 changes