[fr] follow #2084, #2086, #2088, #2092