[fr] follow last changes

- 0f37ccb6
- #1893
- #1896
- 4fe5ccca
- 0efe1e8f
- c3077751
- e5f12163
- #1899