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