Closes #30604 Signed-off-by: Giuseppe Graziano <g.graziano94@gmail.com> (cherry picked from commit c2c74faec0481c9cd6ee9506b65f42c08bb7442d)