This adds to the work done for issue #15990 (i.e. f44b8d69e5fc and the commits referenced there).
Attach a file by drag & drop or click to upload
