This is a completion for PR #7390 and fixes #6517 and #815.
Attach a file by drag & drop or click to upload
