backporting of bug@30703 to 5.1. The fixes are backed up with a regression test.
Attach a file by drag & drop or click to upload
