Auto merge of #161338 - jhpratt:rollup-gDOZoei, r=jhpratt