It has already been partially backported by #6199; this commit completes the backport.
Attach a file by drag & drop or click to upload
