Backport #30644 by kemzeb Should resolve #30642. Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>