Merge commit 'e2df70b60b84031d3ccd3ae799a4e3aa8112f3ff' into python3

2024-05-15, Edouard Tisserant