Backport https://github.com/root-project/root/pull/20645

[pcanal]

We need to backport #20645 to the v6-38-00-patches, v6-36-00-patches and v6-34-00-patches branches to fully resolve #20643.

[pcanal]

The patch branches have been updated.

[github-actions]

Hi @pcanal, @Copilot,

It appears this issue is closed, but wasn't yet added to a project. Please add upcoming versions that will include the fix, or 'not applicable' otherwise.

Sincerely,
🤖