Backport of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18134
Issue -> https://gitlab.com/gitlab-org/gitlab-ce/issues/44737