Cherry pick changes from master to allow it. Fixes: #1439
Attach a file by drag & drop or click to upload
