Based on gitlab-org/gitlab-ce!14374 and gitlab-org/gitlab-ee!2935.
Signed-off-by: Rémy Coutable <remy@rymai.me>