Depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11777
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/30990