Pick the changes from gitlab-org/gitlab-ce!18484 into EE.
Attach a file by drag & drop or click to upload
