Changes are backported from commits 227953b9 and 03a326be.
Attach a file by drag & drop or click to upload