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

[stable] 1.39.0 release