Fixes after last merge from 4.0. (Code not yet complete, need anoter merge from 4.0)
Attach a file by drag & drop or click to upload