fdc4c47f1c
(cherry picked from commit 973b3112d7)
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>