Co-authored-by: Rémi Verschelde <rverschelde@gmail.com> (cherry picked from commit bfc498f3d0)
bfc498f3d0