Backport #33187 (no conflict) Co-authored-by: Harry Vince <47283812+harryvince@users.noreply.github.com>