Backport #35277 by @LePau Fix #35276 Signed-off-by: LePau <101608950+LePau@users.noreply.github.com> Co-authored-by: LePau <101608950+LePau@users.noreply.github.com>