This backports the following commits: 6d673057 244bb92b
Attach a file by drag & drop or click to upload
