Backport code from the master branch: * commit 4e785d42 * commit a9fb7768
Attach a file by drag & drop or click to upload
