EE BRANCH: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1711
Closes #25424 (closed), #27950 (closed)