Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/6990
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14368/diffs