https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17522557
@ref
Closes #23615
Closes #2540