Picked up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20284
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48571