finalize #2024
[fr] follow #2031, 80b1ec4c, 57288770