Essentially a redo of PR #612 which is erased by git merge somehow.
Attach a file by drag & drop or click to upload
