This is a follow-on to #33370 based on review comments therein.
Attach a file by drag & drop or click to upload
