post-merge fixes: some things work differently in 5.1
Attach a file by drag & drop or click to upload