Resolves #32129 Signed-off-by: Bruno Sofiato <bruno.sofiato@gmail.com> (cherry picked from commit 99d0510cb69c3c53cee05ef0e83ed02389925a90)