This is a backport of a part of commit 18455ec3 from 10.1.
Attach a file by drag & drop or click to upload
