(cherry picked from commit 4160429b71) Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
4160429b71