[fr] follow #2100 #2101 #2102 #2105 #2106