Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7813
EE sibling of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7890