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

[stable] 1.40 stable release

r? @ghost