Merge pull request #90469 from compnerd/staging