Also a couple of minor edits for this branch are included
Attach a file by drag & drop or click to upload
