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

Stable release 1.26.0