EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17015
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42896