Split off from #24714. Possibly by adding to the mapping hints.
Split off from #24714.
Possibly by adding to the mapping hints.