Partial forward-port of b2096f74334eaf1043d00396e097412a99ff5847
Attach a file by drag & drop or click to upload
