This is a separate PR because this does not backport to 3.6.
Attach a file by drag & drop or click to upload
