manual back-port of 44cdb9b3254ce051e05cb26cef6b78bf501f3427
Attach a file by drag & drop or click to upload