Auto merge of #161022 - jhpratt:rollup-jXEC06F, r=jhpratt