Set to land in 11.3
See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6607
Closes: https://gitlab.com/gitlab-org/gitlab-ee/issues/7253