Auto merge of #112145 - wesleywiser:backport_112070, r=Mark-Simulacrum

Backport of #112070

Backports #112070 to stable

r? `@Mark-Simulacrum`