Fix #47913 (again), revert !21180, fix regression of !8652, improve !20137
Attach a file by drag & drop or click to upload
