(cherry picked from commit 51e129dd)
Co-authored-by: Jonathan Lambrechts jonathan.lambrechts@uclouvain.be