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