Port of a community contribution from @glensc to upstream.
Attach a file by drag & drop or click to upload
