EE port: gitlab-org/gitlab MR 52431

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>