Pointed-Out-By: Olivier Aubert <olivier.aubert@liris.cnrs.fr>
(cherry picked from commit 05a4a2710c09ac5f3a81324cf15d69f89d2083a6)