Forked from #25396
Forked from #25396