This replaces abandoned PR #14824 by @ekbiker, and gives it some love.
Attach a file by drag & drop or click to upload
