[fr] sync with 716e1926 and aa830655