It also prepare for the EE merge request https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14786