Followup on #28440 Do not merge before the referenced PR is merged. I will fix the PR once that is merged (or close if it is not)