Auto merge of #161208 - jhpratt:rollup-bgWoX3a, r=jhpratt