This is basically a backport of issues #9003 and #22366.
Attach a file by drag & drop or click to upload
