Backport the fix from 5.6 to 5.1 Base bug number : 11765562
Attach a file by drag & drop or click to upload
