Closes GH-29303

Comment From: rstoyanchev

Just noticing the PR. For future reference, if you intend to submit a PR, you don't need to create a separate issue. If you create both, we'll close one as superseded by the other. In this case, the conversation has already started under the issue, so I'll close this for now. Thanks for the PR.