Auto merge of #161196 - JonathanBrouwer:rollup-JHCyFaw, r=JonathanBrouwer