Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64454
https://gitlab.com/gitlab-org/gitlab-ce/issues/58583