This is upstream commit 8ddc442d539ca775d80cdbc7af17a718634a743f Partially fixes #9234
Attach a file by drag & drop or click to upload