[fr] follow #2022, 6d4f70d, e30d736 and #2028