https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14731/diffs
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30862