Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24551 and https://gitlab.com/gitlab-org/gitlab-ce/issues/24198