(cherry picked from commit 6844f0aeb6bc02fac1a3a263c90ef12d07026176) Co-authored-by: Vincent Riquer <vincent+prog.atom@riquer.fr>