Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40510 and https://gitlab.com/gitlab-org/gitlab-ce/issues/39623