Merge commit '80e123b34e488ffea851dc2168b366ba6124c09b' into python3

2024-04-05, Edouard Tisserant