As first commit of #27253 was already merged into 25.0 release branch (#27468), this PR represents the second commit of the original PR #27253, where the fix was split in 2 commits for clarity and reviewers benefit(1 with the fix and 1 with an enhancement of it).
Please for reference have a quick look at PRs mentioned above and check the description of this commit for the intention of this PR.