Auto merge of #62311 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum

[stable] Emergency stable backports