[fr] follow 410f834