EE for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27849?commit_id=1f5125718e45596c228e0aed876240d2dda60f6c