Fix for issue #19010 Signed-off-by: John Kohl <jtk.git@bostonpog.org> Signed-off-by: Michal Kowalski <18610805+kofec@users.noreply.github.com>