Fixes + Adapted to new name resolution context after WL #2486
Attach a file by drag & drop or click to upload
