[fr] follow #2091, #2094 and #2096
[fr] follow #2097