[fr] follows recent updates

- #1965
- #1967
- e70272f9b38e8789e28d96d79372f15c3966624a