EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12875
Related: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2350