EE backport of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15039



Signed-off-by: Rémy Coutable <remy@rymai.me>