(cherry picked from commit 004e64e805) Co-authored-by: Rémi Lapeyre <remi.lapeyre@lenstra.fr>
004e64e805