Fixes remaining part of ticket #8071 on next version bump.
Attach a file by drag & drop or click to upload
