Follow-up:
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121402
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126840