Re-implemented the fix for MW-416 according to 5.7 version
Attach a file by drag & drop or click to upload
