Backport #23693 by @balki Fixes #21699 Co-authored-by: Balki <189196+balki@users.noreply.github.com>
gt-