Closes #31573 (cherry picked from commit bf298e32ebc179ec0fcf352f1fecc4dd235cc069) Signed-off-by: luis <[email protected]>