Ports changes from https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/29013
Attach a file by drag & drop or click to upload
