Comment From: jhoeller
I'll deal with this under the original issue #22896 as part of a slightly wider refactoring. Thanks for the PR, in any case!
In general, please create a PR right away if there's a PR coming. No need for a separate GitHub issue in such a case, and even if the PR is not used as-is, the GitHub PR entry can be treated like a regular issue.