b0a6ef4dd6
Initially, this was for testing CI for #12688, but I think it makes sense to merge this independently and rebase #12688 on top of it.