Code Review of https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196929 part 2