Fixes gh-1986 Closes gh-1995 (cherry picked from commit 89ce0af2cf7f001647e74fc1de92ce94a51fd5c2)
Attach a file by drag & drop or click to upload