Fixes #16269. Closes #16301 by merging a rebased version of it.
Attach a file by drag & drop or click to upload
