EE MR For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18901
https://gitlab.com/gitlab-org/gitlab-ce/issues/46010