Also merge changes from Issue #27117; no actual code changes to 3.6.
Attach a file by drag & drop or click to upload
