BigW Consortium Gitlab
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 See merge request !13022