(cherry picked from commit d756169881)
d756169881
Will be compiled and used in the next commit. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>