Split from #16260
Split from #16260