Along the way, this commit also fixes a typo. See gh-18288
Attach a file by drag & drop or click to upload
