The actual benefit of this will be in follow-up commits
Attach a file by drag & drop or click to upload