Note, there is no need to propagate this change into 4.1.
Attach a file by drag & drop or click to upload
