Tests will fail otherwise. Backport change from: 867809f2
Attach a file by drag & drop or click to upload
