EE for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16417
https://gitlab.com/gitlab-org/gitlab-ce/issues/41341