[fr] finalize #2009