246c4a2
The changes do not apply cleanly when cherry-picked so they have been redone manually. Closes gh-44941