Auto merge of #161347 - JonathanBrouwer:rollup-uv2vd9y, r=JonathanBrouwer