Spinoff from issue #63882. PR started as part of #24152. [Might add other changes to file.] <!-- gh-linked-prs --> ### Linked PRs * gh-128477 <!-- /gh-linked-prs -->